contract/consensus: renamed reward proof/namespace to proposal_reward

src/contract/consensus/proof/reward_v1.zk → src/contract/consensus/proof/proposal_reward_v1.zk

@@ -1,9 +1,9 @@
-constant "Reward_V1" {
+constant "ProposalReward_V1" {
 	EcFixedPointShort VALUE_COMMIT_VALUE,
 	EcFixedPoint VALUE_COMMIT_RANDOM,
 }
 
-witness "Reward_V1" {
+witness "ProposalReward_V1" {
 	# Burnt coin
 	Base coin,
 	# Burnt coin secret key
@@ -28,7 +28,7 @@ witness "Reward_V1" {
 	Base headstart,
 }
 
-circuit "Reward_V1" {
+circuit "ProposalReward_V1" {
 	# Constants
 	ZERO = witness_base(0);
 	SEED_PREFIX = witness_base(3);

src/contract/consensus/src/entrypoint.rs

@@ -87,12 +87,12 @@ fn init_contract(cid: ContractId, _ix: &[u8]) -> ContractResult {
     // a specific tree inside sled, and also creation of VerifyingKey.
     let money_mint_v1_bincode = include_bytes!("../../money/proof/mint_v1.zk.bin");
     let money_burn_v1_bincode = include_bytes!("../../money/proof/burn_v1.zk.bin");
-    let reward_v1_bincode = include_bytes!("../proof/reward_v1.zk.bin");
+    let proposal_reward_v1_bincode = include_bytes!("../proof/proposal_reward_v1.zk.bin");
 
     // For that, we use `zkas_db_set` and pass in the bincode.
     zkas_db_set(&money_mint_v1_bincode[..])?;
     zkas_db_set(&money_burn_v1_bincode[..])?;
-    zkas_db_set(&reward_v1_bincode[..])?;
+    zkas_db_set(&proposal_reward_v1_bincode[..])?;
 
     // Set up a database tree to hold Merkle roots of all coins
     // k=MerkleNode, v=[]

src/contract/consensus/src/entrypoint/proposal_reward_v1.rs

@@ -19,7 +19,7 @@
 use darkfi_money_contract::{
     error::MoneyError,
     model::{ConsensusStakeParamsV1, ConsensusUnstakeParamsV1},
-    CONSENSUS_CONTRACT_ZKAS_REWARD_NS_V1,
+    CONSENSUS_CONTRACT_ZKAS_PROPOSAL_REWARD_NS_V1,
 };
 use darkfi_sdk::{
     crypto::{
@@ -87,7 +87,7 @@ pub(crate) fn consensus_proposal_reward_get_metadata_v1(
     let (sigma1, sigma2) = (slot_checkpoint.sigma1, slot_checkpoint.sigma2);
 
     zk_public_inputs.push((
-        CONSENSUS_CONTRACT_ZKAS_REWARD_NS_V1.to_string(),
+        CONSENSUS_CONTRACT_ZKAS_PROPOSAL_REWARD_NS_V1.to_string(),
         vec![
             nullifier.inner(),
             *value_coords.x(),

src/contract/consensus/tests/harness.rs

@@ -43,7 +43,7 @@ use rand::rngs::OsRng;
 
 use darkfi_money_contract::{
     client::transfer_v1::TransferCallBuilder, model::MoneyTransferParamsV1, MoneyFunction,
-    CONSENSUS_CONTRACT_ZKAS_REWARD_NS_V1, MONEY_CONTRACT_ZKAS_BURN_NS_V1,
+    CONSENSUS_CONTRACT_ZKAS_PROPOSAL_REWARD_NS_V1, MONEY_CONTRACT_ZKAS_BURN_NS_V1,
     MONEY_CONTRACT_ZKAS_MINT_NS_V1,
 };
 
@@ -149,7 +149,7 @@ impl ConsensusTestHarness {
         )?;
         mkpk!(MONEY_CONTRACT_ZKAS_MINT_NS_V1);
         mkpk!(MONEY_CONTRACT_ZKAS_BURN_NS_V1);
-        mkpk!(CONSENSUS_CONTRACT_ZKAS_REWARD_NS_V1);
+        mkpk!(CONSENSUS_CONTRACT_ZKAS_PROPOSAL_REWARD_NS_V1);
 
         Ok(Self { faucet, alice, proving_keys })
     }

src/contract/consensus/tests/stake_unstake.rs

@@ -44,7 +44,7 @@ use darkfi_money_contract::{
     client::{
         stake_v1::MoneyStakeCallBuilder, unstake_v1::MoneyUnstakeCallBuilder, MoneyNote, OwnCoin,
     },
-    MoneyFunction, CONSENSUS_CONTRACT_ZKAS_REWARD_NS_V1, MONEY_CONTRACT_ZKAS_BURN_NS_V1,
+    MoneyFunction, CONSENSUS_CONTRACT_ZKAS_PROPOSAL_REWARD_NS_V1, MONEY_CONTRACT_ZKAS_BURN_NS_V1,
     MONEY_CONTRACT_ZKAS_MINT_NS_V1,
 };
 
@@ -90,7 +90,7 @@ async fn consensus_contract_stake_unstake() -> Result<()> {
     let (mint_pk, mint_zkbin) = th.proving_keys.get(&MONEY_CONTRACT_ZKAS_MINT_NS_V1).unwrap();
     let (burn_pk, burn_zkbin) = th.proving_keys.get(&MONEY_CONTRACT_ZKAS_BURN_NS_V1).unwrap();
     let (reward_pk, reward_zkbin) =
-        th.proving_keys.get(&CONSENSUS_CONTRACT_ZKAS_REWARD_NS_V1).unwrap();
+        th.proving_keys.get(&CONSENSUS_CONTRACT_ZKAS_PROPOSAL_REWARD_NS_V1).unwrap();
 
     info!(target: "consensus", "[Faucet] ==========================");
     info!(target: "consensus", "[Faucet] Executing Alice airdrop tx");

src/contract/money/src/lib.rs

@@ -99,4 +99,4 @@ pub const CONSENSUS_CONTRACT_DB_VERSION: &str = env!("CARGO_PKG_VERSION");
 pub const CONSENSUS_CONTRACT_COIN_MERKLE_TREE: &str = "consensus_coin_tree";
 
 /// zkas reward circuit namespace
-pub const CONSENSUS_CONTRACT_ZKAS_REWARD_NS_V1: &str = "Reward_V1";
+pub const CONSENSUS_CONTRACT_ZKAS_PROPOSAL_REWARD_NS_V1: &str = "ProposalReward_V1";