DAO::vote() tally votes for a proposal in DAO's state, later used by DAO::exec()

bin/daod/src/dao_contract/state.rs

@@ -1,6 +1,13 @@
 use incrementalmerkletree::{bridgetree::BridgeTree, Tree};
-use pasta_curves::pallas;
-use std::any::{Any, TypeId};
+use pasta_curves::{
+    arithmetic::CurveAffine,
+    group::{ff::Field, Curve, Group},
+    pallas,
+};
+use std::{
+    any::{Any, TypeId},
+    collections::HashMap,
+};
 
 use darkfi::{
     crypto::{
@@ -24,15 +31,26 @@ pub struct DaoBulla(pub pallas::Base);
 
 type MerkleTree = BridgeTree<MerkleNode, MERKLE_DEPTH>;
 
+pub struct ProposalVote {
+    proposal_bulla: pallas::Base,
+    /// Weighted vote commits
+    vote_commits: pallas::Point,
+    /// All value staked in the vote
+    value_commits: pallas::Point,
+}
+
 /// This DAO state is for all DAOs on the network. There should only be a single instance.
 pub struct State {
     dao_bullas: Vec<DaoBulla>,
     pub dao_tree: MerkleTree,
     pub dao_roots: Vec<MerkleNode>,
 
-    proposal_bullas: Vec<pallas::Base>,
+    //proposal_bullas: Vec<pallas::Base>,
     pub proposal_tree: MerkleTree,
     pub proposal_roots: Vec<MerkleNode>,
+    // Annoying, we cannot use pallas::Base as a HashMap key
+    //proposal_votes: HashMap<pallas::Base, ProposalVote>,
+    proposal_votes: Vec<ProposalVote>,
 }
 
 impl State {
@@ -41,9 +59,10 @@ impl State {
             dao_bullas: Vec::new(),
             dao_tree: MerkleTree::new(100),
             dao_roots: Vec::new(),
-            proposal_bullas: Vec::new(),
+            //proposal_bullas: Vec::new(),
             proposal_tree: MerkleTree::new(100),
             proposal_roots: Vec::new(),
+            proposal_votes: Vec::new(),
         })
     }
 
@@ -56,9 +75,14 @@ impl State {
 
     pub fn add_proposal_bulla(&mut self, bulla: pallas::Base) {
         let node = MerkleNode(bulla);
-        self.proposal_bullas.push(bulla);
+        //self.proposal_bullas.push(bulla);
         self.proposal_tree.append(&node);
         self.proposal_roots.push(self.proposal_tree.root(0).unwrap());
+        self.proposal_votes.push(ProposalVote {
+            proposal_bulla: bulla,
+            vote_commits: pallas::Point::identity(),
+            value_commits: pallas::Point::identity(),
+        });
     }
 
     pub fn is_valid_dao_merkle(&self, root: &MerkleNode) -> bool {