Factor sapling into a module that can be extracted to a separate crate. #351
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nuttycom
force-pushed
the
refactor/component_modules_1
branch
from
f5efa7c to
6c8af37
Compare
nuttycom
force-pushed
the
refactor/component_modules_1
branch
2 times, most recently
from
e8e5158 to
315bcc7
Compare
nuttycom
changed the title
nuttycom
force-pushed
the
refactor/component_modules_1
branch
from
315bcc7 to
de7b52f
Compare
Codecov Report
@@ Coverage Diff @@
## master #351 +/- ##
==========================================
+ Coverage 64.91% 64.92% +0.01%
==========================================
Files 73 72 -1
Lines 7171 7168 -3
==========================================
- Hits 4655 4654 -1
+ Misses 2516 2514 -2
Continue to review full report at Codecov.
|
nuttycom
force-pushed
the
refactor/component_modules_1
branch
2 times, most recently
from
2dc1ea3 to
8cbb274
Compare
str4d
force-pushed
the
refactor/component_modules_1
branch
from
8cbb274 to
33effb7
Compare
str4d
approved these changes
Mar 27, 2021
| @@ -4,7 +4,7 @@ use std::fmt::Debug; | |||
| use zcash_primitives::{ | |||
| consensus::{self, BranchId, NetworkUpgrade}, | |||
| memo::MemoBytes, | |||
| prover::TxProver, | |||
| sapling::prover::TxProver, | |||
There was a problem hiding this comment.
I don't entirely agree with this refactor; TxProver was intended to be a generic prover interface that handled whatever proofs were necessary. But currently in the orchard crate we are inlining proof creation, so let's do this refactor for now and then figure out a common prover interface later.
str4d
force-pushed
the
refactor/component_modules_1
branch
from
ce8cf56 to
ab66b2d
Compare
str4d
force-pushed
the
refactor/component_modules_1
branch
from
ab66b2d to
eefc516
Compare
mat-if
added a commit
to mat-if/ironfish
that referenced
this pull request
Mar 23, 2022
mat-if
added a commit
to iron-fish/ironfish
that referenced
this pull request
Apr 5, 2022
* Update to librustzcash commit 139fc09f1028f0f2d073748dfca8529dbe98807b * Update to librustzcash commit 81c3b54b24cb4a402e70a13c79711edada583a1e * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - prep Cargo.toml * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - remove obsolete generic arguments * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - Remove JubJubEngine * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - Remove Jubjub Params * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - add new jubjub crate * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - change J:Fs to jubjub::Fr * Fix cargo.toml jubjub version * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - change edwards::Point<_, Unknown> to ExtendedPoint * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - change edwards::Point<_, PrimeOrder> to SubgroupPoint * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - change edwards::Point::zero() to ExtendedPoint::identity() * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - Remove fn is_small_order() in favor of ExtendedPoint::is_small_order() * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - FixedGenerators::ValueCommitmentValue -> VALUE_COMMITMENT_VALUE_GENERATOR * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - FixedGenerators::SpendingKeyGenerator -> SPENDING_KEY_GENERATOR * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - FixedGenerators::ProofGenerationKey -> PROOF_GENERATION_KEY_GENERATOR * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - FixedGenerators::ValueCommitmentRandomness -> VALUE_COMMITMENT_RANDOMNESS * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - Remove ToUniform, replace to_uniform with from_bytes_wide * Cargo.toml: Add bls12_381, format * librustzcash commit fdf06032e3d549cd31aae67eecbb8e4a6692d8d9 - pairing::bls12_381 -> bls12_381 * Add temporary phantom data to avoid too much unnecessary refactoring right away - we have plenty of errors to fix, but cargo is adamant this is more important for now * Replace .negate() with - operator * Replace .add() with + * Remove more unneeded generic arguments: PublicKey, PrivateKey, ValueCommitment, pedersen_hash * Replace .mul() with * * .is_small_order() -> is_small_order().into() to properly cast to bool * Add type annotations that the compiler is requesting * .to_xy() changed to .to_affine() * Fix typo to_bytes_wide * Add missing phantom * .write() to copy_from_slice/write_all * More type annotations * .read to from_bytes/read_exact * First pass of removing J from PublicAddress * Begin removing J trait from helper fns * Remove J trait from Sapling * Remove J from IncomingViewKey * Remove J from OutgoingViewKey * Remove J from ViewKeys * Remove J from SaplingKey * Remove J From Note * Finish removing J from PublicAddress * More J removals, mostly from tests * Begin removing J::Fr in favor of Scalar from some key fns * Remove J from MerkleNote * Remove J from MerkleNoteHash * Use Bls12 directly for groth16::Proof * Remove J from ReceiptProof * Remove J from ReceiptParams * Remove J from Witness * Remove J from SpendProof * Remove J from Transaction * Remove J from SpendParams * Remove J from ProposedTransaction * Remove J from test utils * Function renames, cm -> cmu/commitment * Update to now-separate libs * ff update: BitIterator deprecated in favor of .to_le_bits() * Another J removal from util fn * Update cargo.toml with update note * Use librustzcash Nullifier, implemented here: zcash/librustzcash#307 * Log commit in cargo.toml * Remove aes* patches from Cargo since we are now using versions still listed on crates.io * Update imports for zcash_primitives, mostly now under zcash_primitives::sapling: zcash/librustzcash#351 * Update deps; -wasm probably doesnt work atm. librustzcash commit: d50bb12a97da768dc8f3ee39b81f84262103e6eb * Dep updates; minor trait change for librustzcash 2ba80739710f2511b18b67a7f9e082d390427a00 * Minor change, dep upgrades to latest version of librustzcash * Update ironfish-rust-nodejs to latest version of librustzcash/ironfish-rust changes * Update ironfish-rust-nodejs to latest version of librustzcash/ironfish-rust changes * Remove now unneeded Sapling in many places, smattering of other lint fixes * Clippy pass * Downgrade to tagged release version 0.5 for testing * Remove unneeded deps from -wasm cargo * Remove unneeded pairing dep, use intended version of blake2 deps * Cargo cleanup and clippy fix * Update tarpaulin and add --avoid-cfg-tarpaulin to work around bug in pinned bitvec sub-dependency * Use forked bellman for performance * Alphabetize cargo deps * Remove hasher from Witness * Add initialize_sapling fn to explicitly load the sapling parameters * Update tests to use initializeSapling
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Builds on #348