[migration] add consensus reward to migration

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

@@ -83,7 +83,8 @@ module ol_framework::community_wallet_init {
     /// qualify
     public fun check_proposed_auths(initial_authorities: vector<address>, num_signers:
     u64): bool {
-      // // enforce n/m multi auth
+
+      // TODO: enforce n/m multi auth such as:
       // let n = if (len == 3) { 2 }
       // else {
       //   (MINIMUM_SIGS * len) / MINIMUM_AUTH

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

@@ -102,14 +102,18 @@ module ol_framework::proof_of_fee {
 
   // on a migration genesis for mainnet the genesis reward needs to be calculated
   // from supply data.
-  fun genesis_migrate_reward(vm: &signer, nominal_reward: u64) acquires
+  public fun genesis_migrate_reward(framework: &signer, nominal_reward: u64) acquires
   ConsensusReward {
-    system_addresses::assert_ol(vm); // either 0x1 or 0x0
+    system_addresses::assert_diem_framework(framework); // either 0x1 or 0x0
+
+    // Nominal reward at end of V6 was 178204815
+    if (nominal_reward > 178204815) return;
+
 
     let state = borrow_global_mut<ConsensusReward>(@ol_framework);
     state.nominal_reward = nominal_reward;
     state.net_reward = nominal_reward; // just for info purposes. It gets calculated
-    // on first epoch change.
+    // on next epoch change.
   }
 
   fun init(account_sig: &signer) {

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

@@ -1,6 +1,7 @@
 
   #[test_only]
   module ol_framework::test_community_wallet{
+    use ol_framework::ballot;
     use ol_framework::community_wallet;
     use ol_framework::community_wallet_init;
     use ol_framework::donor_voice_txs;
@@ -126,7 +127,7 @@
         let (found, idx, status_enum, completed) = donor_voice_txs::get_multisig_proposal_state(alice_comm_wallet_addr, &uid);
         assert!(found, 7357004);
         assert!(idx == 0, 7357005);
-        assert!(status_enum == 1, 7357006);
+        assert!(status_enum == ballot::get_pending_enum(), 7357006);
         assert!(!completed, 7357007);
 
         // it is not yet scheduled, it's still only a proposal by an admin
@@ -136,7 +137,7 @@
         let (found, idx, status_enum, completed) = donor_voice_txs::get_multisig_proposal_state(alice_comm_wallet_addr, &uid);
         assert!(found, 7357004);
         assert!(idx == 0, 7357005);
-        assert!(status_enum == 1, 7357006);
+        assert!(status_enum == ballot::get_approved_enum(), 7357006);
         assert!(completed, 7357007); // now completed
 
         // confirm it is scheduled
@@ -211,7 +212,7 @@
         let (found, idx, status_enum, completed) = donor_voice_txs::get_multisig_proposal_state(alice_comm_wallet_addr, &uid);
         assert!(found, 7357004);
         assert!(idx == 0, 7357005);
-        assert!(status_enum == 1, 7357006);
+        assert!(status_enum == ballot::get_approved_enum(), 7357006);
         assert!(completed, 7357007); // now completed
 
         // confirm it is scheduled

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

@@ -31,6 +31,8 @@
     const ENO_BALLOT_FOUND: u64 = 1;
     /// Bad status enum
     const EBAD_STATUS_ENUM: u64 = 2;
+    /// Already complete cannot change
+    const EALREADY_COMPLETE: u64 = 3;
 
 
     // poor man's enum for the ballot status. Wen enum?
@@ -265,8 +267,10 @@
     }
 
     public fun complete_ballot<TallyType: drop + store>(
-      ballot: &mut Ballot<TallyType>,
+      ballot: &mut Ballot<TallyType>
     ) {
+      assert!(!is_completed(ballot), error::invalid_argument(EALREADY_COMPLETE));
+
       ballot.completed = true;
     }