New-generation Marlin with SonicKZG10 as PC

.integration/tests/dpc_testnet1.rs

@@ -54,7 +54,7 @@ fn dpc_testnet1_integration_test() {
             previous_block_hash: BlockHeaderHash([0u8; 32]),
             merkle_root_hash: MerkleRootHash([0u8; 32]),
             pedersen_merkle_root_hash: PedersenMerkleRootHash([0u8; 32]),
-            proof: ProofOfSuccinctWork([0u8; 972]),
+            proof: ProofOfSuccinctWork([0u8; 771]),
             time: 0,
             difficulty_target: 0xFFFF_FFFF_FFFF_FFFF_u64,
             nonce: 0,
@@ -187,7 +187,7 @@ fn dpc_testnet1_integration_test() {
         difficulty_target: previous_block.header.difficulty_target,
         nonce: 0,
         pedersen_merkle_root_hash: PedersenMerkleRootHash([0u8; 32]),
-        proof: ProofOfSuccinctWork([0u8; 972]),
+        proof: ProofOfSuccinctWork([0u8; 771]),
     };
 
     assert!(Testnet1DPC::verify_transactions(&dpc, &transactions.0, &ledger));
@@ -282,7 +282,7 @@ fn test_testnet1_dpc_execute_constraints() {
             difficulty_target: 0xFFFF_FFFF_FFFF_FFFF_u64,
             nonce: 0,
             pedersen_merkle_root_hash: PedersenMerkleRootHash([0u8; 32]),
-            proof: ProofOfSuccinctWork([0u8; 972]),
+            proof: ProofOfSuccinctWork([0u8; 771]),
         },
         transactions: Transactions::new(),
     };

.integration/tests/dpc_testnet2.rs

@@ -55,7 +55,7 @@ fn dpc_testnet2_integration_test() {
             previous_block_hash: BlockHeaderHash([0u8; 32]),
             merkle_root_hash: MerkleRootHash([0u8; 32]),
             pedersen_merkle_root_hash: PedersenMerkleRootHash([0u8; 32]),
-            proof: ProofOfSuccinctWork([0u8; 972]),
+            proof: ProofOfSuccinctWork([0u8; 771]),
             time: 0,
             difficulty_target: 0xFFFF_FFFF_FFFF_FFFF_u64,
             nonce: 0,
@@ -188,7 +188,7 @@ fn dpc_testnet2_integration_test() {
         difficulty_target: previous_block.header.difficulty_target,
         nonce: 0,
         pedersen_merkle_root_hash: PedersenMerkleRootHash([0u8; 32]),
-        proof: ProofOfSuccinctWork([0u8; 972]),
+        proof: ProofOfSuccinctWork([0u8; 771]),
     };
 
     assert!(dpc.verify_transactions(&transactions.0, &ledger));
@@ -284,7 +284,7 @@ fn test_testnet2_dpc_execute_constraints() {
             difficulty_target: 0xFFFF_FFFF_FFFF_FFFF_u64,
             nonce: 0,
             pedersen_merkle_root_hash: PedersenMerkleRootHash([0u8; 32]),
-            proof: ProofOfSuccinctWork([0u8; 972]),
+            proof: ProofOfSuccinctWork([0u8; 771]),
         },
         transactions: Transactions::new(),
     };
@@ -529,7 +529,7 @@ fn test_testnet2_dpc_execute_constraints() {
         println!("=========================================================");
         let num_constraints = outer_circuit_cs.num_constraints();
         println!("Outer circuit num constraints: {:?}", num_constraints);
-        assert_eq!(878967, num_constraints);
+        assert_eq!(787899, num_constraints);
         println!("=========================================================");
     }
 

algorithms/src/fft/domain.rs

