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.

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

feat: merge abstract phase1 for trusted setup #131

Merged
merged 33 commits into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
9a00ce7
feat: setup trusted-setup crate
bhgomes Jun 22, 2022
8a30ca3
wip: start adding KZG structures
bhgomes Jun 23, 2022
c1b1f74
wip: build initial setup code
bhgomes Jun 23, 2022
168d6ea
feat: add phase1 abstract framework
bhgomes Jun 23, 2022
d7aa164
fix: use consistent naming for from_variant
bhgomes Jun 23, 2022
4c68a30
fix: remove the response API just for challenge
bhgomes Jun 24, 2022
6d7c009
Merge branch 'main' into feat/trusted-setup
bhgomes Jun 24, 2022
dc4ac9f
fix: use `Challenge` instead of `Response`
bhgomes Jun 24, 2022
4e7923a
Merge branch 'main' into feat/trusted-setup
bhgomes Jun 26, 2022
4b96813
fix: apply suggestions from code review
bhgomes Jun 27, 2022
4aee7d9
fix: move `kzg` into `groth16` module
bhgomes Jun 27, 2022
4b3949d
Merge branch 'main' into feat/trusted-setup
bhgomes Jun 27, 2022
9affaed
chore: add CHANGELOG entry
bhgomes Jun 27, 2022
7cc1a9f
Merge branch 'main' into feat/trusted-setup
bhgomes Jun 28, 2022
368e826
Merge branch 'main' into feat/trusted-setup
bhgomes Jun 28, 2022
e67f441
Merge branch 'main' into feat/trusted-setup
bhgomes Jun 28, 2022
feeef3c
Merge branch 'main' into feat/trusted-setup
bhgomes Jun 28, 2022
9fc22e9
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 1, 2022
106a8a4
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 3, 2022
5e1e13d
chore: update dependencies
bhgomes Jul 3, 2022
ce65902
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 5, 2022
0bf838b
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 5, 2022
c880059
fix: apply suggestions from code review
bhgomes Jul 6, 2022
6ed4ab7
fix: use minimal trait bounds for scalars and groups
bhgomes Jul 6, 2022
09274f4
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 6, 2022
2702438
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 7, 2022
123017f
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 7, 2022
47b343a
chore: update zeroize dependency
bhgomes Jul 8, 2022
36c5ee5
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 8, 2022
4596d31
chore: use correct formatting for `Cargo.toml`
bhgomes Jul 8, 2022
7ad20fb
Merge branch 'main' into feat/trusted-setup
bhgomes Jul 8, 2022
c499f2a
Update manta-trusted-setup/Cargo.toml
bhgomes Jul 8, 2022
7a64cb5
fix: add `take` to powers of tau iterator to prevent infinite allocation
bhgomes Jul 12, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]
### Added
- [\#131](https://github.com/Manta-Network/manta-rs/pull/131) Add abstract Phase 1 for Groth16 trusted setup

### Changed

Expand Down
2 changes: 1 addition & 1 deletion manta-accounting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ test = [

[dependencies]
bitflags = { version = "1.3.2", optional = true, default-features = false }
cocoon = { version = "0.3.0", optional = true, default-features = false }
cocoon = { version = "0.3.1", optional = true, default-features = false }
derivative = { version = "2.2.0", default-features = false, features = ["use_core"] }
derive_more = { version = "0.99.16", default-features = false, features = ["add", "add_assign", "display", "from", "sum"] }
futures = { version = "0.3.21", optional = true, default-features = false, features = ["alloc"] }
Expand Down
6 changes: 3 additions & 3 deletions manta-accounting/src/fs/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ pub mod cocoon {
use super::{Block, OpenOptions};
use cocoon::{Error as CocoonError, MiniCocoon};
use core::fmt;
use manta_util::from_variant_impl;
use manta_util::from_variant;
use std::{fs, io::Error as IoError, path::Path};

/// Cocoon Loading/Saving Error
Expand All @@ -378,8 +378,8 @@ pub mod cocoon {
Cocoon(CocoonError),
}

from_variant_impl!(Error, IoError, IoError);
from_variant_impl!(Error, Cocoon, CocoonError);
from_variant!(Error, IoError, IoError);
from_variant!(Error, Cocoon, CocoonError);

impl fmt::Display for Error {
#[inline]
Expand Down
2 changes: 1 addition & 1 deletion manta-pay/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ ark-std = { version = "0.3.0", optional = true, default-features = false }
bip32 = { version = "0.3.0", optional = true, default-features = false, features = ["bip39", "secp256k1"] }
blake2 = { version = "0.10.4", default-features = false }
bs58 = { version = "0.4.0", optional = true, default-features = false, features = ["alloc"] }
clap = { version = "3.2.8", optional = true, default-features = false, features = ["color", "derive", "std", "suggestions", "unicode", "wrap_help"] }
clap = { version = "3.2.10", optional = true, default-features = false, features = ["color", "derive", "std", "suggestions", "unicode", "wrap_help"] }
derivative = { version = "2.2.0", default-features = false, features = ["use_core"] }
futures = { version = "0.3.21", optional = true, default-features = false }
indexmap = { version = "1.8.2", optional = true, default-features = false }
Expand Down
6 changes: 3 additions & 3 deletions manta-pay/src/signer/client/websocket.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use core::marker::Unpin;
use futures::{SinkExt, StreamExt};
use manta_accounting::wallet::{self, signer};
use manta_util::{
from_variant_impl,
from_variant,
future::LocalBoxFutureResult,
serde::{de::DeserializeOwned, Deserialize, Serialize},
};
Expand Down Expand Up @@ -64,8 +64,8 @@ pub enum Error {
WebSocket(WebSocketError),
}

from_variant_impl!(Error, SerializationError, serde_json::Error);
from_variant_impl!(Error, WebSocket, WebSocketError);
from_variant!(Error, SerializationError, serde_json::Error);
from_variant!(Error, WebSocket, WebSocketError);

/// Request
#[derive(derivative::Derivative, Deserialize, Serialize)]
Expand Down
47 changes: 47 additions & 0 deletions manta-trusted-setup/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
[package]
name = "manta-trusted-setup"
version = "0.5.3"
edition = "2021"
GhostOfGauss marked this conversation as resolved.
Show resolved Hide resolved
authors = ["Manta Network <contact@manta.network>"]
readme = "README.md"
license-file = "LICENSE"
repository = "https://github.com/Manta-Network/manta-rs"
homepage = "https://github.com/Manta-Network"
documentation = "https://github.com/Manta-Network/manta-rs"
categories = [""]
keywords = [""]
description = "MPC Ceremonies for Trusted Setup SRS Generation"
publish = false

[package.metadata.docs.rs]
# To build locally:
# RUSTDOCFLAGS="--cfg doc_cfg" cargo +nightly doc --all-features --open
all-features = true
rustdoc-args = ["--cfg", "doc_cfg"]

[badges]
is-it-maintained-issue-resolution = { repository = "Manta-Network/manta-rs" }
is-it-maintained-open-issues = { repository = "Manta-Network/manta-rs" }
maintenance = { status = "actively-developed" }

[features]
# Rayon Parallelization
rayon = ["dep:rayon", "manta-util/rayon"]

# Standard Library
std = []

[dependencies]
ark-ec = { version = "0.3.0", default-features = false }
ark-ff = { version = "0.3.0", default-features = false }
ark-groth16 = { version = "0.3.0", default-features = false }
ark-r1cs-std = { version = "0.3.1", default-features = false }
ark-relations = { version = "0.3.0", default-features = false }
ark-serialize = { version = "0.3.0", default-features = false, features = ["derive"] }
ark-snark = { version = "0.3.0", default-features = false }
ark-std = { version = "0.3.0", default-features = false }
derivative = { version = "2.2.0", default-features = false, features = ["use_core"] }
manta-crypto = { path = "../manta-crypto", default-features = false, features = ["getrandom"] }
manta-util = { path = "../manta-util", default-features = false, features = ["alloc"] }
rayon = { version = "1.5.3", optional = true, default-features = false }
workspace-hack = { version = "0.1.0", path = "../workspace-hack" }
1 change: 1 addition & 0 deletions manta-trusted-setup/LICENSE
1 change: 1 addition & 0 deletions manta-trusted-setup/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# manta-trusted-setup
Loading