Partition Workspaces

.github/workflows/rust.yml

@@ -10,10 +10,9 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build:
+  build-actor-mux:
     if: ( ! github.event.pull_request.draft )
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v3
 
@@ -24,19 +23,163 @@ jobs:
           toolchain: nightly
           components: rustfmt
 
-      - name: Check formatting with nightly rustfmt
-        run: cargo +nightly fmt --check
+      - name: "Check formatting"
+        run: cargo +nightly fmt --check --manifest-path actors/actor-mux/Cargo.toml
 
       - name: Stable
         uses: actions-rs/toolchain@v1
         with:
           profile: minimal
           toolchain: stable
-
       - uses: Swatinem/rust-cache@v2.0.0
 
-      - name: Build
-        run: cargo build --verbose
+      - name: "Build"
+        run: cargo build --manifest-path actors/actor-mux/Cargo.toml
 
-      - name: Run tests
-        run: cargo test --lib --bins --tests --examples --workspace --exclude tlsn-tls-circuits
+      - name: "Test"
+        run: cargo test --lib --bins --tests --examples --manifest-path actors/actor-mux/Cargo.toml
+
+  build-actor-ot:
+    if: ( ! github.event.pull_request.draft )
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Nightly with rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: rustfmt
+
+      - name: "Check formatting"
+        run: cargo +nightly fmt --check --manifest-path actors/actor-ot/Cargo.toml
+
+      - name: Stable
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+      - uses: Swatinem/rust-cache@v2.0.0
+
+      - name: "Build"
+        run: cargo build --manifest-path actors/actor-ot/Cargo.toml
+
+      - name: "Test"
+        run: cargo test --lib --bins --tests --examples --manifest-path actors/actor-ot/Cargo.toml
+
+  build-actor-share-conversion:
+    if: ( ! github.event.pull_request.draft )
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Nightly with rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: rustfmt
+
+      - name: "Check formatting"
+        run: cargo +nightly fmt --check --manifest-path actors/actor-share-conversion/Cargo.toml
+
+      - name: Stable
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+      - uses: Swatinem/rust-cache@v2.0.0
+
+      - name: "Build"
+        run: cargo build --manifest-path actors/actor-share-conversion/Cargo.toml
+
+      - name: "Test"
+        run: cargo test --lib --bins --tests --examples --manifest-path actors/actor-share-conversion/Cargo.toml
+
+  build-mpc:
+    if: ( ! github.event.pull_request.draft )
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Nightly with rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: rustfmt
+
+      - name: "Check formatting"
+        run: cargo +nightly fmt --check --all --manifest-path mpc/Cargo.toml
+
+      - name: Stable
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+      - uses: Swatinem/rust-cache@v2.0.0
+
+      - name: "Build"
+        run: cargo build --manifest-path mpc/Cargo.toml
+
+      - name: "Test"
+        run: cargo test --lib --bins --tests --examples --workspace --manifest-path mpc/Cargo.toml
+
+  build-tls:
+    if: ( ! github.event.pull_request.draft )
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Nightly with rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: rustfmt
+
+      - name: "Check formatting"
+        run: cargo +nightly fmt --check --all --manifest-path tls/Cargo.toml
+
+      - name: Stable
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+      - uses: Swatinem/rust-cache@v2.0.0
+
+      - name: "Build"
+        run: cargo build --manifest-path tls/Cargo.toml
+
+      - name: "Test"
+        run: cargo test --lib --bins --tests --examples --workspace --manifest-path tls/Cargo.toml --exclude tlsn-tls-circuits
+
+  build-utils:
+    if: ( ! github.event.pull_request.draft )
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Nightly with rustfmt
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly
+          components: rustfmt
+
+      - name: "Check formatting"
+        run: cargo +nightly fmt --check --all --manifest-path utils/Cargo.toml
+
+      - name: Stable
+        uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: stable
+      - uses: Swatinem/rust-cache@v2.0.0
+
+      - name: "Build"
+        run: cargo build --manifest-path utils/Cargo.toml
+
+      - name: "Test"
+        run: cargo test --lib --bins --tests --examples --workspace --manifest-path utils/Cargo.toml

