Skip to content

Commit

Permalink
Merge pull request #154 from KogarashiNetwork/feature/release-zkrollu…
Browse files Browse the repository at this point in the history
…p-and-redjubjub

zkrollup and redjubjub release
  • Loading branch information
ashWhiteHat authored Nov 5, 2023
2 parents 6998af0 + 077ec9f commit 6ac2ccd
Show file tree
Hide file tree
Showing 34 changed files with 139 additions and 125 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ target
proptest-regressions
*.proptest-regressions
*.kog
.idea
.idea
162 changes: 81 additions & 81 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ she-elgamal = { path = "./primitive/elgamal", default-features = false }
jub-jub = { path = "./primitive/jubjub", default-features = false }
poly-commit = { path = "./primitive/poly", default-features = false }
ec-pairing = { path = "./primitive/pairing", default-features = false }
zero-plonk = { path = "./primitive/plonk", default-features = false }
zkplonk = { path = "./primitive/plonk", default-features = false }
zkrollup = { path = "./primitive/zkrollup", default-features = false }
zksnarks = { path = "./primitive/zksnarks", default-features = false }
# pallet
Expand Down
2 changes: 1 addition & 1 deletion benches/confidential_transfer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use ec_pairing::TatePairing;
use jub_jub::*;
use rand::{rngs::StdRng, SeedableRng};
use she_elgamal::EncryptedNumber;
use zero_plonk::prelude::*;
use zkplonk::prelude::*;
use zksnarks::keypair::Keypair;
use zksnarks::plonk::PlonkParams;
use zksnarks::public_params::PublicParameters;
Expand Down
Loading

0 comments on commit 6ac2ccd

Please sign in to comment.