0xmovses/feature upgrade e2e (#1294)

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

Author: 0xmovses

Cargo.toml

@@ -44,7 +44,7 @@ members = [
   "protocol-units/execution/maptos/framework/migrations/*",
   "protocol-units/da-sequencer/config",
   "protocol-units/da-sequencer/client",
-  "protocol-units/da-sequencer/node"
+  "protocol-units/da-sequencer/node",
 ]
 
 [workspace.package]
@@ -170,7 +170,7 @@ aptos-cached-packages = { git = "https://github.com/movementlabsxyz/aptos-core",
 aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
 aptos-consensus-types = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
 aptos-crypto = { git = "https://github.com/movementlabsxyz/aptos-core", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67", features = [
-    "cloneable-private-keys",
+  "cloneable-private-keys",
 ] }
 
 aptos-crypto-derive = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "1d1cdbbd7fabb80dcb95ba5e23213faa072fab67" }
@@ -226,9 +226,9 @@ move-table-extension = { git = "https://github.com/diem/move" }
 move-core-types = { git = "https://github.com/diem/move" }
 
 secp256k1 = { version = "0.27", default-features = false, features = [
-    "global-context",
-    "rand-std",
-    "recovery",
+  "global-context",
+  "rand-std",
+  "recovery",
 ] }
 
 ## Celestia Dependencies
@@ -238,15 +238,15 @@ celestia-types = { git = "https://github.com/eigerco/lumina", rev = "c6e5b7f5e3a
 # External Dependencies
 
 alloy = { git = "https://github.com/alloy-rs/alloy.git", package = "alloy", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
-    "node-bindings",
-    "rpc-types-trace",
-    "json-rpc",
-    "json-abi",
-    "rpc-client",
-    "signers",
-    "signer-yubihsm",
-    "pubsub",
-    "providers",
+  "node-bindings",
+  "rpc-types-trace",
+  "json-rpc",
+  "json-abi",
+  "rpc-client",
+  "signers",
+  "signer-yubihsm",
+  "pubsub",
+  "providers",
 ] }
 alloy-rpc-types-eth = "0.1.3"
 alloy-eips = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
@@ -255,15 +255,15 @@ alloy-network = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b17
 alloy-primitives = { version = "0.7.2", default-features = false }
 alloy-consensus = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
-    "ws",
+  "ws",
 ] }
 alloy-rlp = "0.3.5"
 alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 alloy-sol-types = { version = "0.7.2", features = ["json"] }
 alloy-signer = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 alloy-transport = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2", features = [
-    "reqwest-rustls-tls",
+  "reqwest-rustls-tls",
 ] }
 alloy-transport-ws = { git = "https://github.com/alloy-rs/alloy.git", rev = "83343b172585fe4e040fb104b4d1421f58cbf9a2" }
 
@@ -288,8 +288,8 @@ fail = "0.5.1"
 futures = "0.3.17"
 hashbrown = "0.14.3"
 hex = { version = "0.4.3", default-features = false, features = [
-    "alloc",
-    "serde",
+  "alloc",
+  "serde",
 ] }
 ics23 = { version = "0.11.0" }
 k256 = { version = "0.13.3" }
@@ -316,10 +316,10 @@ reqwest = "0.12.4"
 risc0-build = "0.20"
 risc0-zkvm = { version = "0.21", features = ["std", "getrandom"] }
 rocksdb = { version = "0.22.0", features = [
-    "snappy",
-    "lz4",
-    "zstd",
-    "zlib",
+  "snappy",
+  "lz4",
+  "zstd",
+  "zlib",
 ], default-features = false }
 schemars = { version = "0.8.16", features = ["derive"] }
 serde_with = "3.7.0"

process-compose/movement-full-node/process-compose.test-migrate-biarritz-rc1-to-pre-l1-merge.yml

@@ -16,3 +16,12 @@ processes:
         condition: process_healthy
       movement-faucet:
         condition: process_healthy
