瀏覽代碼

fix broken dao-exec proof due to swapped numbers

x 3 年之前
父節點
當前提交
9558338545
共有 3 個文件被更改,包括 5 次插入19 次删除
  1. 3 15
      src/contract/dao/src/dao_client/exec.rs
  2. 0 2
      src/contract/dao/src/entrypoint.rs
  3. 2 2
      src/contract/dao/tests/integration.rs

+ 3 - 15
src/contract/dao/src/dao_client/exec.rs

@@ -134,19 +134,7 @@ impl Builder {
         let input_value_commit = pedersen_commitment_u64(self.input_value, self.input_value_blind);
         let input_value_commit_coords = input_value_commit.to_affine().coordinates().unwrap();
 
-        /*
-        let zk_info = zk_bins.lookup(&"dao-exec".to_string()).unwrap();
-        let zk_info = if let ZkContractInfo::Binary(info) = zk_info {
-            info
-        } else {
-            panic!("Not binary info")
-        };
-
-        let zk_bin = zk_info.bincode.clone();
-        */
-
         let prover_witnesses = vec![
-            //
             // proposal params
             Witness::Base(Value::known(proposal_dest_x)),
             Witness::Base(Value::known(proposal_dest_y)),
@@ -198,9 +186,9 @@ impl Builder {
         ];
 
         let circuit = ZkCircuit::new(prover_witnesses, exec_zkbin.clone());
-        //let input_proof = Proof::create(&exec_pk, &[circuit], &public_inputs, &mut OsRng)
-        //    .expect("DAO::exec() proving error!)");
-        //proofs.push(input_proof);
+        let input_proof = Proof::create(&exec_pk, &[circuit], &public_inputs, &mut OsRng)
+            .expect("DAO::exec() proving error!)");
+        proofs.push(input_proof);
 
         let params = DaoExecParams {
             proposal: proposal_bulla,

+ 0 - 2
src/contract/dao/src/entrypoint.rs

@@ -558,7 +558,6 @@ fn get_metadata(_: ContractId, ix: &[u8]) -> ContractResult {
             let input_value_coords = params.input_value_commit.to_affine().coordinates().unwrap();
 
             msg!("params.proposal: {:?}", params.proposal);
-            /*
             zk_public_values.push((
                 DAO_CONTRACT_ZKAS_DAO_EXEC_NS.to_string(),
                 vec![
@@ -576,7 +575,6 @@ fn get_metadata(_: ContractId, ix: &[u8]) -> ContractResult {
                     pallas::Base::zero(),
                 ],
             ));
-            */
 
             let mut metadata = vec![];
             zk_public_values.encode(&mut metadata)?;

+ 2 - 2
src/contract/dao/tests/integration.rs

@@ -79,8 +79,8 @@ async fn integration_test() -> Result<()> {
     let dao = dao_client::Dao {
         proposer_limit: 110,
         quorum: 110,
-        approval_ratio_base: 1,
-        approval_ratio_quot: 2,
+        approval_ratio_base: 2,
+        approval_ratio_quot: 1,
         gov_token_id: gdrk_token_id,
         public_key: dao_th.dao_kp.public,
         bulla_blind: pallas::Base::random(&mut OsRng),