Bugfix in key-distribution, lots of defense in depth - both based on zkao report

Author: lovesh

Cargo.lock

@@ -25,8 +25,8 @@ ark-dlog-gadget = { package = "ark-dlog-gadget", git = "https://github.com/Polym
 
 #dock_crypto_utils = { path = "../crypto/utils" }
 #schnorr_pok = { path = "../crypto/schnorr_pok" }
-dock_crypto_utils = { git = "https://github.com/PolymeshAssociation/crypto", branch = "main" }
-schnorr_pok = { git = "https://github.com/PolymeshAssociation/crypto", branch = "main" }
+dock_crypto_utils = { git = "https://github.com/PolymeshAssociation/crypto", branch = "patch30" }
+schnorr_pok = { git = "https://github.com/PolymeshAssociation/crypto", branch = "patch30" }
 
 # Polymesh changes.
 #ark-serialize = { path = "../arkworks-algebra/serialize" }
@@ -42,18 +42,18 @@ schnorr_pok = { git = "https://github.com/PolymeshAssociation/crypto", branch =
 #ark-curve25519 = { path = "../arkworks-algebra/curves/curve25519" }
 #ark-ed25519 = { path = "../arkworks-algebra/curves/ed25519" }
 
-ark-serialize = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-ec = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-host-msm = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-#ark-host-msm-impl = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-ff = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-pallas = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-vesta = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-helios = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-selene = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-wei25519 = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-curve25519 = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
-ark-ed25519 = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "polymesh-master" }
+ark-serialize = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-ec = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-host-msm = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+#ark-host-msm-impl = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-ff = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-pallas = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-vesta = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-helios = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-selene = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-wei25519 = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-curve25519 = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
+ark-ed25519 = { git = "https://github.com/PolymeshAssociation/arkworks-algebra.git", branch = "pasta-opts" }
 
 [workspace.dependencies]
 polymesh-dart = { path = "./", version = "0.1.0", default-features = false }

Cargo.toml

@@ -37,7 +37,7 @@ fn new_fee_account<R: CryptoRngCore>(
     pk: VerKey<PallasA>,
     balance: u64,
 ) -> FeeAccountState<PallasA> {
-    FeeAccountState::new(rng, pk.0, balance, asset_id)
+    FeeAccountState::new(rng, pk.0, balance, asset_id).unwrap()
 }
 
 fn create_shared_setup() -> (

dart-bp/benches/fee_account_proofs.rs

@@ -13,7 +13,7 @@ use ark_std::{format, string::ToString};
 use bulletproofs::r1cs::{ConstraintSystem, Prover};
 use bulletproofs::{BulletproofGens, PedersenGens};
 use dock_crypto_utils::transcript::MerlinTranscript;
-use polymesh_dart_common::Balance;
+use polymesh_dart_common::{Balance, MAX_BALANCE};
 use rand_core::CryptoRngCore;
 use schnorr_pok::partial::PartialSchnorrResponse;
 use schnorr_pok::{SchnorrChallengeContributor, SchnorrCommitment};
@@ -169,6 +169,10 @@ pub fn ensure_correct_balance_change<G: AffineRepr>(
 
     #[cfg(not(feature = "ignore_prover_input_sanitation"))]
     {
+        if amount > MAX_BALANCE {
+            return Err(Error::AmountTooLarge(amount));
+        }
+
         if has_balance_decreased {
             if new_state.balance() != old_state.balance() - amount {
                 return Err(Error::ProofGenerationError(