[patch] fix activity init happening outside migration (#400)

Co-authored-by: Basil O'Fortissimo <basil_o'[email protected]>
Co-authored-by: Lucietta De Hind <[email protected]>
Co-authored-by: Gabi De Heron <[email protected]>
Co-authored-by: Paoletta Von Ritardando <[email protected]>
Co-authored-by: Bea LeLento <[email protected]>
Co-authored-by: David Boreham <[email protected]>
Co-authored-by: xyz <xyz>

Author: 7 people

framework/libra-framework/sources/genesis.move

@@ -28,6 +28,7 @@ module diem_framework::genesis {
 
     //////// 0L ////////
     use diem_framework::validator_universe;
+    use diem_framework::activity;
     use ol_framework::ol_account;
     use ol_framework::musical_chairs;
     use ol_framework::proof_of_fee;
@@ -195,6 +196,7 @@ module diem_framework::genesis {
         // NOTE: smoke tests will fail without initializing tx fees as in genesis
         transaction_fee::initialize_fee_collection_and_distribution(diem_framework, 0);
 
+        activity::maybe_onboard(&core_resources);
         // NOTE: 0L: the commented code below shows that we are destroying
         // there capabilities elsewhere, at libra_coin::initialize
         coin::destroy_mint_cap(mint_cap_two);

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

@@ -2,9 +2,12 @@
 /// Maintains the version number for the blockchain.
 module ol_framework::activity {
   use std::signer;
+  use std::error;
+  use ol_framework::testnet;
   use diem_std::timestamp;
 
   friend ol_framework::filo_migration;
+  friend ol_framework::genesis;
   friend ol_framework::ol_account;
   friend ol_framework::donor_voice_migration;
   friend diem_framework::transaction_validation;
@@ -37,8 +40,10 @@ module ol_framework::activity {
   }
 
   /// Increment the activity timestamp of a user
+  // NOTE: this serves to gate users who have not onboarded since v8 upgrade
   public(friend) fun increment(user: &signer, timestamp: u64) acquires Activity {
-    lazy_initialize(user, timestamp);
+
+    assert!(exists<Activity>(signer::address_of(user)), error::invalid_state(EACCOUNT_MALFORMED));
 
     let state = borrow_global_mut<Activity>(signer::address_of(user));
     state.last_touch_usecs = timestamp;
@@ -54,13 +59,6 @@ module ol_framework::activity {
     0
   }
 
-  fun migrate(user_sig: &signer, timestamp: u64) {
-      move_to<Activity>(user_sig, Activity {
-        last_touch_usecs: timestamp,
-        onboarding_usecs: 0, // also how we identify pre-V8 "founder account",
-      });
-  }
-
   public(friend) fun maybe_onboard(user_sig: &signer){
 
     // genesis accounts should not start at 0
@@ -77,6 +75,22 @@ module ol_framework::activity {
     }
   }
 
+  /// migrate or heal a pre-v8 account
+  public(friend) fun migrate(user_sig: &signer) acquires Activity {
+    let addr = signer::address_of(user_sig);
+    if (!exists<Activity>(addr)) {
+      move_to<Activity>(user_sig, Activity {
+        last_touch_usecs: 0,
+        onboarding_usecs: 0,
+      })
+    } else if (is_pre_v8(addr)) {
+      // this is a pre-v8 account that might be malformed
+      let state = borrow_global_mut<Activity>(addr);
+      state.last_touch_usecs = 0;
+      state.onboarding_usecs = 0;
+    }
+  }
+
 
   #[view]
   // check if this is an account that has activity
@@ -111,6 +125,17 @@ module ol_framework::activity {
     exists<Activity>(user)
   }
 
+  #[view]
+  // check the timestamp prior to v8 launch
+  public fun is_pre_v8(user: address): bool acquires Activity {
+    if (testnet::is_testnet()) {
+      return false
+    };
+    get_onboarding_usecs(user) < 1747267200  // Date and time (GMT): Thursday, May 15, 2025 12:00:00 AM
+  }
+
+
+
 
   #[view]
   // If the account is a founder/pre-v8 account has been migrated
@@ -122,7 +147,7 @@ module ol_framework::activity {
   #[test_only]
   /// testnet help for framework account to mock activity
   public(friend) fun test_set_activity(framework: &signer, user: address, timestamp: u64) acquires Activity {
-    ol_framework::testnet::assert_testnet(framework);
+    testnet::assert_testnet(framework);
 
     let state = borrow_global_mut<Activity>(user);
     state.last_touch_usecs = timestamp;

framework/libra-framework/sources/ol_sources/migrations/filo_migration.move

@@ -20,7 +20,7 @@ module ol_framework::filo_migration {
     // Just a man and his will to survive.
 
     // did this account exist before level 8?
-    activity::lazy_initialize(user_sig, 0);
+    activity::migrate(user_sig);
 
     // I am the eye of the tiger
     // I am the founder of my destiny

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

@@ -6,7 +6,6 @@ module ol_framework::reauthorization {
     use ol_framework::donor_voice_reauth;
     use ol_framework::founder;
 
-
     /// user account never migrated from V7 to V8
     const ENOT_MIGRATED_FROM_V7: u64 = 1;
 
@@ -56,10 +55,10 @@ module ol_framework::reauthorization {
 
 
       // case 3: user onboarded since v8 started
-      // check only if the account is malformed
-      // i.e. has an activity struct but no activity
+      // checks for edge cases where accounts were
+      // partially migrated
 
-      if (!activity::is_prehistoric(account)) {
+      if (!activity::is_pre_v8(account)) {
         return true
       };
 

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

@@ -265,7 +265,6 @@ module ol_framework::test_boundary {
   fun e2e_add_validator_sad_vouches(root: signer, alice: signer, marlon_rando: signer) {
     let _vals = common_test_setup(&root);
     // this test requires prod settings, since we don't check vouches on testing
-    testnet::unset(&root);
     // generate credentials for validator registration
     ol_account::transfer(&alice, @0x12345, 200000);
     let (_sk, pk, pop) = stake::generate_identity();
@@ -284,6 +283,9 @@ module ol_framework::test_boundary {
 
     mock::mock_bids(&vals);
 
+    // use prod settings on epoch boundary
+    testnet::unset(&root);
+
     mock::trigger_epoch(&root);
 
     assert!(epoch_boundary::get_reconfig_success(), 7357002);

framework/releases/mainnet.mrb

@@ -8,6 +8,6 @@ license = ''
 
 [dev-addresses]
 [dependencies.LibraFramework]
-local = '/Users/lucas/code/rust/libra-framework/framework/libra-framework'
+local = '/root/libra-framework/framework/libra-framework'
 
 [dev-dependencies]

framework/src/upgrade_fixtures/fixtures/upgrade-multi-lib-force/1-move-stdlib/Move.toml

@@ -1 +1 @@
-8927075a0e1668b26965781f2e53ead5c29bb2ea7499042163015c998e39aa40
+e7e92c2fa97352662a34685c191b0c29a4fe5a4a58d3b01ea9486897cfb5990d

framework/src/upgrade_fixtures/fixtures/upgrade-multi-lib-force/1-move-stdlib/script.mv

@@ -1,9 +1,9 @@
 // Upgrade proposal for package `MoveStdlib`
 
-// Framework commit hash: 25053ae3d9da72cee42882ab26e0069875e727ad
-// Builder commit hash: e402fe6d60b1fc0c2eecc51bc606c7200a579789
+// Framework commit hash: 993b9a240c0efe9ee9f8685d48eee7450b12d9a9
+// Builder commit hash: 750f39b5b91114754203d858ec6a758b2f664084
 
-// Next step script hash: 48f2a6d4de1b93cada516f57d5fdd098f7e5b1cb2bcefb6448d52e2e19b7c40d
+// Next step script hash: 76486da4588174318b7447fce26f3f22455a65b2bc063df6900d93a7f11c252d
 
 // source digest: 97EF0B8134DCF72CE2FD67755B33A3B35BFB6A557D261B2C89027478E99E231A
 script {
@@ -17,7 +17,7 @@ script {
         let framework_signer = diem_governance::resolve_multi_step_proposal(
             proposal_id,
             @0000000000000000000000000000000000000000000000000000000000000001,
-            vector[72u8,242u8,166u8,212u8,222u8,27u8,147u8,202u8,218u8,81u8,111u8,87u8,213u8,253u8,208u8,152u8,247u8,229u8,177u8,203u8,43u8,206u8,251u8,100u8,72u8,213u8,46u8,46u8,25u8,183u8,196u8,13u8,],
+            vector[118u8,72u8,109u8,164u8,88u8,129u8,116u8,49u8,139u8,116u8,71u8,252u8,226u8,111u8,63u8,34u8,69u8,90u8,101u8,178u8,188u8,6u8,61u8,246u8,144u8,13u8,147u8,167u8,241u8,28u8,37u8,45u8,],
         );
         let code = vector::empty();
         let code_chunk0 =
@@ -636,6 +636,6 @@ script {
             112u8,116u8,105u8,111u8,110u8,0u8,0u8,0u8,6u8,115u8,116u8,114u8,105u8,110u8,103u8,0u8,0u8,0u8,0u8,0u8,
         ];
         code::publish_package_txn(&framework_signer, metadata_chunk1, code);
-        version::upgrade_set_git(&framework_signer, x"25053ae3d9da72cee42882ab26e0069875e727ad")
+        version::upgrade_set_git(&framework_signer, x"993b9a240c0efe9ee9f8685d48eee7450b12d9a9")
     }
 }