From 86a117cd383ed33a88ace09ddc9cc8a6975b53fd Mon Sep 17 00:00:00 2001
From: x <x@x>
Date: Wed, 20 Dec 2023 11:12:01 +0000
Subject: [PATCH] dao: remove redundant ended, we delete proposals from the DB.
 getting them will fail after they're ended.

---
 src/contract/dao/proof/dao-vote-main.zk    | 2 --
 src/contract/dao/src/entrypoint/exec.rs    | 5 -----
 src/contract/dao/src/entrypoint/propose.rs | 1 -
 src/contract/dao/src/entrypoint/vote.rs    | 7 +------
 src/contract/dao/src/model.rs              | 2 --
 5 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/contract/dao/proof/dao-vote-main.zk b/src/contract/dao/proof/dao-vote-main.zk
index e3fd94675..0913a4351 100644
--- a/src/contract/dao/proof/dao-vote-main.zk
+++ b/src/contract/dao/proof/dao-vote-main.zk
@@ -58,8 +58,6 @@ circuit "DaoVoteMain" {
 		proposal_blind,
 	);
 	constrain_instance(proposal_bulla);
-	# TODO: We need to check the proposal isn't invalidated
-	# that is expired or already executed.
 
 	# Normally we call this yes vote
 	# Pedersen commitment for vote option
diff --git a/src/contract/dao/src/entrypoint/exec.rs b/src/contract/dao/src/entrypoint/exec.rs
index 0e42d2e39..6d2f3c823 100644
--- a/src/contract/dao/src/entrypoint/exec.rs
+++ b/src/contract/dao/src/entrypoint/exec.rs
@@ -155,11 +155,6 @@ pub(crate) fn dao_exec_process_instruction(
     };
     let proposal: DaoProposalMetadata = deserialize(&data)?;
 
-    if proposal.ended {
-        msg!("[Dao::Exec] Error: Proposal {:?} ended", params.proposal);
-        return Err(DaoError::ProposalEnded.into())
-    }
-
     // 3. Check yes_vote commit and all_vote_commit are the same as in BlindAggregateVote
     if proposal.vote_aggregate.yes_vote_commit != params.blind_total_vote.yes_vote_commit ||
         proposal.vote_aggregate.all_vote_commit != params.blind_total_vote.all_vote_commit
diff --git a/src/contract/dao/src/entrypoint/propose.rs b/src/contract/dao/src/entrypoint/propose.rs
index 482946d44..f9968586f 100644
--- a/src/contract/dao/src/entrypoint/propose.rs
+++ b/src/contract/dao/src/entrypoint/propose.rs
@@ -161,7 +161,6 @@ pub(crate) fn dao_propose_process_update(
     let proposal_metadata = DaoProposalMetadata {
         vote_aggregate: DaoBlindAggregateVote::default(),
         snapshot_root: update.snapshot_root,
-        ended: false,
     };
 
     // Set the new proposal in the db
diff --git a/src/contract/dao/src/entrypoint/vote.rs b/src/contract/dao/src/entrypoint/vote.rs
index e884a34d5..af97961e8 100644
--- a/src/contract/dao/src/entrypoint/vote.rs
+++ b/src/contract/dao/src/entrypoint/vote.rs
@@ -123,15 +123,10 @@ pub(crate) fn dao_vote_process_instruction(
         return Err(DaoError::ProposalNonexistent.into())
     };
 
-    // Get the current votes, and additionally confirm proposal hasn't ended
+    // Get the current votes
     // TODO: Proposals should have a set length of time
     let mut proposal_metadata: DaoProposalMetadata = deserialize(&data)?;
 
-    if proposal_metadata.ended {
-        msg!("[Dao::Vote] Error: Proposal ended: {:?}", params.proposal_bulla);
-        return Err(DaoError::ProposalEnded.into())
-    }
-
     // Check the Merkle root and nullifiers for the input coins are valid
     let money_nullifier_db = db_lookup(*MONEY_CONTRACT_ID, MONEY_CONTRACT_NULLIFIERS_TREE)?;
     let dao_vote_nullifier_db = db_lookup(cid, DAO_CONTRACT_DB_VOTE_NULLIFIERS)?;
diff --git a/src/contract/dao/src/model.rs b/src/contract/dao/src/model.rs
index 3580aa9cc..293e8da10 100644
--- a/src/contract/dao/src/model.rs
+++ b/src/contract/dao/src/model.rs
@@ -236,8 +236,6 @@ pub struct DaoProposalMetadata {
     pub vote_aggregate: DaoBlindAggregateVote,
     /// Snapshotted Merkle root in the Money state
     pub snapshot_root: MerkleNode,
-    /// Proposal closed
-    pub ended: bool,
 }
 
 /// Parameters for `Dao::Vote`