[tools] Batch cw instr (#237)

Co-authored-by: zoz <[email protected]>

Author: 2 people

Cargo.lock

@@ -371,8 +371,6 @@ module ol_framework::donor_voice_txs {
       while (i < len) {
 
         let t = vector::pop_back(&mut due_list);
-        // if (this_exp <= epoch) {
-        //   let t = vector::remove(&mut state.scheduled, i);
         let multisig_address = guid::id_creator_address(&t.uid);
 
         // Note the VM can do this without the WithdrawCapability
@@ -393,7 +391,6 @@ module ol_framework::donor_voice_txs {
 
 
           vector::push_back(&mut state.paid, t);
-          // print(is_paid());
           print(&state.scheduled);
           print(&state.paid);
         } else {
@@ -406,7 +403,7 @@ module ol_framework::donor_voice_txs {
 
         amount_processed = amount_processed + amount_transferred;
 
-        // if theres a single transaction that gets approved, then the freeze consecutive rejection counter is reset
+        // if there's a single transaction that gets approved, then the freeze consecutive rejection counter is reset
         reset_rejection_counter(vm, multisig_address);
 
         i = i + 1;

framework/libra-framework/sources/ol_sources/vote_lib/donor_voice_txs.move

@@ -534,6 +534,19 @@ module ol_framework::multi_action {
     ballot::find_anywhere(&a.vote, uid)
   }
 
+  /// get all IDs of multi_auth proposal that are pending
+  fun get_pending_id<ProposalData: store + drop>(multisig_address: address): vector<guid::ID> acquires Action {
+    let action = borrow_global<Action<ProposalData>>(multisig_address);
+    let list = ballot::get_list_ballots_by_enum(&action.vote,
+    ballot::get_pending_enum());
+
+    let id_list = vector::map_ref(list, |el| {
+      ballot::get_ballot_id(el)
+    });
+
+    id_list
+  }
+
 
   ////////  GOVERNANCE  ////////
   // Governance of the multisig happens through an instance of Action<PropGovSigners>. This action has no special privileges, and is just a normal proposal type.
@@ -612,12 +625,22 @@ module ol_framework::multi_action {
   }
 
   #[view]
+  /// how many multi_action proposals are pending
   public fun get_count_of_pending<ProposalData: store + drop>(multisig_address: address): u64 acquires Action {
-    let action = borrow_global<Action<ProposalData>>(multisig_address);
-    let list = ballot::get_list_ballots_by_enum(&action.vote, ballot::get_pending_enum());
-    vector::length(list)
+    let list = get_pending_id<ProposalData>(multisig_address);
+    vector::length(&list)
   }
 
+  #[view]
+  /// the creation number u64 of the pending proposals
+  public fun get_pending_by_creation_number<ProposalData: store + drop>(multisig_address: address): vector<u64> acquires Action {
+    let list = get_pending_id<ProposalData>(multisig_address);
+    vector::map(list, |el| {
+      guid::id_creation_num(&el)
+    })
+  }
+
+
   #[view]
   /// returns the votes for a given proposal ID. For `view` functions must provide the destructured guid::ID as address and integer.
   public fun get_votes<ProposalData: store + drop>(multisig_address: address, id_num: u64): vector<address> acquires Action {

framework/libra-framework/sources/ol_sources/vote_lib/multi_action.move

@@ -11,7 +11,7 @@ use libra_types::{
     type_extensions::client_ext::{entry_function_id, ClientExt},
 };
 
-use serde_json::json;
+use serde_json::{json, Value};
 /// helper to get libra balance at a SlowWalletBalance type which shows
 /// total balance and the unlocked balance.
 pub async fn get_account_balance_libra(
@@ -107,9 +107,23 @@ pub async fn community_wallet_signers(
     Ok(json!(res))
 }
 
-pub async fn community_wallet_pending_transactions(
+pub async fn community_wallet_scheduled_transactions(
     client: &Client,
     account: AccountAddress,
 ) -> anyhow::Result<TxSchedule> {
     client.get_move_resource::<TxSchedule>(account).await
 }
+
+/// get all of the multi_auth actions, pending, approved, expired.
+pub async fn multi_auth_ballots(
+    client: &Client,
+    multi_auth_account: AccountAddress,
+) -> anyhow::Result<Value> {
+    let resource_path_str = "0x1::multi_action::Action<0x1::donor_voice_txs::Payment>";
+    let proposal_state = client
+        .get_account_resource(multi_auth_account, resource_path_str)
+        .await?;
+    let r = proposal_state.inner().clone().unwrap();
+
+    Ok(r.data)
+}

tools/query/src/account_queries.rs

@@ -64,14 +64,11 @@ pub async fn can_gov_proposal_resolve(client: &Client, id: u64) -> anyhow::Resul
         client,
         "0x1::diem_governance::get_can_resolve",
         None,
-        Some(id.to_string()), //Some(format!("{}u64", id)),
+        Some(id.to_string()),
     )
     .await?;
-    // let id: Vec<String> = serde_json::from_value(query_res)?;
+
     serde_json::from_value::<bool>(query_res).context("cannot parse api res")
-    // .into_iter()
-    // .next()
-    // .context("could not get a response from view function can_resolve")
 }
 
 // TODO: code duplication
@@ -80,10 +77,10 @@ pub async fn is_gov_proposal_resolved(client: &Client, id: u64) -> anyhow::Resul
         client,
         "0x1::diem_governance::is_resolved",
         None,
-        Some(id.to_string()), //Some(format!("{}u64", id)),
+        Some(id.to_string()),
     )
     .await?;
-    // let id: Vec<String> = serde_json::from_value(query_res)?;
+
     serde_json::from_value::<Vec<bool>>(query_res)?
         .into_iter()
         .next()
@@ -96,10 +93,10 @@ pub async fn get_gov_proposal_votes(client: &Client, id: u64) -> anyhow::Result<
         client,
         "0x1::diem_governance::get_votes",
         None,
-        Some(id.to_string()), //Some(format!("{}u64", id)),
+        Some(id.to_string()),
     )
     .await?;
-    // let id: Vec<String> = serde_json::from_value(query_res)?;
+
     Ok(serde_json::from_value::<Vec<u128>>(query_res)?)
 }
 

tools/query/src/chain_queries.rs

@@ -1,7 +1,8 @@
 use crate::{
     account_queries::{
-        community_wallet_pending_transactions, community_wallet_signers, get_account_balance_libra,
-        get_events, get_transactions, get_val_config, is_community_wallet_migrated,
+        community_wallet_scheduled_transactions, community_wallet_signers,
+        get_account_balance_libra, get_events, get_transactions, get_val_config,
+        is_community_wallet_migrated,
     },
     chain_queries::{get_epoch, get_height},
     query_view::get_view,
@@ -264,7 +265,7 @@ impl QueryType {
             }
             QueryType::ComWalletPendTransactions { account } => {
                 // Wont work at the moment as there is no community wallet migrated
-                let _res = community_wallet_pending_transactions(&client, *account).await?;
+                let _res = community_wallet_scheduled_transactions(&client, *account).await?;
                 Ok(json!({ "pending_transactions": "None" }))
             }
             QueryType::Annotate { account } => {