dao-exec fix: approval ratio/quotient are reversed

bin/drk/src/main.rs

@@ -712,8 +712,8 @@ async fn main() -> Result<()> {
                     exit(1);
                 }
 
-                let approval_ratio_quot = 100_u64;
-                let approval_ratio_base = (approval_ratio * approval_ratio_quot as f64) as u64;
+                let approval_ratio_base = 100_u64;
+                let approval_ratio_quot = (approval_ratio * approval_ratio_base as f64) as u64;
 
                 let gov_token_id =
                     TokenId::try_from(gov_token_id.as_str()).with_context(|| "Invalid Token ID")?;

bin/drk/src/rpc_dao.rs

@@ -523,6 +523,7 @@ impl Drk {
             total_all_vote_blind += vote.all_vote_blind;
 
             let yes_vote_value = vote.vote_option as u64 * vote.all_vote_value;
+            eprintln!("yes_vote = {}", yes_vote_value);
             total_yes_vote_value += yes_vote_value;
             total_all_vote_value += vote.all_vote_value;
 
@@ -533,6 +534,8 @@ impl Drk {
             blind_total_vote.aggregate(blind_vote);
         }
 
+        eprintln!("yes = {}, all = {}", total_yes_vote_value, total_all_vote_value);
+
         let prop_t = DaoProposalInfo {
             dest: proposal.recipient,
             amount: proposal.amount,
@@ -541,6 +544,9 @@ impl Drk {
             blind: proposal.bulla_blind, // <-- FIXME: wtf
         };
 
+        // TODO: user blind weirdness in proposal
+        // TODO: allvote/yesvote is 11 weirdly
+
         let dao_t = DaoInfo {
             proposer_limit: dao.proposer_limit,
             quorum: dao.quorum,

bin/drk/src/wallet_dao.rs

@@ -87,7 +87,7 @@ impl fmt::Display for DaoParams {
             encode_base10(self.quorum, 8),
             self.quorum,
             "Approval ratio",
-            self.approval_ratio_base as f64 / self.approval_ratio_quot as f64,
+            self.approval_ratio_quot as f64 / self.approval_ratio_base as f64,
             "Governance Token ID",
             self.gov_token_id,
             "Public key",
@@ -164,7 +164,7 @@ impl fmt::Display for Dao {
             encode_base10(self.quorum, 8),
             self.quorum,
             "Approval ratio",
-            self.approval_ratio_base as f64 / self.approval_ratio_quot as f64,
+            self.approval_ratio_quot as f64 / self.approval_ratio_base as f64,
             "Governance Token ID",
             self.gov_token_id,
             "Public key",