add trait for clarity

Cardinal-Cryptography · Feb 19, 2024 · 9746310 · 9746310
1 parent 82b8021
commit 9746310
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/relations/src/account.rs b/relations/src/account.rs
@@ -1,22 +1,21 @@
 use halo2_base::{gates::GateChip, utils::BigPrimeField, AssignedValue, Context};
 
-use crate::operation::{CircuitOperation, Operation};
+use crate::{
+    operation::{CircuitOperation, Operation},
+    CloneToVec,
+};
 
-pub trait Account<F: BigPrimeField> {
+pub trait Account<F: BigPrimeField>: CloneToVec<F> {
     type CircuitAccount: CircuitAccount<F>;
     type Op: Operation<F>;
 
     fn update(&self, op: &Self::Op) -> Self;
 
-    fn to_array(&self) -> Vec<F>;
-
     fn load(&self, ctx: &mut Context<F>) -> Self::CircuitAccount;
 }
 
-pub trait CircuitAccount<F: BigPrimeField> {
+pub trait CircuitAccount<F: BigPrimeField>: CloneToVec<AssignedValue<F>> {
     type Op: CircuitOperation<F>;
 
     fn update(&self, op: Self::Op, ctx: &mut Context<F>, gate: &GateChip<F>) -> Self;
-
-    fn to_array(&self) -> Vec<AssignedValue<F>>;
 }
diff --git a/relations/src/lib.rs b/relations/src/lib.rs
@@ -10,6 +10,10 @@ pub enum Token {
     USDT,
 }
 
+pub trait CloneToVec<T> {
+    fn clone_to_vec(&self) -> Vec<T>;
+}
+
 pub mod poseidon_consts {
     /// Has to be greater than 1 and equal to RATE + 1, due to the outer Poseidon implementation.
     pub const T_WIDTH: usize = RATE + 1;

diff --git a/relations/src/note.rs b/relations/src/note.rs
@@ -1,5 +1,7 @@
 use halo2_base::{utils::ScalarField, AssignedValue, Context};
 
+use crate::CloneToVec;
+
 #[derive(Clone, Copy, Debug)]
 pub struct Note<F: ScalarField> {
     pub zk_id: F,
@@ -18,10 +20,6 @@ impl<F: ScalarField> Note<F> {
         }
     }
 
-    pub fn to_array(&self) -> [F; 4] {
-        [self.zk_id, self.trapdoor, self.nullifier, self.account_hash]
-    }
-
     pub fn load(&self, ctx: &mut Context<F>) -> CircuitNote<F> {
         CircuitNote {
             zk_id: ctx.load_witness(self.zk_id),
@@ -32,6 +30,12 @@ impl<F: ScalarField> Note<F> {
     }
 }
 
+impl<F: ScalarField> CloneToVec<F> for Note<F> {
+    fn clone_to_vec(&self) -> Vec<F> {
+        vec![self.zk_id, self.trapdoor, self.nullifier, self.account_hash]
+    }
+}
+
 #[derive(Clone, Copy, Debug)]
 pub struct CircuitNote<F: ScalarField> {
     pub zk_id: AssignedValue<F>,
@@ -40,8 +44,8 @@ pub struct CircuitNote<F: ScalarField> {
     pub account_hash: AssignedValue<F>,
 }
 
-impl<F: ScalarField> CircuitNote<F> {
-    pub fn to_array(&self) -> [AssignedValue<F>; 4] {
-        [self.zk_id, self.trapdoor, self.nullifier, self.account_hash]
+impl<F: ScalarField> CloneToVec<AssignedValue<F>> for CircuitNote<F> {
+    fn clone_to_vec(&self) -> Vec<AssignedValue<F>> {
+        vec![self.zk_id, self.trapdoor, self.nullifier, self.account_hash]
     }
 }
diff --git a/relations/src/relations/update_account.rs b/relations/src/relations/update_account.rs
@@ -59,7 +59,7 @@ pub fn verify_account_circuit<F, A>(
     F: BigPrimeField,
     A: CircuitAccount<F>,
 {
-    let inner_account_hash = poseidon.hash_fix_len_array(ctx, gate, &account.to_array());
+    let inner_account_hash = poseidon.hash_fix_len_array(ctx, gate, &account.clone_to_vec());
     let eq = gate.is_equal(ctx, account_hash, inner_account_hash);
     gate.assert_is_const(ctx, &eq, &F::ONE);
 }

diff --git a/relations/src/relations/update_note.rs b/relations/src/relations/update_note.rs
@@ -12,6 +12,7 @@ use crate::{
     note::{CircuitNote, Note},
     operation::{CircuitOperation, Operation},
     poseidon_consts::{RATE, R_F, R_P, T_WIDTH},
+    CloneToVec,
 };
 
 type OpFor<A, F> = <<A as Account<F>>::CircuitAccount as CircuitAccount<F>>::Op;
@@ -96,7 +97,7 @@ fn verify_note_circuit<F>(
 ) where
     F: BigPrimeField,
 {
-    let inner_note_hash = poseidon.hash_fix_len_array(ctx, gate, &note.to_array());
+    let inner_note_hash = poseidon.hash_fix_len_array(ctx, gate, &note.clone_to_vec());
     let eq = gate.is_equal(ctx, note_hash, inner_note_hash);
     gate.assert_is_const(ctx, &eq, &F::ONE);
 }
@@ -127,7 +128,7 @@ pub fn update_note_circuit<F, A, const TREE_HEIGHT: usize>(
 
     verify_note_circuit(ctx, &gate, &mut poseidon, &input.new_note, new_note_hash);
 
-    let old_note_hash = poseidon.hash_fix_len_array(ctx, &gate, &input.old_note.to_array());
+    let old_note_hash = poseidon.hash_fix_len_array(ctx, &gate, &input.old_note.clone_to_vec());
 
     let merkle_proof = input.merkle_proof;