+
+  movement-tests-load-tests:
+    command: |
+      LOADTEST_NUMBER_SCENARIOS=10 LOADTEST_SCENARIOS_PER_CLIENT=5 movement-tests-e2e-load-alice-bob
+    depends_on:
+      test-migrate-biarritz-rc1-to-pre-l1-merge:
+        condition: process_completed_successfully
+    availability:
+      exit_on_end: true

protocol-units/execution/maptos/framework/releases/README.md

@@ -41,7 +41,7 @@ The feature comparission between MVT Network and Aptos Network gives these featu
 | 78 | TRANSACTION_SIMULATION_ENHANCEMENT         | DISABLE | ENABLE  | ENABLE           |
 | 79 | COLLECTION_OWNER                           | DISABLE | ENABLE  | ENABLE           |
 | 80 | NATIVE_MEMORY_OPERATIONS                   | DISABLE | ENABLE  | ENABLE           |
-| 81 | _ENABLE_LOADER_V2                           | DISABLE | ENABLE  | ENABLE           |
+| 81 | _ENABLE_LOADER_V2                          | DISABLE | ENABLE  | ENABLE           |
 | 82 | DISALLOW_INIT_MODULE_TO_PUBLISH_MODULES    | DISABLE | ENABLE  | ENABLE           |
 | 90 | NEW_ACCOUNTS_DEFAULT_TO_FA_STORE           | DISABLE | ENABLE  | ENABLE           |
 | 91 | DEFAULT_ACCOUNT_RESOURCE                   | DISABLE | ENABLE  | ENABLE           |
@@ -51,12 +51,9 @@ The feature comparission between MVT Network and Aptos Network gives these featu
 ### 4 APTOS_STD_CHAIN_ID_NATIVES
 Activate this function `native public fun get(): u8;` which allow to access the chain Id inside Move code.
 
-Enable in Movement network and disable in Aptos. Value after migration ? 
-
 ### 6 PERIODICAL_REWARD_RATE_DECREASE
 Enables scheduled reductions in validator/staker reward rates over epochs.
 
-Disable in Movement network and enable in Aptos. Value after migration ? 
 ### 17 PARTIAL_GOVERNANCE_VOTING
 Changes how governance proposals are resolved when not all validators vote
 
@@ -68,8 +65,6 @@ When this feature is enabled:
  - The proposal outcome only considers the validators who actually voted.
  - Abstention is no longer equivalent to a "no" vote.
 
-Disable in Movement network and enable in Aptos. Value after migration ? 
-
 ### 21 DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING
 Allows partial vote counting for delegated stake within validator delegation pools
 
@@ -83,9 +78,6 @@ With this feature enabled:
 
 Without this feature, if a validator has 100 delegated tokens but only 30 are used to vote, the system assumes the other 70 abstained — and still counts them against quorum or majority thresholds
 
-Disable in Movement network and enable in Aptos. Value after migration ? 
-
-
 ### 64 NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE
 Changes the default storage model for APT coins in new accounts.
 When NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE is enabled:
@@ -101,8 +93,6 @@ Without this feature :
  - Less concurrency for transfers
  - Less optimized for high-throughput workloads
 
-Disable in Movement network and enable in Aptos. Value after migration ? 
-
 ### 67 CONCURRENT_FUNGIBLE_BALANCE
 Enables a new implementation of CoinStore optimized for concurrency and performance
 
@@ -113,13 +103,10 @@ When CONCURRENT_FUNGIBLE_BALANCE is enabled, Aptos switches the underlying CoinS
   - Reduced gas costs for coin transfers
   - Concurrent writes to many CoinStores
 
-Enable in Movement network and disable in Aptos. Value after migration ? 
-
 ### 71 DISALLOW_USER_NATIVES
 `DISALLOW_USER_NATIVES` is a VM feature flag that forbids non-framework modules from defining Move “native” items (i.e., native fun and native struct).
 When this flag is enabled, the Aptos VM will reject publishing or upgrading any module that contains user-defined natives unless it belongs to the core code addresses (e.g., 0x1 AptosFramework / AptosStd / MoveStdlib).
 
