remove Dao prefix from proof names

src/contract/dao/proof/auth-money-transfer-enc-coin.zk

@@ -1,13 +1,13 @@
 k = 13;
 field = "pallas";
 
-constant "DaoAuthMoneyTransferEncCoin" {
+constant "AuthMoneyTransferEncCoin" {
     EcFixedPointShort VALUE_COMMIT_VALUE,
     EcFixedPoint VALUE_COMMIT_RANDOM,
     EcFixedPointBase NULLIFIER_K,
 }
 
-witness "DaoAuthMoneyTransferEncCoin" {
+witness "AuthMoneyTransferEncCoin" {
     # Coin attributes
     EcNiPoint coin_public_key,
     Base coin_value,
@@ -20,7 +20,7 @@ witness "DaoAuthMoneyTransferEncCoin" {
     Base ephem_secret,
 }
 
-circuit "DaoAuthMoneyTransferEncCoin" {
+circuit "AuthMoneyTransferEncCoin" {
     # cast to EcPoint
     # (otherwise zkas refuses to compile)
     ONE = witness_base(1);

src/contract/dao/proof/auth-money-transfer.zk

@@ -1,13 +1,13 @@
 k = 13;
 field = "pallas";
 
-constant "DaoAuthMoneyTransfer" {
+constant "AuthMoneyTransfer" {
     EcFixedPointShort VALUE_COMMIT_VALUE,
     EcFixedPoint VALUE_COMMIT_RANDOM,
     EcFixedPointBase NULLIFIER_K,
 }
 
-witness "DaoAuthMoneyTransfer" {
+witness "AuthMoneyTransfer" {
     # Proposal parameters
     Base proposal_auth_calls_commit,
     Base proposal_current_day,
@@ -39,7 +39,7 @@ witness "DaoAuthMoneyTransfer" {
     Base ephem_secret,
 }
 
-circuit "DaoAuthMoneyTransfer" {
+circuit "AuthMoneyTransfer" {
     # cast to EcPoint
     # (otherwise zkas refuses to compile)
     ONE = witness_base(1);

src/contract/dao/proof/exec.zk

@@ -1,13 +1,13 @@
 k = 13;
 field = "pallas";
 
-constant "DaoExec" {
+constant "Exec" {
     EcFixedPointShort VALUE_COMMIT_VALUE,
     EcFixedPoint VALUE_COMMIT_RANDOM,
     EcFixedPointBase NULLIFIER_K,
 }
 
-witness "DaoExec" {
+witness "Exec" {
     # Proposal parameters
     Base proposal_auth_calls_commit,
     Base proposal_current_day,
@@ -35,7 +35,7 @@ witness "DaoExec" {
     Base signature_secret,
 }
 
-circuit "DaoExec" {
+circuit "Exec" {
     dao_bulla = poseidon_hash(
         dao_proposer_limit,
         dao_quorum,

src/contract/dao/proof/mint.zk

@@ -1,12 +1,12 @@
 k = 13;
 field = "pallas";
 
-constant "DaoMint" {
+constant "Mint" {
     EcFixedPoint VALUE_COMMIT_RANDOM,
     EcFixedPointBase NULLIFIER_K,
 }
 
-witness "DaoMint" {
+witness "Mint" {
     Base dao_proposer_limit,
     Base dao_quorum,
     Base dao_approval_ratio_quot,
@@ -16,7 +16,7 @@ witness "DaoMint" {
     Base dao_bulla_blind,
 }
 
-circuit "DaoMint" {
+circuit "Mint" {
     # This circuit states that the bulla is a hash of 8 values
 
     dao_public = ec_mul_base(dao_secret, NULLIFIER_K);

src/contract/dao/proof/propose-input.zk

@@ -1,13 +1,13 @@
 k = 13;
 field = "pallas";
 
-constant "DaoProposeInput" {
+constant "ProposeInput" {
     EcFixedPointBase NULLIFIER_K,
     EcFixedPoint VALUE_COMMIT_RANDOM,
     EcFixedPointShort VALUE_COMMIT_VALUE,
 }
 
-witness "DaoProposeInput" {
+witness "ProposeInput" {
     Base coin_secret,
     Base coin_value,
     Base coin_token,
@@ -24,7 +24,7 @@ witness "DaoProposeInput" {
     Base signature_secret,
 }
 
-circuit "DaoProposeInput" {
+circuit "ProposeInput" {
     # Coin hash
     pub = ec_mul_base(coin_secret, NULLIFIER_K);
     pub_x = ec_get_x(pub);

src/contract/dao/proof/propose-main.zk

@@ -1,12 +1,12 @@
 k = 13;
 field = "pallas";
 
-constant "DaoProposeMain" {
+constant "ProposeMain" {
     EcFixedPointShort VALUE_COMMIT_VALUE,
     EcFixedPoint VALUE_COMMIT_RANDOM,
 }
 
-witness "DaoProposeMain" {
+witness "ProposeMain" {
     # Proposers total number of governance tokens
     Base total_funds,
     Scalar total_funds_blind,
@@ -35,7 +35,7 @@ witness "DaoProposeMain" {
     MerklePath dao_path,
 }
 
-circuit "DaoProposeMain" {
+circuit "ProposeMain" {
     token_commit = poseidon_hash(dao_gov_token_id, gov_token_blind);
     constrain_instance(token_commit);
 

src/contract/dao/proof/vote-input.zk

@@ -1,13 +1,13 @@
 k = 13;
 field = "pallas";
 
-constant "DaoVoteInput" {
+constant "VoteInput" {
     EcFixedPointBase NULLIFIER_K,
     EcFixedPoint VALUE_COMMIT_RANDOM,
     EcFixedPointShort VALUE_COMMIT_VALUE,
 }
 
-witness "DaoVoteInput" {
+witness "VoteInput" {
     Base coin_secret,
     Base coin_value,
     Base coin_gov_token_id,
@@ -24,7 +24,7 @@ witness "DaoVoteInput" {
     Base signature_secret,
 }
 
-circuit "DaoVoteInput" {
+circuit "VoteInput" {
     pub = ec_mul_base(coin_secret, NULLIFIER_K);
     pub_x = ec_get_x(pub);
     pub_y = ec_get_y(pub);

src/contract/dao/proof/vote-main.zk

@@ -1,14 +1,14 @@
 k = 13;
 field = "pallas";
 
-constant "DaoVoteMain" {
+constant "VoteMain" {
     EcFixedPoint VALUE_COMMIT_RANDOM,
     EcFixedPointShort VALUE_COMMIT_VALUE,
     EcFixedPointBase NULLIFIER_K,
     EcFixedPointBase VALUE_COMMIT_RANDOM_BASE,
 }
 
-witness "DaoVoteMain" {
+witness "VoteMain" {
     # Proposal parameters
     Base proposal_auth_calls_commit,
     Base proposal_current_day,
@@ -42,7 +42,7 @@ witness "DaoVoteMain" {
     Base ephem_secret,
 }
 
-circuit "DaoVoteMain" {
+circuit "VoteMain" {
     token_commit = poseidon_hash(dao_gov_token_id, gov_token_blind);
     constrain_instance(token_commit);
 

src/contract/dao/src/lib.rs

@@ -73,22 +73,21 @@ pub const DAO_CONTRACT_KEY_DAO_MERKLE_TREE: &[u8] = b"dao_merkle_tree";
 pub const DAO_CONTRACT_KEY_LATEST_DAO_ROOT: &[u8] = b"dao_last_root";
 
 /// zkas dao mint circuit namespace
-pub const DAO_CONTRACT_ZKAS_DAO_MINT_NS: &str = "DaoMint";
+pub const DAO_CONTRACT_ZKAS_DAO_MINT_NS: &str = "Mint";
 /// zkas dao vote input circuit namespace
-pub const DAO_CONTRACT_ZKAS_DAO_VOTE_INPUT_NS: &str = "DaoVoteInput";
+pub const DAO_CONTRACT_ZKAS_DAO_VOTE_INPUT_NS: &str = "VoteInput";
 /// zkas dao vote main circuit namespace
-pub const DAO_CONTRACT_ZKAS_DAO_VOTE_MAIN_NS: &str = "DaoVoteMain";
+pub const DAO_CONTRACT_ZKAS_DAO_VOTE_MAIN_NS: &str = "VoteMain";
 /// zkas dao propose input circuit namespace
-pub const DAO_CONTRACT_ZKAS_DAO_PROPOSE_INPUT_NS: &str = "DaoProposeInput";
+pub const DAO_CONTRACT_ZKAS_DAO_PROPOSE_INPUT_NS: &str = "ProposeInput";
 /// zkas dao propose main circuit namespace
-pub const DAO_CONTRACT_ZKAS_DAO_PROPOSE_MAIN_NS: &str = "DaoProposeMain";
+pub const DAO_CONTRACT_ZKAS_DAO_PROPOSE_MAIN_NS: &str = "ProposeMain";
 /// zkas dao exec circuit namespace
-pub const DAO_CONTRACT_ZKAS_DAO_EXEC_NS: &str = "DaoExec";
+pub const DAO_CONTRACT_ZKAS_DAO_EXEC_NS: &str = "Exec";
 /// zkas dao auth money_transfer circuit namespace
-pub const DAO_CONTRACT_ZKAS_DAO_AUTH_MONEY_TRANSFER_NS: &str = "DaoAuthMoneyTransfer";
+pub const DAO_CONTRACT_ZKAS_DAO_AUTH_MONEY_TRANSFER_NS: &str = "AuthMoneyTransfer";
 /// zkas dao auth money_transfer encrypted coin circuit namespace
-pub const DAO_CONTRACT_ZKAS_DAO_AUTH_MONEY_TRANSFER_ENC_COIN_NS: &str =
-    "DaoAuthMoneyTransferEncCoin";
+pub const DAO_CONTRACT_ZKAS_DAO_AUTH_MONEY_TRANSFER_ENC_COIN_NS: &str = "AuthMoneyTransferEncCoin";
 
 // ANCHOR: dao-blockwindow
 const BLOCK_TIME: u64 = 90;

src/contract/test-harness/src/lib.rs

@@ -64,13 +64,13 @@ mod money_transfer;
 pub fn init_logger() {
     let mut cfg = simplelog::ConfigBuilder::new();
     cfg.add_filter_ignore("sled".to_string());
-    //cfg.set_target_level(simplelog::LevelFilter::Error);
+    cfg.set_target_level(simplelog::LevelFilter::Error);
 
     // We check this error so we can execute same file tests in parallel,
     // otherwise second one fails to init logger here.
     if simplelog::TermLogger::init(
-        simplelog::LevelFilter::Info,
-        //simplelog::LevelFilter::Debug,
+        //simplelog::LevelFilter::Info,
+        simplelog::LevelFilter::Debug,
         //simplelog::LevelFilter::Trace,
         cfg.build(),
         simplelog::TerminalMode::Mixed,

src/contract/test-harness/src/vks.rs

@@ -47,8 +47,8 @@ use darkfi_serial::{deserialize, serialize};
 use log::debug;
 
 /// Update this if any circuits are changed
-const VKS_HASH: &str = "665562975ac7634cc4a028c74f641d28c9e3aaeb27d27ec9474995f02d23cd6a";
-const PKS_HASH: &str = "47e0e4cea6127377da30f97b17c748e7b2204261f168401103fa346b9426ea60";
+const VKS_HASH: &str = "605a72d885e6194ac346a328482504ca37f0c990c2d636ad1b548a8bfb05542b";
+const PKS_HASH: &str = "277228a59ed3cc1df8a9d9e61b3230b4417512d649b4aca1fb3e5f02514a2e96";
 
 fn pks_path(typ: &str) -> Result<PathBuf> {
     let output = Command::new("git").arg("rev-parse").arg("--show-toplevel").output()?.stdout;