Merge pull request #107 from heliaxdev/yuji/fix-vote-reactivate

Fix vote and reactivate validator

Author: yito88

workload/src/executor.rs

@@ -12,7 +12,8 @@ use crate::step::{StepContext, StepType};
 use crate::task::{Task, TaskContext};
 use crate::types::{Alias, Epoch, Fee, Height};
 use crate::utils::{
-    execute_reveal_pk, get_block_height, is_pk_revealed, retry_config, wait_block_settlement,
+    execute_reveal_pk, get_block_height, get_proposals, is_pk_revealed, retry_config,
+    wait_block_settlement,
 };
 
 pub struct WorkloadExecutor {
@@ -242,6 +243,11 @@ impl WorkloadExecutor {
                         .save()
                         .map_err(|e| TaskError::Wallet(e.to_string()))?;
                 }
+                Task::DefaultProposal(_) | Task::Vote(_) => {
+                    let last_proposal_id = self.state.proposals.keys().max().cloned();
+                    let new_proposals = get_proposals(&self.sdk, last_proposal_id).await?;
+                    self.state.add_proposals(new_proposals);
+                }
                 _ => {}
             }
         }

workload/src/state.rs

@@ -9,7 +9,7 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use crate::constants::{MIN_TRANSFER_BALANCE, PIPELINE_LEN};
-use crate::types::{Alias, Epoch};
+use crate::types::{Alias, Epoch, ProposalId};
 
 #[derive(Error, Debug)]
 pub enum StateError {
@@ -544,14 +544,13 @@ impl State {
             .insert(alias.clone(), (account, epoch));
     }
 
-    pub fn remove_deactivate_validator(&mut self, alias: &Alias) {
-        self.deactivated_validators.remove(alias).unwrap();
+    pub fn reactivate_validator(&mut self, alias: &Alias) {
+        let (account, _) = self.deactivated_validators.remove(alias).unwrap();
+        self.validators.insert(alias.clone(), account);
     }
 
-    pub fn add_proposal(&mut self, start_epoch: u64, end_epoch: u64) {
-        let latest_proposal_id = self.proposals.keys().max().unwrap_or(&0).to_owned();
-        self.proposals
-            .insert(latest_proposal_id, (start_epoch, end_epoch));
+    pub fn add_proposals(&mut self, new_proposals: HashMap<ProposalId, (Epoch, Epoch)>) {
+        self.proposals.extend(new_proposals);
     }
 
     pub fn set_claimed_epoch(&mut self, source: &Alias, epoch: Epoch) {

workload/src/task/default_proposal.rs

@@ -112,6 +112,6 @@ impl TaskContext for DefaultProposal {
 
     fn update_state(&self, state: &mut State) {
         state.decrease_balance(&self.source, PROPOSAL_DEPOSIT);
-        state.add_proposal(self.start_epoch, self.end_epoch);
+        // proposal will be added later
     }
 }

workload/src/task/reactivate_validator.rs

@@ -86,7 +86,6 @@ impl TaskContext for ReactivateValidator {
     }
 
     fn update_state(&self, state: &mut State) {
-        state.remove_deactivate_validator(&self.target);
-        state.set_established_as_validator(&self.target);
+        state.reactivate_validator(&self.target);
     }
 }

workload/src/utils/query.rs

@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::str::FromStr;
 use std::time::{self, Instant};
 
@@ -539,6 +540,27 @@ async fn shielded_sync(
     res
 }
 
+pub async fn get_proposals(
+    sdk: &Sdk,
+    last_proposal_id: Option<ProposalId>,
+) -> Result<HashMap<ProposalId, (Epoch, Epoch)>, QueryError> {
+    let mut proposals = HashMap::new();
+    let mut proposal_id = last_proposal_id.map(|id| id + 1).unwrap_or_default();
+    while let Some(proposal) = rpc::query_proposal_by_id(&sdk.namada.client, proposal_id)
+        .await
+        .map_err(QueryError::Rpc)?
+    {
+        proposals.insert(
+            proposal_id,
+            (proposal.voting_start_epoch.0, proposal.voting_end_epoch.0),
+        );
+
+        proposal_id += 1;
+    }
+
+    Ok(proposals)
+}
+
 pub async fn get_vote_results(
     sdk: &Sdk,
     target: &Alias,