From aaea854dda3a59cd5bffe0de536d94dedbf150eb Mon Sep 17 00:00:00 2001 From: "sinu.eth" <65924192+sinui0@users.noreply.github.com> Date: Mon, 21 Aug 2023 18:42:05 -0700 Subject: [PATCH] Pin deps (#305) * pin tlsn-utils dep, hyper, and bump mpz * fix missing pin --- components/actors/actor-ot/Cargo.toml | 8 ++++---- components/aead/Cargo.toml | 15 ++++++++++----- components/cipher/Cargo.toml | 6 +++--- components/integration-tests/Cargo.toml | 6 +++--- components/key-exchange/Cargo.toml | 10 +++++----- components/point-addition/Cargo.toml | 6 +++--- components/prf/Cargo.toml | 4 ++-- components/tls/tls-mpc/Cargo.toml | 21 ++++++++++++++++----- components/uid-mux/Cargo.toml | 4 ++-- components/universal-hash/Cargo.toml | 6 +++--- tlsn/Cargo.toml | 18 +++++++++--------- 11 files changed, 60 insertions(+), 44 deletions(-) diff --git a/components/actors/actor-ot/Cargo.toml b/components/actors/actor-ot/Cargo.toml index 5bb723f46c..3bbb66e4dd 100644 --- a/components/actors/actor-ot/Cargo.toml +++ b/components/actors/actor-ot/Cargo.toml @@ -6,10 +6,10 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -mpz-ot-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" } +mpz-ot-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } async-trait = "0.1" derive_builder = "0.11" futures = "0.3" diff --git a/components/aead/Cargo.toml b/components/aead/Cargo.toml index feb7493f69..019f1e9b45 100644 --- a/components/aead/Cargo.toml +++ b/components/aead/Cargo.toml @@ -14,15 +14,20 @@ name = "aead" [features] default = ["mock"] mock = [] -tracing = ["dep:tracing", "tlsn-block-cipher/tracing", "tlsn-stream-cipher/tracing", "tlsn-universal-hash/tracing"] +tracing = [ + "dep:tracing", + "tlsn-block-cipher/tracing", + "tlsn-stream-cipher/tracing", + "tlsn-universal-hash/tracing", +] [dependencies] tlsn-block-cipher = { path = "../cipher/block-cipher" } tlsn-stream-cipher = { path = "../cipher/stream-cipher" } tlsn-universal-hash = { path = "../universal-hash" } -mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" } +mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } async-trait = "0.1" derive_builder = "0.12" @@ -32,5 +37,5 @@ serde = "1" tracing = { version = "0.1", optional = true } [dev-dependencies] -tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"]} +tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] } aes-gcm = "0.10" diff --git a/components/cipher/Cargo.toml b/components/cipher/Cargo.toml index bf2044bc47..44c403fddc 100644 --- a/components/cipher/Cargo.toml +++ b/components/cipher/Cargo.toml @@ -4,9 +4,9 @@ resolver = "2" [workspace.dependencies] # tlsn -mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils" } +mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } # crypto aes = "0.8" diff --git a/components/integration-tests/Cargo.toml b/components/integration-tests/Cargo.toml index a70ef3c3ea..0a2b02db9e 100644 --- a/components/integration-tests/Cargo.toml +++ b/components/integration-tests/Cargo.toml @@ -14,8 +14,8 @@ edition = "2021" [dev-dependencies] -mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } +mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } tlsn-block-cipher = { path = "../cipher/block-cipher" } tlsn-stream-cipher = { path = "../cipher/stream-cipher" } tlsn-universal-hash = { path = "../universal-hash" } @@ -23,7 +23,7 @@ tlsn-aead = { path = "../aead" } tlsn-key-exchange = { path = "../key-exchange" } tlsn-point-addition = { path = "../point-addition" } tlsn-hmac-sha256 = { path = "../prf/hmac-sha256" } -tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" } +tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } actor-ot = { path = "../actors/actor-ot" } uid-mux = { path = "../uid-mux" } diff --git a/components/key-exchange/Cargo.toml b/components/key-exchange/Cargo.toml index f75a9103ce..311106f09a 100644 --- a/components/key-exchange/Cargo.toml +++ b/components/key-exchange/Cargo.toml @@ -17,11 +17,11 @@ tracing = ["dep:tracing", "tlsn-point-addition/tracing"] mock = [] [dependencies] -mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" } -mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } +mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } +mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } tlsn-point-addition = { path = "../point-addition" } p256 = { version = "0.13", features = ["ecdh"] } async-trait = "0.1" diff --git a/components/point-addition/Cargo.toml b/components/point-addition/Cargo.toml index 1c933df1ef..7d81cb8476 100644 --- a/components/point-addition/Cargo.toml +++ b/components/point-addition/Cargo.toml @@ -17,9 +17,9 @@ mock = ["dep:mpz-core"] tracing = ["dep:tracing"] [dependencies] -mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687", optional = true } -mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } +mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5", optional = true } +mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } p256 = { version = "0.13", features = ["arithmetic"] } tracing = { version = "0.1", optional = true } async-trait = "0.1" diff --git a/components/prf/Cargo.toml b/components/prf/Cargo.toml index fffc873c21..75388b69ed 100644 --- a/components/prf/Cargo.toml +++ b/components/prf/Cargo.toml @@ -4,8 +4,8 @@ resolver = "2" [workspace.dependencies] # tlsn -mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } +mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } # async async-trait = "0.1" diff --git a/components/tls/tls-mpc/Cargo.toml b/components/tls/tls-mpc/Cargo.toml index 128985ee8e..0c246be490 100644 --- a/components/tls/tls-mpc/Cargo.toml +++ b/components/tls/tls-mpc/Cargo.toml @@ -12,15 +12,26 @@ edition = "2021" name = "tls_mpc" [features] -tracing = ["dep:tracing", "tlsn-block-cipher/tracing", "tlsn-stream-cipher/tracing", "tlsn-universal-hash/tracing", "tlsn-aead/tracing", "tlsn-key-exchange/tracing", "tlsn-point-addition/tracing", "tlsn-hmac-sha256/tracing", "tlsn-tls-client-async/tracing", "uid-mux/tracing"] +tracing = [ + "dep:tracing", + "tlsn-block-cipher/tracing", + "tlsn-stream-cipher/tracing", + "tlsn-universal-hash/tracing", + "tlsn-aead/tracing", + "tlsn-key-exchange/tracing", + "tlsn-point-addition/tracing", + "tlsn-hmac-sha256/tracing", + "tlsn-tls-client-async/tracing", + "uid-mux/tracing", +] [dependencies] tlsn-tls-core = { path = "../tls-core", features = ["serde"] } tlsn-tls-backend = { path = "../tls-backend" } -mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } +mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } tlsn-block-cipher = { path = "../../cipher/block-cipher" } tlsn-stream-cipher = { path = "../../cipher/stream-cipher" } @@ -30,7 +41,7 @@ tlsn-key-exchange = { path = "../../key-exchange" } tlsn-point-addition = { path = "../../point-addition" } tlsn-hmac-sha256 = { path = "../../prf/hmac-sha256" } -tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" } +tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } p256.workspace = true rand.workspace = true diff --git a/components/uid-mux/Cargo.toml b/components/uid-mux/Cargo.toml index 36e4205435..9c387be7d1 100644 --- a/components/uid-mux/Cargo.toml +++ b/components/uid-mux/Cargo.toml @@ -12,7 +12,7 @@ edition = "2021" tracing = ["dep:tracing"] [dependencies] -tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" } +tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } async-trait = "0.1" futures = "0.3" @@ -25,5 +25,5 @@ tokio = { version = "1", features = [ "macros", "rt", "rt-multi-thread", - "time" + "time", ] } diff --git a/components/universal-hash/Cargo.toml b/components/universal-hash/Cargo.toml index c9a0128e99..0c0a3fde33 100644 --- a/components/universal-hash/Cargo.toml +++ b/components/universal-hash/Cargo.toml @@ -16,9 +16,9 @@ mock = [] [dependencies] # tlsn -mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } +mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } # async async-trait = "0.1" diff --git a/tlsn/Cargo.toml b/tlsn/Cargo.toml index 13afc8ea1e..75e3fdb05e 100644 --- a/tlsn/Cargo.toml +++ b/tlsn/Cargo.toml @@ -4,7 +4,7 @@ members = [ "tlsn-notary", "tlsn-prover", "tests-integration", - "examples", + "examples", ] resolver = "2" @@ -21,19 +21,19 @@ tls-server-fixture = { path = "../components/tls/tls-server-fixture" } actor-ot = { path = "../components/actors/actor-ot" } uid-mux = { path = "../components/uid-mux" } -tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils" } -tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils" } +tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } +tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "f3e3f07" } -mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-garble-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } -mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "86f1687" } +mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-garble-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } +mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "a1ac9c5" } futures = "0.3" tokio-util = "0.7" -hyper = "0.14" +hyper = "<=0.14.26" tokio = "1" signature = "2"