[framework] CW advance direct (#422)

Co-authored-by: Reginald Piano <[email protected]>
Co-authored-by: Bea Hobby <[email protected]>

Author: 3 people

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

@@ -280,7 +280,20 @@ module ol_framework::donor_voice_txs {
       let tx: Payment = multi_action::extract_proposal_data(multisig_address, &uid);
 
       if (passed && option::is_some(&withdraw_cap_opt)) {
-        schedule(option::borrow(&withdraw_cap_opt), tx, &uid);
+        // else large payments to slow wallets take longer to review
+        if (slow_wallet::is_slow(payee)) {
+          let deadline = epoch_helper::get_current_epoch() + DEFAULT_PAYMENT_DURATION;
+          schedule(option::borrow(&withdraw_cap_opt), tx, &uid, deadline);
+
+        } else {
+          // transfer happens immediately after multisig threshold is reached
+          let can_withdraw = community_wallet_advance::can_withdraw_amount(multisig_address, tx.value);
+
+          if (can_withdraw) {
+              community_wallet_advance::transfer_credit(option::borrow(&withdraw_cap_opt), tx.payee, tx.value);
+          }
+        }
+
       };
 
       multi_action::maybe_restore_withdraw_cap(withdraw_cap_opt);
@@ -302,13 +315,11 @@ module ol_framework::donor_voice_txs {
     // the rejected list.
 
     fun schedule(
-      withdraw_capability: &WithdrawCapability, tx: Payment, uid: &guid::ID
+      withdraw_capability: &WithdrawCapability, tx: Payment, uid: &guid::ID, deadline: u64
     ) acquires TxSchedule {
       let multisig_address = account::get_withdraw_cap_address(withdraw_capability);
       let transfers = borrow_global_mut<TxSchedule>(multisig_address);
 
-      let deadline = epoch_helper::get_current_epoch() + DEFAULT_PAYMENT_DURATION;
-
       let t = TimedTransfer {
         uid: *uid,
         deadline, // pays automatically at the end of seventh epoch. Unless there is a veto by a Donor. In that case a day is added for every day there is a veto. This deduplicates vetoes.
@@ -404,7 +415,7 @@ module ol_framework::donor_voice_txs {
         let is_slow = slow_wallet::is_slow(t.tx.payee);
 
 
-        let this_transfer_value =if (!is_slow) {
+        let this_transfer_value = if (!is_slow) {
           let can_withdraw = community_wallet_advance::can_withdraw_amount(multisig_address, t.tx.value);
 
           if (can_withdraw) {
@@ -1000,21 +1011,9 @@ module ol_framework::donor_voice_txs {
     ids
   }
 
-  // // Helper function to list proposals by status in the multisig system
-  // fun list_multisig_proposals_by_status(multisig_address: address, status_enum: u8): vector<u64> {
-  //   // Check if we have access to the multi_action module for the Payment type
-  //   if (!multi_action::has_action<Payment>(multisig_address)) {
-  //     return vector::empty<u64>()
-  //   };
-
-  //   // Use the new get_proposals_by_status function to fetch IDs directly
-  //   multi_action::get_proposals_by_status<Payment>(multisig_address, status_enum)
-  // }
-
   //////// TRANSACTIONS ////////
 
-  // /// A signer of the multisig can propose a payment
-  // }
+  /// A signer of the multisig can propose a payment
 
   public entry fun propose_payment_tx(
     auth: signer,

framework/libra-framework/sources/ol_sources/tests/donor_voice.test.move

@@ -540,12 +540,10 @@ module ol_framework::test_donor_voice {
       donor_voice_txs::propose_payment_tx(carol, donor_voice_address, marlon_addr, 100, b"thanks marlon", is_unlocked_advance);
 
       // PROCESS THE PAYMENT
-      // process epoch 3 accounts
 
-      mock::trigger_epoch(root); // into epoch 1
-      mock::trigger_epoch(root); // into epoch 2
-      mock::trigger_epoch(root); // into epoch 3, processes at the end of this epoch.
-      mock::trigger_epoch(root); // epoch 4 should include the payment
+      // COMMIT NOTE: No need to advance epoch here, since we are testing the unlocked payment, which is processed immediately.
+      // mock::trigger_epoch(root); // into epoch 1
+
 
       let (marlon_unlocked_post, marlon_rando_balance_post) = ol_account::balance(marlon_addr);