actor-mux/Cargo.toml

@@ -1,29 +0,0 @@
-[package]
-name = "actor-mux"
-version = "0.1.0"
-edition = "2021"
-
-[features]
-default = ["mock", "yamux"]
-mock = []
-yamux = []
-
-[dependencies]
-tlsn-utils-aio = { path = "../utils-aio" }
-async-trait = { workspace = true }
-futures = { workspace = true }
-tokio = { workspace = true, features = ["time"] }
-xtra = { workspace = true, features = [
-    "macros",
-    "tokio",
-], default-features = false }
-yamux = "0.10"
-
-[dev-dependencies]
-tokio-util = { workspace = true, features = ["compat"] }
-tokio = { workspace = true, features = [
-    "macros",
-    "io-util",
-    "rt",
-    "rt-multi-thread",
-] }

actor-ot/Cargo.toml

@@ -1,29 +0,0 @@
-[package]
-name = "actor-ot"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-tlsn-utils-aio = { path = "../utils-aio" }
-tlsn-mpc-aio = { path = "../mpc-aio" }
-tlsn-mpc-core = { path = "../mpc-core" }
-async-trait = { workspace = true }
-derive_builder = { workspace = true }
-futures = { workspace = true }
-thiserror = { workspace = true }
-xtra = { workspace = true, features = ["macros"], default-features = false }
-
-
-[dev-dependencies]
-actor-mux = { path = "../actor-mux", default-features = false, features = [
-    "mock",
-] }
-xtra = { workspace = true, features = ["tokio"], default-features = false }
-tokio = { workspace = true, features = [
-    "macros",
-    "io-util",
-    "rt",
-    "rt-multi-thread",
-] }

actor-share-conversion/Cargo.toml

@@ -1,27 +0,0 @@
-[package]
-name = "actor-share-conversion"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-share-conversion-aio = { path =  "../share-conversion-aio" }
-share-conversion-core = { path = "../share-conversion-core" }
-tlsn-mpc-aio = { path = "../mpc-aio" }
-tlsn-mpc-core = { path = "../mpc-core" }
-xtra = { workspace = true, features = [
-    "macros",
-], default-features = false }
-tlsn-utils-aio = { path = "../utils-aio" }
-thiserror.workspace = true
-
-[dev-dependencies]
-tokio.workspace = true
-xtra = { workspace = true, features = [
-    "macros",
-    "tokio"
-], default-features = false }
-rand.workspace = true
-rand_chacha.workspace = true
-actor-mux = { path = "../actor-mux" }

actors/actor-mux/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "actor-mux"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+default = ["mock", "yamux"]
+mock = []
+yamux = []
+
+[dependencies]
+tlsn-utils-aio = { path = "../../utils/utils-aio" }
+async-trait = "0.1"
+futures = "0.3"
+tokio = { version = "1.23", features = ["time"] }
+xtra = { git = "https://github.com/Restioson/xtra", rev = "ca061b4", features = [
+    "macros",
+    "tokio",
+], default-features = false }
+yamux = "0.10"
+
+[dev-dependencies]
+tokio-util = { version = "0.7", features = ["compat"] }
+tokio = { features = ["macros", "io-util", "rt", "rt-multi-thread"] }

actors/actor-ot/Cargo.toml

