Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: tlsn-monorepo local paths for mpz #3

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

chore: tlsn-monorepo local paths for mpz #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1c1dfaf
chore: toml versioning
0xJepsen Jun 12, 2024
b68ef49
chore: config paths
0xJepsen Jun 12, 2024
a9e18a2
dependancy fix
0xJepsen Jun 19, 2024
15f348c
Merge pull request #1 from pluto/mpz-pluto-dependancy
Autoparallel Jun 19, 2024
1014d6b
Update Cargo.toml
Autoparallel Jun 19, 2024
6c8e5fd
update `notary-server` log settings
Autoparallel Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions components/aead/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ tracing = [
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 = "9f7403b" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-core = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "51f313d" }

async-trait = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions components/cipher/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ resolver = "2"

[workspace.dependencies]
# tlsn
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-circuits = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "51f313d" }

# crypto
Expand Down
6 changes: 3 additions & 3 deletions components/integration-tests/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ lto = true


[dev-dependencies]
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-ot = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
tlsn-block-cipher = { path = "../cipher/block-cipher" }
tlsn-stream-cipher = { path = "../cipher/stream-cipher" }
tlsn-universal-hash = { path = "../universal-hash" }
Expand Down
10 changes: 5 additions & 5 deletions components/key-exchange/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ tracing = ["dep:tracing", "tlsn-point-addition/tracing"]
mock = []

[dependencies]
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-fields = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-fields = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-ot = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-circuits = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "51f313d" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-share-conversion-core = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
tlsn-point-addition = { path = "../point-addition" }
p256 = { version = "0.13", features = ["ecdh"] }
async-trait = "0.1"
Expand Down
8 changes: 4 additions & 4 deletions components/point-addition/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ mock = ["dep:mpz-core"]
tracing = ["dep:tracing"]

[dependencies]
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b", optional = true }
mpz-fields = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-core = { git = "https://github.com/pluto/mpz", rev = "9f7403b", optional = true }
mpz-fields = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-share-conversion-core = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
p256 = { version = "0.13", features = ["arithmetic"] }
tracing = { version = "0.1", optional = true }
async-trait = "0.1"
Expand Down
4 changes: 2 additions & 2 deletions components/prf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ resolver = "2"

[workspace.dependencies]
# tlsn
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-circuits = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }

# async
async-trait = "0.1"
Expand Down
8 changes: 4 additions & 4 deletions components/tls/tls-mpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ tracing = [
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 = "9f7403b" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-core = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }

tlsn-block-cipher = { path = "../../cipher/block-cipher" }
tlsn-stream-cipher = { path = "../../cipher/stream-cipher" }
Expand All @@ -59,7 +59,7 @@ ludi = { git = "https://github.com/sinui0/ludi", rev = "b590de5" }
tlsn-tls-client = { path = "../tls-client" }
tlsn-tls-client-async = { path = "../tls-client-async" }
tls-server-fixture = { path = "../tls-server-fixture" }
mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-ot = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
uid-mux = { path = "../../uid-mux" }

tracing-subscriber.workspace = true
Expand Down
8 changes: 4 additions & 4 deletions components/universal-hash/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ mock = []

[dependencies]
# tlsn
mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-fields = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-share-conversion-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-core = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-fields = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-share-conversion-core = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/pluto/mpz", rev = "9f7403b" }

# async
async-trait = "0.1"
Expand Down
8 changes: 4 additions & 4 deletions notary-server/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ serde_yaml = "0.9.21"
sha1 = "0.10"
structopt = "0.3.26"
thiserror = "1"
tlsn-verifier = { path = "../tlsn/tlsn-verifier", features = ["tracing"] }
tlsn-verifier = { git = "https://github.com/tlsnotary/tlsn.git", commit = "68b9474", features = ["tracing"] }
tokio = { version = "1", features = ["full"] }
tokio-rustls = { version = "0.24.1" }
tokio-util = { version = "0.7", features = ["compat"] }
Expand All @@ -44,7 +44,7 @@ ws_stream_tungstenite = { version = "0.10.0", features = ["tokio_io"] }
[dev-dependencies]
# specify vendored feature to use statically linked copy of OpenSSL
hyper-tls = { version = "0.5.0", features = ["vendored"] }
tlsn-prover = { path = "../tlsn/tlsn-prover", features = ["tracing"] }
tls-server-fixture = { path = "../components/tls/tls-server-fixture" }
tlsn-tls-core = { path = "../components/tls/tls-core" }
tlsn-prover = { git = "https://github.com/tlsnotary/tlsn.git", commit = "68b9474", features = ["tracing"] }
tls-server-fixture = { git = "https://github.com/tlsnotary/tlsn.git", commit = "68b9474" }
tlsn-tls-core = { git = "https://github.com/tlsnotary/tlsn.git", commit = "68b9474" }
tokio-native-tls = { version = "0.3.1", features = ["vendored"] }
12 changes: 6 additions & 6 deletions notary-server/config/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ notarization:

tls:
enabled: true
private-key-pem-path: "./fixture/tls/notary.key"
certificate-pem-path: "./fixture/tls/notary.crt"
private-key-pem-path: "tlsn/notary-server/fixture/tls/notary.key"
certificate-pem-path: "tlsn/notary-server/fixture/tls/notary.crt"

notary-key:
private-key-pem-path: "./fixture/notary/notary.key"
public-key-pem-path: "./fixture/notary/notary.pub"
private-key-pem-path: "tlsn/notary-server/fixture/notary/notary.key"
public-key-pem-path: "tlsn/notary-server/fixture/notary/notary.pub"

logging:
level: DEBUG
level: TRACE

authorization:
enabled: false
whitelist-csv-path: "./fixture/auth/whitelist.csv"
whitelist-csv-path: "tlsn/notary-server/fixture/auth/whitelist.csv"
2 changes: 1 addition & 1 deletion notary-server/src/domain/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ use structopt::StructOpt;
#[structopt(name = "Notary Server")]
pub struct CliFields {
/// Configuration file location
#[structopt(long, default_value = "./config/config.yaml")]
#[structopt(long, default_value = "tlsn/notary-server/config/config.yaml")]
pub config_file: String,
}
12 changes: 6 additions & 6 deletions tlsn/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ tlsn-utils = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "51f313d"
tlsn-utils-aio = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "51f313d" }
spansy = { git = "https://github.com/tlsnotary/tlsn-utils", rev = "51f313d" }

mpz-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-circuits = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-garble-core = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-garble = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-ot = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-share-conversion = { git = "https://github.com/privacy-scaling-explorations/mpz", rev = "9f7403b" }
mpz-core = { path = "../../mpz" }
mpz-circuits = { path = "../../mpz" }
mpz-garble-core = { path = "../../mpz" }
mpz-garble = { path = "../../mpz" }
mpz-ot = { path = "../../mpz" }
mpz-share-conversion = { path = "../../mpz" }

futures = "0.3"
tokio-util = "0.7"
Expand Down