-Disable in Movement network and enable in Aptos. Value after migration ? 
 
 ### 72 ALLOW_SERIALIZED_SCRIPT_ARGS
 The Aptos feature flag ALLOW_SERIALIZED_SCRIPT_ARGS controls whether Move script/function arguments can be passed in serialized (BCS) form instead of structured command-line input.
@@ -129,17 +116,17 @@ Use Cases
  - Cross-language SDKs: Rust, Python, JavaScript SDKs can encode arguments once and submit them to the chain without decoding
  - Batch transactions or replay systems can record + replay exact inputs
 
-Disable in Movement network and enable in Aptos. Value after migration ?
-
 ### 74 ENABLE_ENUM_TYPES
 Enables the enum type system in Move (akin to Rust-style enums or sum types)
 
-Disable in Movement network and enable in Aptos. Value after migration ?
-
 ### 76 REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT
 Prevent scripts from using unstable VM bytecodes (e.g., Move 2 experimental opcodes).
 
-Disable in Movement network and enable in Aptos. Value after migration ?
+### 74 ENABLE_ENUM_TYPES
+Enables the enum type system in Move (akin to Rust-style enums or sum types)
+
+### 76 REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT
+Prevent scripts from using unstable VM bytecodes (e.g., Move 2 experimental opcodes).
 
 ### 77 FEDERATED_KEYLESS
 Enables federated (off-chain) authentication and signing for special keyless Aptos accounts
@@ -149,16 +136,12 @@ Keyless accounts:
  - Instead, rely on off-chain verifiable authentication protocols (e.g., WebAuthn, federated ID systems)
  - Authentication and signature checks are delegated to a federated service (trusted by the network)
 
-Disable in Movement network and enable in Aptos. Value after migration ?
-
 ### 78 TRANSACTION_SIMULATION_ENHANCEMENT
 Improves consistency, safety, and reliability of transaction simulations
 
 ### 79 COLLECTION_OWNER
 Enables collection ownership logic for NFTs (Token v2), giving collection creators ownership rights and management capabilities
 
-Disable in Movement network and enable in Aptos. Value after migration ?
-
 ### 80 NATIVE_MEMORY_OPERATIONS
 Enables native (Rust-implemented) Move functions for low-level memory access or manipulation.
 It enable these functions:
@@ -167,8 +150,17 @@ It enable these functions:
 native public fun memcpy(dst: &mut vector<u8>, src: &vector<u8>, len: u64);
 native public fun memcmp(a: &vector<u8>, b: &vector<u8>): bool;
 ```
+### ENABLE_LOADER_V2
+Activates Loader v2, a new Move module loading engine with improved design and performance
 
-Disable in Movement network and enable in Aptos. Value after migration ?
+### 82 DISALLOW_INIT_MODULE_TO_PUBLISH_MODULES
+Prevent modules from calling move_to or publish_module during their own initialization (init_module)
+
+### 90 NEW_ACCOUNTS_DEFAULT_TO_FA_STORE
+Makes all newly created accounts default to using FA (aggregator-based) CoinStores for any fungible token, not just APT
+
+### 91 DEFAULT_ACCOUNT_RESOURCE
+Enables the use of the new DefaultAccount resource layout for newly created accounts
 
 ### ENABLE_LOADER_V2
 Activates Loader v2, a new Move module loading engine with improved design and performance
@@ -193,12 +185,9 @@ Disable in Movement network and enable in Aptos. Value after migration ?
 ### GOVERNED_GAS_POOL
 Movement feature removed.
 
-## Proposition
-From my understanding of the feature I propose theses changes:
-
-### Features that can be enable without risk
+### Features that can be enabled without risk
 
-CONCURRENT_FUNGIBLE_BALANCE
+[ x ] CONCURRENT_FUNGIBLE_BALANCE
 ALLOW_SERIALIZED_SCRIPT_ARGS
 REJECT_UNSTABLE_BYTECODE_FOR_SCRIPT
 TRANSACTION_SIMULATION_ENHANCEMENT
@@ -208,22 +197,5 @@ ENABLE_LOADER_V2
 DISALLOW_INIT_MODULE_TO_PUBLISH_MODULES
 DISALLOW_USER_NATIVES
 
-### Features that can be disable without risk
-None
-
-### Feature that can cause an issue where we need to decide.
-These feature can change the current movement network behavior is their state is changed.
-
-APTOS_STD_CHAIN_ID_NATIVES: Disable in Aptos, some of our deployed smart contract can use it so it would break their execution.
-
-PERIODICAL_REWARD_RATE_DECREASE: Depend on how we reward validators.
-
-PARTIAL_GOVERNANCE_VOTING and DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING depends on own the new network governance should work.
-
-NEW_ACCOUNTS_DEFAULT_TO_FA_APT_STORE: change how new account are created. Perhaps, it can create some incompatibilities with the current deployed smart contract. 
-
-ENABLE_ENUM_TYPES: I think it's related to move2 that won't be activated during the migration but after.
 
-FEDERATED_KEYLESS: It's a new feature, do we support it?
 
-NEW_ACCOUNTS_DEFAULT_TO_FA_STORE and DEFAULT_ACCOUNT_RESOURCE: change how account are created, it can affect existing application.

protocol-units/execution/maptos/framework/releases/pre-l1-merge/src/cached.rs

@@ -52,23 +52,28 @@ pub mod full {
 		use aptos_release_builder::components::feature_flags::FeatureFlag;
 		use aptos_types::on_chain_config::FeatureFlag as AptosFeatureFlag;
 
-		// start with the default features and append the Governed Gas Pool feature
 		let mut enable_feature_flags = AptosFeatureFlag::default_features();
-		// Note: when testing into the future, you may have to use a different revision of [aptos_types] in this crate's Cargo.toml
-		// Or, I suppose you can keep and GOVERNED_GAS_POOL feature flag and a GOVERNED_GAS_POOL_V2 feature flag and just make sure you're disabling the former and enabling the latter. Thereafter, it won't matter what happens to the GOVERNED_GAS_POOL feature flag, i.e., it can be replaced.
-		enable_feature_flags.push(AptosFeatureFlag::GOVERNED_GAS_POOL);
 
-		// Note: before the upgrade to the newest version to the Aptos framework
-		// we need to activate features that are currently active on the Aptos testnet
-		// See: https://github.com/movementlabsxyz/movement-migration/issues/30#issuecomment-2862738427
-		// aptos_feature_flags.push(AptosFeatureFlag::PERIODICAL_REWARD_RATE_DECREASE);
+		//Todo update aptos core deps to be on l1-migration branch.
+		//Add in the latest features that are not present here
+
+		// To Enable
+		enable_feature_flags.push(AptosFeatureFlag::GOVERNED_GAS_POOL);
 		enable_feature_flags.push(AptosFeatureFlag::PARTIAL_GOVERNANCE_VOTING);
 		enable_feature_flags.push(AptosFeatureFlag::DELEGATION_POOL_PARTIAL_GOVERNANCE_VOTING);
-		enable_feature_flags.push(AptosFeatureFlag::VM_BINARY_FORMAT_V7);
+		enable_feature_flags.push(AptosFeatureFlag::CONCURRENT_FUNGIBLE_BALANCE);
+		enable_feature_flags.push(AptosFeatureFlag::REJECT_UNSTABLE_BYTECODE);
 
 		Features {
 			enabled: enable_feature_flags.into_iter().map(FeatureFlag::from).collect(),
-			disabled: vec![AptosFeatureFlag::REMOVE_DETAILED_ERROR_FROM_HASH.into()],
+			disabled: vec![
+				FeatureFlag::RemoveDetailedError,
+				FeatureFlag::PeriodicalRewardRateReduction,
+				FeatureFlag::VMBinaryFormatV7,
+				FeatureFlag::KeylessAccounts,
+				FeatureFlag::KeylessButZklessAccounts,
+				FeatureFlag::KeylessAccountsWithPasskeys,
+			],
 		}
 	});
 }