@@ -0,0 +1,33 @@
+[package]
+name = "actor-ot"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+tlsn-mpc-aio = { path = "../../mpc/mpc-aio" }
+tlsn-mpc-core = { path = "../../mpc/mpc-core" }
+tlsn-utils-aio = { path = "../../utils/utils-aio" }
+async-trait = "0.1"
+derive_builder = "0.11"
+futures = "0.3"
+thiserror = "1"
+xtra = { git = "https://github.com/Restioson/xtra", rev = "ca061b4", features = [
+    "macros",
+], default-features = false }
+
+
+[dev-dependencies]
+actor-mux = { path = "../actor-mux", default-features = false, features = [
+    "mock",
+] }
+xtra = { git = "https://github.com/Restioson/xtra", rev = "ca061b4", features = [
+    "tokio",
+], default-features = false }
+tokio = { version = "1.23", features = [
+    "macros",
+    "io-util",
+    "rt",
+    "rt-multi-thread",
+] }

actors/actor-share-conversion/Cargo.toml

@@ -0,0 +1,25 @@
+[package]
+name = "actor-share-conversion"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+share-conversion-aio = { path = "../../mpc/share-conversion-aio" }
+share-conversion-core = { path = "../../mpc/share-conversion-core" }
+tlsn-mpc-aio = { path = "../../mpc/mpc-aio" }
+tlsn-mpc-core = { path = "../../mpc/mpc-core" }
+tlsn-utils-aio = { path = "../../utils/utils-aio" }
+xtra = { git = "https://github.com/Restioson/xtra", rev = "ca061b4", features = [
+    "macros",
+], default-features = false }
+thiserror = "1"
+
+[dev-dependencies]
+xtra = { git = "https://github.com/Restioson/xtra", rev = "ca061b4", features = [
+    "macros",
+    "tokio",
+], default-features = false }
+tokio = "1.23"
+rand_chacha = "0.3"
+rand = "0.8"
+actor-mux = { path = "../actor-mux" }

mpc/Cargo.toml

@@ -1,80 +1,73 @@
 [workspace]
 members = [
-    "actor-mux",
-    "actor-ot",
-    "actor-share-conversion",
-    "tls-core",
     "mpc-core",
-    "mpc-aio",
     "mpc-circuits",
-    "tls-circuits",
-    "tls-2pc-core",
-    #"tls-2pc-aio",
-    "utils",
-    "utils-aio",
-    "clmul",
-    "matrix-transpose",
+    "mpc-aio",
     "share-conversion-core",
-    "share-conversion-aio"
+    "share-conversion-aio",
+    "matrix-transpose",
+    "clmul",
 ]
-exclude = ["tls-client"]
 
 [workspace.dependencies]
-cfg-if = "1"
+# tlsn
+tlsn-utils = { path = "../utils/utils" }
+tlsn-utils-aio = { path = "../utils/utils-aio" }
+
+# rand
 rand_chacha = "0.3"
 rand = "0.8"
 rand_core = "0.6"
-criterion = "0.3"
-cpufeatures = "0.2"
-thiserror = "1"
-async-trait = "0.1"
-prost = "0.9"
-futures = "0.3"
-futures-util = "0.3"
+
+# crypto
 cipher = "0.3"
-p256 = "0.10"
-tracing = "0.1"
-tokio-util = "0.7"
-tokio = "1.23"
-mockall = "0.11"
-async-stream = "0.3"
-getrandom = "0.2"
-wasm-bindgen = "0.2"
-async-tungstenite = "0.16"
-ws_stream_tungstenite = "0.7"
-tracing-subscriber = "0.3"
-clap = "3"
-tokio-stream = "0.1"
-regex = "1"
-rayon = "1"
 sha2 = "0.10"
 blake3 = "1.3.3"
-hex = "0.4"
-serde = "1.0"
-serde_yaml = "0.9"
-lazy_static = "1"
 aes = "0.7"
 digest = "0.10"
-prost-build = "0.9"
 curve25519-dalek = "4.0.0-pre.4"
-anyhow = "1"
 elliptic-curve = "0.11"
-derive_builder = "0.11"
 merlin = "3"
