From bb4bac178cf5e499b4f65f78ef8af0b4a335ccd8 Mon Sep 17 00:00:00 2001
From: Jakub Bogucki <jakub@confio.gmbh>
Date: Fri, 4 Feb 2022 12:51:22 +0100
Subject: [PATCH] CW3: Add proposal_id field to VoteInfo structure

---
 contracts/cw3-fixed-multisig/src/contract.rs | 2 ++
 contracts/cw3-flex-multisig/src/contract.rs  | 4 ++++
 packages/cw3/src/query.rs                    | 1 +
 3 files changed, 7 insertions(+)

diff --git a/contracts/cw3-fixed-multisig/src/contract.rs b/contracts/cw3-fixed-multisig/src/contract.rs
index 5928bcf82..8c2f530c7 100644
--- a/contracts/cw3-fixed-multisig/src/contract.rs
+++ b/contracts/cw3-fixed-multisig/src/contract.rs
@@ -337,6 +337,7 @@ fn query_vote(deps: Deps, proposal_id: u64, voter: String) -> StdResult<VoteResp
     let voter = deps.api.addr_validate(&voter)?;
     let ballot = BALLOTS.may_load(deps.storage, (proposal_id, &voter))?;
     let vote = ballot.map(|b| VoteInfo {
+        proposal_id,
         voter: voter.into(),
         vote: b.vote,
         weight: b.weight,
@@ -359,6 +360,7 @@ fn list_votes(
         .take(limit)
         .map(|item| {
             item.map(|(addr, ballot)| VoteInfo {
+                proposal_id,
                 voter: addr.into(),
                 vote: ballot.vote,
                 weight: ballot.weight,
diff --git a/contracts/cw3-flex-multisig/src/contract.rs b/contracts/cw3-flex-multisig/src/contract.rs
index e5444c179..236358c66 100644
--- a/contracts/cw3-flex-multisig/src/contract.rs
+++ b/contracts/cw3-flex-multisig/src/contract.rs
@@ -365,6 +365,7 @@ fn query_vote(deps: Deps, proposal_id: u64, voter: String) -> StdResult<VoteResp
     let voter_addr = deps.api.addr_validate(&voter)?;
     let prop = BALLOTS.may_load(deps.storage, (proposal_id, &voter_addr))?;
     let vote = prop.map(|b| VoteInfo {
+        proposal_id,
         voter,
         vote: b.vote,
         weight: b.weight,
@@ -388,6 +389,7 @@ fn list_votes(
         .take(limit)
         .map(|item| {
             item.map(|(addr, ballot)| VoteInfo {
+                proposal_id,
                 voter: addr.into(),
                 vote: ballot.vote,
                 weight: ballot.weight,
@@ -1024,6 +1026,7 @@ mod tests {
         assert_eq!(
             vote.vote.unwrap(),
             VoteInfo {
+                proposal_id,
                 voter: OWNER.into(),
                 vote: Vote::Yes,
                 weight: 0
@@ -1039,6 +1042,7 @@ mod tests {
         assert_eq!(
             vote.vote.unwrap(),
             VoteInfo {
+                proposal_id,
                 voter: VOTER2.into(),
                 vote: Vote::No,
                 weight: 2
diff --git a/packages/cw3/src/query.rs b/packages/cw3/src/query.rs
index bde729e6c..27850d757 100644
--- a/packages/cw3/src/query.rs
+++ b/packages/cw3/src/query.rs
@@ -99,6 +99,7 @@ pub struct VoteListResponse {
 /// the address of the voter who submitted it
 #[derive(Serialize, Deserialize, Clone, PartialEq, JsonSchema, Debug)]
 pub struct VoteInfo {
+    pub proposal_id: u64,
     pub voter: String,
     pub vote: Vote,
     pub weight: u64,