Merge pull request #136 from movementlabsxyz/l-monninger/fix-movement

fix: use direct set gas schedule on testnet.

Author: l-monninger

aptos-move/aptos-release-builder/src/components/feature_flags.rs

@@ -185,9 +185,16 @@ pub fn generate_feature_upgrade_proposal(
             generate_features_blob(writer, &disabled);
             emitln!(writer, ";\n");
 
+            let update_method = if is_testnet {
+                "change_feature_flags"
+            } else {
+                "change_feature_flags_for_next_epoch"
+            };
+
             emitln!(
                 writer,
-                "features::change_feature_flags_for_next_epoch({}, enabled_blob, disabled_blob);",
+                "features::{}({}, enabled_blob, disabled_blob);",
+                update_method,
                 signer_arg
             );
             emitln!(writer, "aptos_governance::reconfigure({});", signer_arg);

aptos-move/aptos-release-builder/src/components/gas.rs

@@ -135,14 +135,32 @@ pub fn generate_gas_upgrade_proposal(
                     );
                 },
                 None => {
+                    let update_method = if is_testnet {
+                        "set_for_next_epoch"
+                    } else {
+                        "set_for_next_epoch"
+                    };
                     emitln!(
                         writer,
-                        "gas_schedule::set_for_next_epoch({}, gas_schedule_blob);",
+                        "gas_schedule::{}({}, gas_schedule_blob);",
+                        update_method,
                         signer_arg
                     );
                 },
             }
-            emitln!(writer, "aptos_governance::reconfigure({});", signer_arg);
+
+            let reconfig_method = if is_testnet {
+                "force_end_epoch"
+            } else {
+                "reconfigure"
+            };
+
+            emitln!(
+                writer,
+                "aptos_governance::{}({});",
+                reconfig_method,
+                signer_arg
+            );
         },
     );
 

aptos-move/framework/aptos-framework/sources/chain_status.move

@@ -43,6 +43,6 @@ module aptos_framework::chain_status {
 
     /// Helper function to assert genesis state.
     public fun assert_genesis() {
-        assert!(is_genesis(), error::invalid_state(ENOT_OPERATING));
+        assert!(is_genesis(), error::invalid_state(ENOT_GENESIS));
     }
 }

aptos-move/framework/move-stdlib/sources/configs/features.move

@@ -636,9 +636,11 @@ module std::features {
     ///
     /// Genesis/tests should use `change_feature_flags_internal()` for feature vec initialization.
     ///
+    /// This can be used on testnet prior to successful DKG.
+    ///
     /// Governance proposals should use `change_feature_flags_for_next_epoch()` to enable/disable features.
-    public fun change_feature_flags(_framework: &signer, _enable: vector<u64>, _disable: vector<u64>) {
-        abort (error::invalid_state(EAPI_DISABLED))
+    public fun change_feature_flags(framework: &signer, enable: vector<u64>, disable: vector<u64>) acquires Features {
+        change_feature_flags_internal(framework, enable, disable)
     }
 
     /// Update feature flags directly. Only used in genesis/tests.

crates/aptos-jwk-consensus/src/epoch_manager.rs

@@ -148,6 +148,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
     }
 
     async fn start_new_epoch(&mut self, payload: OnChainConfigPayload<P>) {
+        println!("Starting new epoch.");
         let validator_set: ValidatorSet = payload
             .get()
             .expect("failed to get ValidatorSet from payload");
@@ -239,6 +240,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
     }
 
     async fn on_new_epoch(&mut self, reconfig_notification: ReconfigNotification<P>) -> Result<()> {
+        println!("EpochManager received new epoch notification.");
         self.shutdown_current_processor().await;
         self.start_new_epoch(reconfig_notification.on_chain_configs)
             .await;

dkg/src/epoch_manager.rs

@@ -152,6 +152,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
     }
 
     async fn start_new_epoch(&mut self, payload: OnChainConfigPayload<P>) {
+        println!("Starting new epoch.");
         let validator_set: ValidatorSet = payload
             .get()
             .expect("failed to get ValidatorSet from payload");
@@ -250,6 +251,7 @@ impl<P: OnChainConfigProvider> EpochManager<P> {
     }
 
     async fn on_new_epoch(&mut self, reconfig_notification: ReconfigNotification<P>) -> Result<()> {
+        println!("EpochManager received new epoch notification.");
         self.shutdown_current_processor().await;
         self.start_new_epoch(reconfig_notification.on_chain_configs)
             .await;