+p256 = "0.10"
+ghash_rc = { package = "ghash", version = "0.4" }
+
+# async
+async-trait = "0.1"
+futures = "0.3"
+futures-util = "0.3"
+tokio = "1.23"
+tokio-util = "0.7"
+
+# serialization
+serde = "1.0"
+serde_yaml = "0.9"
+prost-build = "0.9"
+bytes = "1"
+yamux = "0.10"
+
+# testing
+prost = "0.9"
+mockall = "0.11"
 rstest = "0.12"
 pretty_assertions = "1"
-hmac = "0.12"
-once_cell = "1"
-ghash_rc = { package = "ghash", version = "0.4" }
-num = "0.4"
-generic-array = "0.14"
-num-bigint = "0.4"
-num-traits = "0.2"
+criterion = "0.3"
+
+# config
+cfg-if = "1"
+cpufeatures = "0.2"
 rustversion = "1"
-sct = "0.7"
-webpki = "0.22"
-ring = "0.16"
-bytes = "1"
-async-std = "1"
-xtra = { git = "https://github.com/Restioson/xtra", rev = "ca061b4" }
-yamux = "0.10"
+
+# error/log
+tracing = "0.1"
+tracing-subscriber = "0.3"
+thiserror = "1"
+
+# misc
+clap = "3"
+regex = "1"
+rayon = "1"
+hex = "0.4"
+lazy_static = "1"
+derive_builder = "0.11"
+once_cell = "1"
+generic-array = "0.14"

mpc/mpc-aio/Cargo.toml

@@ -15,7 +15,7 @@ pa = ["tlsn-mpc-core/pa", "p256"]
 [dependencies]
 tlsn-mpc-circuits = { path = "../mpc-circuits" }
 tlsn-mpc-core = { path = "../mpc-core" }
-tlsn-utils-aio = { path = "../utils-aio" }
+tlsn-utils-aio.workspace = true
 async-trait.workspace = true
 prost.workspace = true
 futures.workspace = true
@@ -26,28 +26,15 @@ rand_core.workspace = true
 rand_chacha = { workspace = true, optional = true }
 p256 = { workspace = true, optional = true }
 thiserror.workspace = true
-tracing.workspace = true
-tokio-util = { workspace = true, features = ["codec"] }
 tokio = { workspace = true, features = [
     "net",
     "macros",
     "rt",
     "rt-multi-thread",
 ] }
-mockall = "0.11"
-async-stream = "0.3"
 aes = { workspace = true, optional = true }
 rayon = { workspace = true }
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-getrandom = { workspace = true, features = ["js"] }
-wasm-bindgen.workspace = true
-
 [dev-dependencies]
-async-tungstenite = { workspace = true, features = ["tokio-runtime"] }
-ws_stream_tungstenite = { workspace = true, features = ["tokio_io"] }
-yamux.workspace = true
-tracing-subscriber.workspace = true
-clap = { workspace = true, features = ["derive"] }
-tokio-stream.workspace = true
-tlsn-utils-aio = { path = "../utils-aio", features = ["duplex"] }
+mockall.workspace = true
+tlsn-utils-aio = { workspace = true, features = ["duplex"] }

mpc/mpc-core/Cargo.toml

@@ -20,7 +20,7 @@ serde = ["dep:serde"]
 tlsn-mpc-circuits = { path = "../mpc-circuits" }
 clmul = { path = "../clmul" }
 matrix-transpose = { path = "../matrix-transpose" }
-tlsn-utils = { path = "../utils" }
+tlsn-utils.workspace = true
 aes = { workspace = true, features = [] }
 cipher.workspace = true
 blake3.workspace = true
@@ -28,12 +28,10 @@ rand.workspace = true
 rand_core.workspace = true
 rand_chacha.workspace = true
 regex = { workspace = true, optional = true }
-rayon.workspace = true
 curve25519-dalek = { workspace = true, features = ["serde", "rand_core"] }
 serde = { workspace = true, features = ["derive"], optional = true }
 prost = { workspace = true, optional = true }
 thiserror.workspace = true
-anyhow.workspace = true
 derive_builder.workspace = true
 merlin.workspace = true