Add inner proof size limit.

Author: Neopallium

benches/fee_payments.rs

@@ -25,7 +25,7 @@ fn fee_proof_benchmark(c: &mut Criterion) {
     // Benchmark: Generate FeeAccountRegistrationProof.
     c.bench_function("FeeAccountRegistrationProof generate", |b| {
         b.iter(|| {
-            let (_proof, _account_state) = FeeAccountRegistrationProof::new(
+            let (_proof, _account_state) = FeeAccountRegistrationProof::<()>::new(
                 &mut rng,
                 black_box(&account_keys.acct),
                 asset_id,
@@ -37,7 +37,7 @@ fn fee_proof_benchmark(c: &mut Criterion) {
     });
 
     // Generate a registration proof for verification benchmark.
-    let (reg_proof, mut fee_account_state) = FeeAccountRegistrationProof::new(
+    let (reg_proof, mut fee_account_state) = FeeAccountRegistrationProof::<()>::new(
         &mut rng,
         &account_keys.acct,
         asset_id,
@@ -77,7 +77,7 @@ fn fee_proof_benchmark(c: &mut Criterion) {
     // Benchmark: Generate FeeAccountTopupProof.
     c.bench_function("FeeAccountTopupProof generate", |b| {
         b.iter(|| {
-            let _proof = FeeAccountTopupProof::new(
+            let _proof = FeeAccountTopupProof::<()>::new(
                 &mut rng,
                 black_box(&account_keys.acct),
                 &mut fee_account_state.clone(),
@@ -90,7 +90,7 @@ fn fee_proof_benchmark(c: &mut Criterion) {
     });
 
     // Generate a topup proof for verification benchmark.
-    let topup_proof = FeeAccountTopupProof::new(
+    let topup_proof = FeeAccountTopupProof::<()>::new(
         &mut rng,
         &account_keys.acct,
         &mut fee_account_state,
@@ -129,7 +129,7 @@ fn fee_proof_benchmark(c: &mut Criterion) {
     // Benchmark: Generate FeeAccountPaymentProof.
     c.bench_function("FeeAccountPaymentProof generate", |b| {
         b.iter(|| {
-            let _proof = FeeAccountPaymentProof::new(
+            let _proof = FeeAccountPaymentProof::<()>::new(
                 &mut rng,
                 black_box(&account_keys.acct),
                 ctx,
@@ -142,7 +142,7 @@ fn fee_proof_benchmark(c: &mut Criterion) {
     });
 
     // Generate a payment proof for verification benchmark.
-    let payment_proof = FeeAccountPaymentProof::new(
+    let payment_proof = FeeAccountPaymentProof::<()>::new(
         &mut rng,
         &account_keys.acct,
         ctx,

benches/proof_benchmark.rs

@@ -41,7 +41,7 @@ fn proof_benchmark(c: &mut Criterion) {
     // Benchmark: Generate account asset registration proof.
     c.bench_function("AccountAssetRegistrationProof generate", |b| {
         b.iter(|| {
-            let (_proof, mut _account_state) = AccountAssetRegistrationProof::new(
+            let (_proof, mut _account_state) = AccountAssetRegistrationProof::<()>::new(
                 &mut rng,
                 black_box(&issuer_keys),
                 asset_id,
@@ -54,7 +54,7 @@ fn proof_benchmark(c: &mut Criterion) {
     });
 
     // Generate a proof to benchmark verification.
-    let (proof, mut account_state) = AccountAssetRegistrationProof::new(
+    let (proof, mut account_state) = AccountAssetRegistrationProof::<()>::new(
         &mut rng,
         black_box(&issuer_keys),
         asset_id,
@@ -121,7 +121,7 @@ fn proof_benchmark(c: &mut Criterion) {
     }
 
     // Register the investor's account state.
-    let (_proof, mut investor_account_state) = AccountAssetRegistrationProof::new(
+    let (_proof, mut investor_account_state) = AccountAssetRegistrationProof::<()>::new(
         &mut rng,
         &investor_keys,
         asset_id,
@@ -153,7 +153,7 @@ fn proof_benchmark(c: &mut Criterion) {
     let leg_amount = 500u64;
     c.bench_function("AssetMintingProof generate", |b| {
         b.iter(|| {
-            let _proof = AssetMintingProof::new(
+            let _proof = AssetMintingProof::<(), _>::new(
                 &mut rng,
                 &issuer_keys,
                 ctx,
@@ -166,7 +166,7 @@ fn proof_benchmark(c: &mut Criterion) {
     });
 
     // Generate a proof to benchmark verification.
-    let proof = AssetMintingProof::new(
+    let proof = AssetMintingProof::<(), _>::new(
         &mut rng,
         &issuer_keys,
         ctx,
@@ -289,7 +289,7 @@ fn proof_benchmark(c: &mut Criterion) {
         .map(|_| {
             let mut rng = rand::thread_rng();
             let mut account_state = account_state.clone();
-            SenderAffirmationProof::new(
+            SenderAffirmationProof::<()>::new(
                 &mut rng,
                 &issuer_keys,
                 &leg_ref,
@@ -425,7 +425,7 @@ fn proof_benchmark(c: &mut Criterion) {
             let med_enc = leg_enc
                 .mediator_encryption(0)
                 .expect("Failed to get mediator encryption for mediator affirmation proof");
-            let _proof = MediatorAffirmationProof::new(
+            let _proof = MediatorAffirmationProof::<()>::new(
                 &mut rng,
                 &leg_ref,
                 &med_enc,
@@ -442,7 +442,7 @@ fn proof_benchmark(c: &mut Criterion) {
         .mediator_encryption(0)
         .expect("Failed to get mediator encryption for mediator affirmation proof");
     let proof =
-        MediatorAffirmationProof::new(&mut rng, &leg_ref, &med_enc, &mediator_keys, 0, true)
+        MediatorAffirmationProof::<()>::new(&mut rng, &leg_ref, &med_enc, &mediator_keys, 0, true)
             .expect("Failed to generate mediator affirmation proof");
 
     // Benchmark: Verify mediator affirmation proof.

dart-common/src/lib.rs

@@ -52,3 +52,5 @@ pub const MAX_ACCOUNT_ASSET_REG_PROOFS: u32 = 50;
 pub const MAX_BATCHED_PROOFS: u32 = 10;
 pub const MAX_FEE_ACCOUNT_REG_PROOFS: u32 = 10;
 pub const MAX_FEE_ACCOUNT_TOPUP_PROOFS: u32 = 10;
+
+pub const MAX_INNER_PROOF_SIZE: u32 = 10 * 1024;

dart-testing-cli/src/lib.rs

@@ -860,8 +860,14 @@ impl DartTestingDb {
             (proof, asset_state)
         } else {
             // Create registration proof and initial state.
-            let (proof, asset_state) =
-                AccountAssetRegistrationProof::new(rng, &account_keys, asset_id, 0, &did, params)?;
+            let (proof, asset_state) = AccountAssetRegistrationProof::<()>::new(
+                rng,
+                &account_keys,
+                asset_id,
+                0,
+                &did,
+                params,
+            )?;
 
             // Update the account state with the pending state change.
             self.update_account_asset_state(&account_info, &asset_state)?;
@@ -941,7 +947,7 @@ impl DartTestingDb {
         } else {
             let account_keys = account_info.account_keys()?;
             // Create minting proof
-            let proof = AssetMintingProof::new(
+            let proof = AssetMintingProof::<()>::new(
                 rng,
                 &account_keys,
                 &did,
@@ -1199,7 +1205,7 @@ impl DartTestingDb {
                 }
 
                 // Generate sender affirmation proof
-                Ok(SenderAffirmationProof::new(
+                Ok(SenderAffirmationProof::<()>::new(
                     rng,
                     &account_keys,
                     &leg_ref,
@@ -1261,7 +1267,7 @@ impl DartTestingDb {
             proof_action,
             |account_keys, leg_ref, leg_enc, _leg, account_state, account_tree, rng| {
                 // Create sender counter update proof
-                Ok(SenderCounterUpdateProof::new(
+                Ok(SenderCounterUpdateProof::<()>::new(
                     rng,
                     &account_keys,
                     &leg_ref,
@@ -1322,7 +1328,7 @@ impl DartTestingDb {
             |account_keys, leg_ref, leg_enc, leg, account_state, account_tree, rng| {
                 let amount = leg.amount();
                 // Create sender reversal proof
-                Ok(SenderReversalProof::new(
+                Ok(SenderReversalProof::<()>::new(
                     rng,
                     &account_keys,
                     &leg_ref,
@@ -1392,7 +1398,7 @@ impl DartTestingDb {
                 }
 
                 // Create receiver affirmation proof
-                Ok(ReceiverAffirmationProof::new(
+                Ok(ReceiverAffirmationProof::<()>::new(
                     rng,
                     &account_keys,
                     &leg_ref,
@@ -1463,7 +1469,7 @@ impl DartTestingDb {
             let _leg = encrypted_leg.decrypt(LegRole::mediator(0), &account_keys)?;
 
             // Create mediator affirmation proof
-            MediatorAffirmationProof::new(rng, &leg_ref, &med_enc, &account_keys, 0, accept)?
+            MediatorAffirmationProof::<()>::new(rng, &leg_ref, &med_enc, &account_keys, 0, accept)?
         };
 
         // If proof action is to generate only, save proof and return
@@ -1527,7 +1533,7 @@ impl DartTestingDb {
             proof_action,
             |account_keys, leg_ref, leg_enc, leg, asset_state, account_tree, rng| {
                 // Create receiver claim proof
-                Ok(ReceiverClaimProof::new(
+                Ok(ReceiverClaimProof::<()>::new(
                     rng,
                     &account_keys,
                     &leg_ref,

src/bp/account.rs

@@ -22,6 +22,7 @@ use polymesh_dart_common::NullifierSkGenCounter;
 use super::*;
 use crate::account_reg_split::AccountRegHostProtocol;
 use crate::auth_proofs::create_registration_auth_proof;
+use crate::encode::BoundedCanonical;
 use crate::*;
 
 pub(crate) type BPAccountState = bp_account::AccountState<PallasA>;
@@ -340,7 +341,7 @@ impl AccountAssetState {
 #[derive(Clone, Encode, Decode, DecodeWithMemTracking, Debug, TypeInfo, PartialEq, Eq)]
 #[scale_info(skip_type_params(T))]
 pub struct BatchedAccountAssetRegistrationProof<T: DartLimits = ()> {
-    pub proofs: BoundedVec<AccountAssetRegistrationProof, T::MaxAccountAssetRegProofs>,
+    pub proofs: BoundedVec<AccountAssetRegistrationProof<T>, T::MaxAccountAssetRegProofs>,
 }
 
 impl<T: DartLimits> BatchedAccountAssetRegistrationProof<T> {
@@ -513,16 +514,18 @@ impl<T: DartLimits> BatchedAccountAssetRegistrationProof<T> {
 
 /// Account asset registration proof.  Report section 5.1.3 "Account Registration".
 #[derive(Clone, Encode, Decode, DecodeWithMemTracking, Debug, TypeInfo, PartialEq, Eq)]
-pub struct AccountAssetRegistrationProof {
+#[scale_info(skip_type_params(T))]
+pub struct AccountAssetRegistrationProof<T: DartLimits = ()> {
     pub account: AccountPublicKeys,
     pub asset_id: AssetId,
     pub counter: NullifierSkGenCounter,
     pub account_state_commitment: AccountStateCommitment,
 
-    pub(crate) inner: WrappedCanonical<account_registration::RegTxnProof<PallasA>>,
+    pub(crate) inner:
+        BoundedCanonical<account_registration::RegTxnProof<PallasA>, T::MaxInnerProofSize>,
 }
 
-impl AccountAssetRegistrationProof {
+impl<T: DartLimits> AccountAssetRegistrationProof<T> {
     /// Generate a new account state for an asset and a registration proof for it.
     pub fn new<R: RngCore + CryptoRng>(
         rng: &mut R,

src/bp/account_reg_split.rs

@@ -75,13 +75,13 @@ impl AccountRegHostProtocol {
         ))
     }
 
-    pub fn finish<R: RngCore + CryptoRng>(
+    pub fn finish<R: RngCore + CryptoRng, T: DartLimits>(
         mut self,
         rng: &mut R,
         device_response: &TwoSksDeviceResponse,
         counter: NullifierSkGenCounter,
         tree_params: &CurveTreeParameters<AccountTreeConfig>,
-    ) -> Result<AccountAssetRegistrationProof, Error> {
+    ) -> Result<AccountAssetRegistrationProof<T>, Error> {
         let auth_proof = device_response.0.decode()?;
 
         let challenge_h_final =
@@ -107,7 +107,7 @@ impl AccountRegHostProtocol {
             asset_id: self.account_state.asset_id(),
             counter,
             account_state_commitment: self.account_state.current_commitment()?,
-            inner: WrappedCanonical::wrap(&bp_proof)?,
+            inner: BoundedCanonical::wrap(&bp_proof)?,
         })
     }
 }