@@ -604,7 +604,7 @@ mod tests {
             // Sample the random polynomial, evaluate it over the domain and the random point.
             let random_polynomial = DensePolynomial::<Fr>::rand(domain_size - 1, &mut thread_rng());
             let polynomial_evaluations = domain.fft(random_polynomial.coeffs());
-            let actual_evaluations = random_polynomial.evaluate(random_point);
+            let actual_evaluations = random_polynomial.evaluate(&random_point);
 
             // Do lagrange interpolation, and compare against the actual evaluation
             let mut interpolated_evaluation = Fr::zero();
@@ -677,8 +677,8 @@ mod tests {
             for (i, x) in domain.elements().enumerate() {
                 let coset_x = Fr::multiplicative_generator() * x;
 
-                assert_eq!(polynomial_evaluations[i], random_polynomial.evaluate(x));
-                assert_eq!(polynomial_coset_evaluations[i], random_polynomial.evaluate(coset_x));
+                assert_eq!(polynomial_evaluations[i], random_polynomial.evaluate(&x));
+                assert_eq!(polynomial_coset_evaluations[i], random_polynomial.evaluate(&coset_x));
             }
 
             let randon_polynomial_from_subgroup =

algorithms/src/fft/polynomial/dense.rs

@@ -90,17 +90,17 @@ impl<F: Field> DensePolynomial<F> {
     }
 
     /// Evaluates `self` at the given `point` in the field.
-    pub fn evaluate(&self, point: F) -> F {
+    pub fn evaluate(&self, point: &F) -> F {
         if self.is_zero() {
             return F::zero();
         } else if point.is_zero() {
             return self.coeffs[0];
         }
         let mut powers_of_point = vec![F::one()];
-        let mut cur = point;
+        let mut cur = point.clone();
         for _ in 0..self.degree() {
             powers_of_point.push(cur);
-            cur *= &point;
+            cur *= point;
         }
         assert_eq!(powers_of_point.len(), self.coeffs.len());
         let zero = F::zero();
@@ -484,7 +484,7 @@ mod tests {
             for (i, coeff) in p.coeffs.iter().enumerate() {
                 total += point.pow(&[i as u64]) * coeff;
             }
-            assert_eq!(p.evaluate(point), total);
+            assert_eq!(p.evaluate(&point), total);
         }
     }
 

algorithms/src/traits/snark.rs

@@ -41,12 +41,12 @@ pub trait SNARK {
     type PreparedVerifyingKey: Clone;
     type Proof: Clone + Debug + ToBytes + FromBytes + Send + Sync;
     type ProvingKey: Clone + ToBytes + FromBytes + Send + Sync;
-    type VerifierInput: ?Sized;
 
     // We can specify their defaults to `()` when `associated_type_defaults` feature becomes stable in Rust
     type UniversalSetupConfig: Clone;
     type UniversalSetupParameters: FromBytes + ToBytes + Clone;
 
+    type VerifierInput: ?Sized;
     type VerifyingKey: Clone
         + Send
         + Sync

dpc/src/parameters/testnet1.rs

@@ -153,7 +153,7 @@ impl Parameters for Testnet1Parameters {
     type ProgramIDCRHGadget = PoseidonCryptoHashGadget<Self::OuterScalarField, 4, false>;
     type ProgramIDTreeDigest = <Self::ProgramIDCRH as CRH>::Output;
     type ProgramIDTreeParameters = ProgramIDMerkleTreeParameters;
-    
+
     type RecordCommitmentScheme = BHPCompressedCommitment<EdwardsBls12, 48, 50>;
     type RecordCommitmentGadget = BHPCompressedCommitmentGadget<EdwardsBls12, Self::InnerScalarField, EdwardsBls12Gadget, 48, 50>;
     type RecordCommitment = <Self::RecordCommitmentScheme as CommitmentScheme>::Output;
@@ -166,7 +166,7 @@ impl Parameters for Testnet1Parameters {
     type RecordSerialNumberTreeCRH = BHPCompressedCRH<EdwardsBls12, 8, 32>;
     type RecordSerialNumberTreeDigest = <Self::RecordSerialNumberTreeCRH as CRH>::Output;
     type RecordSerialNumberTreeParameters = SerialNumberMerkleTreeParameters;
-    
+
     type SerialNumberNonceCRH = BHPCompressedCRH<EdwardsBls12, 32, 63>;
     type SerialNumberNonceCRHGadget = BHPCompressedCRHGadget<EdwardsBls12, Self::InnerScalarField, EdwardsBls12Gadget, 32, 63>;
 

dpc/src/parameters/testnet2.rs

@@ -61,7 +61,7 @@ use snarkvm_marlin::{
     PoseidonSponge,
 };
 use snarkvm_parameters::{testnet2::*, Parameter};
-use snarkvm_polycommit::marlin_pc::{marlin_kzg10::MarlinKZG10Gadget, MarlinKZG10};
+use snarkvm_polycommit::sonic_pc::{sonic_kzg10::SonicKZG10Gadget, SonicKZG10};
 use snarkvm_utilities::FromBytes;
 
 use once_cell::sync::OnceCell;
@@ -124,16 +124,16 @@ impl Parameters for Testnet2Parameters {
     type ProgramSNARK = MarlinSNARK<
         Self::InnerScalarField,
         Self::OuterScalarField,
-        MarlinKZG10<Self::InnerCurve>,
+        SonicKZG10<Self::InnerCurve>,
         FiatShamirAlgebraicSpongeRng<Self::InnerScalarField, Self::OuterScalarField, PoseidonSponge<Self::OuterScalarField>>,
         MarlinTestnet2Mode,
         ProgramPublicVariables<Self>,
     >;
     type ProgramSNARKGadget = MarlinVerificationGadget<
         Self::InnerScalarField,
         Self::OuterScalarField,
-        MarlinKZG10<Self::InnerCurve>,
-        MarlinKZG10Gadget<Self::InnerCurve, Self::OuterCurve, PairingGadget>,
+        SonicKZG10<Self::InnerCurve>,
+        SonicKZG10Gadget<Self::InnerCurve, Self::OuterCurve, PairingGadget>,
     >;
 
     type AccountCommitmentScheme = BHPCompressedCommitment<EdwardsBls12, 33, 48>;
@@ -173,7 +173,7 @@ impl Parameters for Testnet2Parameters {
     type ProgramIDCRHGadget = PoseidonCryptoHashGadget<Self::OuterScalarField, 4, false>;
     type ProgramIDTreeDigest = <Self::ProgramIDCRH as CRH>::Output;
     type ProgramIDTreeParameters = ProgramIDMerkleTreeParameters;
-    
+
     type RecordCommitmentScheme = BHPCompressedCommitment<EdwardsBls12, 48, 50>;
     type RecordCommitmentGadget = BHPCompressedCommitmentGadget<EdwardsBls12, Self::InnerScalarField, EdwardsBls12Gadget, 48, 50>;
     type RecordCommitment = <Self::RecordCommitmentScheme as CommitmentScheme>::Output;
@@ -186,10 +186,10 @@ impl Parameters for Testnet2Parameters {
     type RecordSerialNumberTreeCRH = BHPCompressedCRH<EdwardsBls12, 8, 32>;
     type RecordSerialNumberTreeDigest = <Self::RecordSerialNumberTreeCRH as CRH>::Output;
     type RecordSerialNumberTreeParameters = SerialNumberMerkleTreeParameters;
-    
+
     type SerialNumberNonceCRH = BHPCompressedCRH<EdwardsBls12, 32, 63>;
     type SerialNumberNonceCRHGadget = BHPCompressedCRHGadget<EdwardsBls12, Self::InnerScalarField, EdwardsBls12Gadget, 32, 63>;
-    
+
     dpc_setup!{account_commitment_scheme, ACCOUNT_COMMITMENT_SCHEME, AccountCommitmentScheme, ACCOUNT_COMMITMENT_INPUT} // TODO (howardwu): Rename to "AleoAccountCommitmentScheme0".
     dpc_setup!{account_encryption_scheme, ACCOUNT_ENCRYPTION_SCHEME, AccountEncryptionScheme, ACCOUNT_ENCRYPTION_AND_SIGNATURE_INPUT}
     dpc_setup!{account_signature_scheme, ACCOUNT_SIGNATURE_SCHEME, AccountSignatureScheme, ACCOUNT_ENCRYPTION_AND_SIGNATURE_INPUT}
@@ -210,7 +210,7 @@ impl Parameters for Testnet2Parameters {
             .hash_field_elements(&Self::inner_circuit_verifying_key().to_field_elements().expect("Failed to convert inner circuit verifying key to elements"))
             .expect("Failed to hash inner circuit verifying key elements"))
     }
-    
+
     dpc_snark_setup_with_mode!{Testnet2Parameters, inner_circuit_proving_key, INNER_CIRCUIT_PROVING_KEY, InnerSNARK, ProvingKey, InnerSNARKPKParameters, "inner circuit proving key"}
     dpc_snark_setup!{Testnet2Parameters, inner_circuit_verifying_key, INNER_CIRCUIT_VERIFYING_KEY, InnerSNARK, VerifyingKey, InnerSNARKVKParameters, "inner circuit verifying key"}
 
@@ -219,12 +219,12 @@ impl Parameters for Testnet2Parameters {
 
     dpc_snark_setup_with_mode!{Testnet2Parameters, outer_circuit_proving_key, OUTER_CIRCUIT_PROVING_KEY, OuterSNARK, ProvingKey, OuterSNARKPKParameters, "outer circuit proving key"}
     dpc_snark_setup!{Testnet2Parameters, outer_circuit_verifying_key, OUTER_CIRCUIT_VERIFYING_KEY, OuterSNARK, VerifyingKey, OuterSNARKVKParameters, "outer circuit verifying key"}
-    
+
     fn program_id_tree_parameters() -> &'static Self::ProgramIDTreeParameters {
         static PROGRAM_ID_TREE_PARAMETERS: OnceCell<<Testnet2Parameters as Parameters>::ProgramIDTreeParameters> = OnceCell::new();
         PROGRAM_ID_TREE_PARAMETERS.get_or_init(|| Self::ProgramIDTreeParameters::from(Self::program_id_crh().clone()))
     }
-    
+
     fn record_commitment_tree_parameters() -> &'static Self::RecordCommitmentTreeParameters {
         static RECORD_COMMITMENT_TREE_PARAMETERS: OnceCell<<Testnet2Parameters as Parameters>::RecordCommitmentTreeParameters> = OnceCell::new();
         RECORD_COMMITMENT_TREE_PARAMETERS.get_or_init(|| Self::RecordCommitmentTreeParameters::from(Self::record_commitment_tree_crh().clone()))
@@ -244,14 +244,3 @@ impl Parameters for Testnet2Parameters {
         Rc::new(RefCell::new(SRS::<_, _>::Universal(universal_srs)))
     }
 }
-
-// This is currently unused.
-//
-// use snarkvm_marlin::{FiatShamirAlgebraicSpongeRngVar, PoseidonSpongeVar};
-//
-// pub type FSG = FiatShamirAlgebraicSpongeRngVar<
-//     Self::InnerScalarField,
-//     Self::OuterScalarField,
-//     PoseidonSponge<Self::OuterScalarField>,
-//     PoseidonSpongeVar<Self::OuterScalarField>,
-// >;