aptos-labs · wrwg · Jan 22, 2025 · Jan 20, 2025
diff --git a/aptos-move/aptos-e2e-comparison-testing/src/execution.rs b/aptos-move/aptos-e2e-comparison-testing/src/execution.rs
@@ -362,7 +362,7 @@ impl Execution {
         // Update features if needed to the correct binary format used by V2 compiler.
         let mut features = Features::fetch_config(&state).unwrap_or_default();
         if v2_flag {
-            features.enable(FeatureFlag::VM_BINARY_FORMAT_V7);
+            features.enable(FeatureFlag::VM_BINARY_FORMAT_V8);
         } else {
             features.enable(FeatureFlag::VM_BINARY_FORMAT_V6);
         }

diff --git a/aptos-move/aptos-release-builder/src/components/feature_flags.rs b/aptos-move/aptos-release-builder/src/components/feature_flags.rs
@@ -137,6 +137,7 @@ pub enum FeatureFlag {
     EnableCallTreeAndInstructionVMCache,
     PermissionedSigner,
     AccountAbstraction,
+    VMBinaryFormatV8,
 }
 
 fn generate_features_blob(writer: &CodeWriter, data: &[u64]) {
@@ -229,6 +230,7 @@ impl From<FeatureFlag> for AptosFeatureFlag {
             FeatureFlag::AptosStdChainIdNatives => AptosFeatureFlag::APTOS_STD_CHAIN_ID_NATIVES,
             FeatureFlag::VMBinaryFormatV6 => AptosFeatureFlag::VM_BINARY_FORMAT_V6,
             FeatureFlag::VMBinaryFormatV7 => AptosFeatureFlag::VM_BINARY_FORMAT_V7,
+            FeatureFlag::VMBinaryFormatV8 => AptosFeatureFlag::VM_BINARY_FORMAT_V8,
             FeatureFlag::MultiEd25519PkValidateV2Natives => {
                 AptosFeatureFlag::MULTI_ED25519_PK_VALIDATE_V2_NATIVES
             },
@@ -384,6 +386,7 @@ impl From<AptosFeatureFlag> for FeatureFlag {
             AptosFeatureFlag::APTOS_STD_CHAIN_ID_NATIVES => FeatureFlag::AptosStdChainIdNatives,
             AptosFeatureFlag::VM_BINARY_FORMAT_V6 => FeatureFlag::VMBinaryFormatV6,
             AptosFeatureFlag::VM_BINARY_FORMAT_V7 => FeatureFlag::VMBinaryFormatV7,
+            AptosFeatureFlag::VM_BINARY_FORMAT_V8 => FeatureFlag::VMBinaryFormatV8,
             AptosFeatureFlag::MULTI_ED25519_PK_VALIDATE_V2_NATIVES => {
                 FeatureFlag::MultiEd25519PkValidateV2Natives
             },

diff --git a/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.exp b/aptos-move/aptos-transactional-test-harness/tests/aptos_test_harness/diamond_clicker.exp
@@ -1,7 +1,7 @@
 processed 4 tasks
 
 task 1 'print-bytecode'. lines 4-35:
-// Move bytecode v7
+// Move bytecode v8
 module f75daa73fc071f93593335eb9033da804777eb94491650dd3f095ce6f778acb6.game {
 use 0000000000000000000000000000000000000000000000000000000000000001::signer;
 use 0000000000000000000000000000000000000000000000000000000000000001::debug;

@@ -9,10 +9,7 @@ use aptos_gas_schedule::AptosGasParameters;
 use aptos_infallible::RwLock;
 use aptos_metrics_core::TimerHelper;
 use aptos_native_interface::SafeNativeBuilder;
-use aptos_types::{
-    on_chain_config::{FeatureFlag, OnChainConfig},
-    state_store::state_key::StateKey,
-};
+use aptos_types::{on_chain_config::OnChainConfig, state_store::state_key::StateKey};
 use aptos_vm_environment::environment::AptosEnvironment;
 use bytes::Bytes;
 use move_binary_format::errors::{Location, PartialVMError, VMResult};
@@ -102,7 +99,6 @@ struct WarmVmId {
     natives: Bytes,
     vm_config: Bytes,
     core_packages_registry: Option<Bytes>,
-    bin_v7_enabled: bool,
     inject_create_signer_for_gov_sim: bool,
 }
 
@@ -137,7 +133,6 @@ impl WarmVmId {
             natives,
             vm_config: Self::vm_config_bytes(env.vm_config()),
             core_packages_registry: Self::core_packages_id_bytes(resolver)?,
-            bin_v7_enabled: env.features().is_enabled(FeatureFlag::VM_BINARY_FORMAT_V7),
             inject_create_signer_for_gov_sim,
         })
     }

@@ -245,8 +245,7 @@ impl ProverOptions {
                     || base_opts.prover.check_inconsistency,
                 unconditional_abort_as_inconsistency: self.unconditional_abort_as_inconsistency
                     || base_opts.prover.unconditional_abort_as_inconsistency,
-                skip_loop_analysis: self.keep_loops
-                    || base_opts.prover.unconditional_abort_as_inconsistency,
+                skip_loop_analysis: self.keep_loops || base_opts.prover.skip_loop_analysis,
                 ..base_opts.prover.clone()
             },
             backend: move_prover_boogie_backend::options::BoogieOptions {

diff --git a/third_party/move/move-binary-format/src/file_format.rs b/third_party/move/move-binary-format/src/file_format.rs
@@ -33,6 +33,7 @@ use crate::{
     access::{ModuleAccess, ScriptAccess},
     errors::{PartialVMError, PartialVMResult},
     file_format_common,
+    file_format_common::VERSION_DEFAULT,
     internals::ModuleIndex,
     IndexKind,
 };
@@ -3397,6 +3398,15 @@ impl Arbitrary for CompiledModule {
 }
 
 impl CompiledModule {
+    /// Sets the version of this module to VERSION_DEFAULT.The default initial value
+    /// is VERSION_MAX.
+    pub fn set_default_version(self) -> Self {
+        Self {
+            version: VERSION_DEFAULT,
+            ..self
+        }
+    }
+
     /// Returns the count of a specific `IndexKind`
     pub fn kind_count(&self, kind: IndexKind) -> usize {
         debug_assert!(!matches!(

diff --git a/third_party/move/move-binary-format/src/file_format_common.rs b/third_party/move/move-binary-format/src/file_format_common.rs
@@ -513,9 +513,8 @@ pub const VERSION_7: u32 = 7;
 /// + TBD
 pub const VERSION_8: u32 = 8;
 
-/// Mark which version is the latest version. Should be set to v8 once features
-/// are added.
-pub const VERSION_MAX: u32 = VERSION_7;
+/// Mark which version is the latest version.
+pub const VERSION_MAX: u32 = VERSION_8;
 
 /// Mark which version is the default version. This is the version used by default by tools like
 /// the compiler. Notice that this version might be different from the one supported on nodes.

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/borrowed_from_one_path.exp b/third_party/move/move-compiler-v2/tests/ability-transform/borrowed_from_one_path.exp
@@ -672,7 +672,7 @@ fun m::f($t0: u8, $t1: &vector<u64>): u64 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.m {
 struct R has key {
 	data: vector<u64>

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/by_reference.exp b/third_party/move/move-compiler-v2/tests/ability-transform/by_reference.exp
@@ -2242,7 +2242,7 @@ fun <SELF>_0::check() {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 script {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/copy_ability_tuple.exp b/third_party/move/move-compiler-v2/tests/ability-transform/copy_ability_tuple.exp
@@ -442,7 +442,7 @@ public fun M::g($t0: &signer) {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.M {
 struct R has key {
 	f: u64

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/dead_but_borrowed.exp b/third_party/move/move-compiler-v2/tests/ability-transform/dead_but_borrowed.exp
@@ -190,7 +190,7 @@ fun explicate_drop::test0(): u8 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.explicate_drop {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/destroy_after_call.exp b/third_party/move/move-compiler-v2/tests/ability-transform/destroy_after_call.exp
@@ -402,7 +402,7 @@ fun m::g() {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.m {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/drop_after_loop.exp b/third_party/move/move-compiler-v2/tests/ability-transform/drop_after_loop.exp
@@ -828,7 +828,7 @@ fun m::drop_after_loop() {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.m {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/drop_at_branch.exp b/third_party/move/move-compiler-v2/tests/ability-transform/drop_at_branch.exp
@@ -254,7 +254,7 @@ fun explicate_drop::drop_at_branch($t0: bool): u8 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.explicate_drop {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/foreach_mut_expanded.exp b/third_party/move/move-compiler-v2/tests/ability-transform/foreach_mut_expanded.exp
@@ -1152,7 +1152,7 @@ fun m::test_for_each_mut() {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.m {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/mutate_return.exp b/third_party/move/move-compiler-v2/tests/ability-transform/mutate_return.exp
@@ -303,7 +303,7 @@ fun m::g<#0>($t0: &mut vector<#0>) {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module c0ffee.m {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/ability-transform/mutate_vector.exp b/third_party/move/move-compiler-v2/tests/ability-transform/mutate_vector.exp
@@ -475,7 +475,7 @@ public fun m::scalar_zero(): 0x42::m::Scalar {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.m {
 struct Scalar has copy, drop, store {
 	data: vector<u8>

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/assign.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/assign.exp
@@ -98,7 +98,7 @@ fun assign::assign_struct($t0: &mut 0x42::assign::S) {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.assign {
 struct T has drop {
 	h: u64

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/assign_inline.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/assign_inline.exp
@@ -31,7 +31,7 @@ public fun assign::main(): (u64, u64) {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.assign {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow.exp
@@ -172,7 +172,7 @@ fun borrow::mut_param($t0: u64): u64 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.borrow {
 struct S {
 	f: u64

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow_deref_optimize.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/borrow_deref_optimize.exp
@@ -141,7 +141,7 @@ fun test::optimize_vector() {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.test {
 struct X has copy, drop, key {
 	value: bool

diff --git a/..._party/move/move-compiler-v2/tests/bytecode-generator/bug_14300_update_variant_select.exp b/..._party/move/move-compiler-v2/tests/bytecode-generator/bug_14300_update_variant_select.exp
@@ -180,7 +180,7 @@ fun m::update_non_common_field(): u32 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 815.m {
 enum CommonFields has drop {
  Foo{

diff --git a/...party/move/move-compiler-v2/tests/bytecode-generator/bug_14300_variant_select_autoref.exp b/...party/move/move-compiler-v2/tests/bytecode-generator/bug_14300_variant_select_autoref.exp
@@ -56,7 +56,7 @@ fun m::test_common_access(): u8 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 815.m {
 enum Positional has drop {
  A{

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/bug_14471_receiver_inference.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/bug_14471_receiver_inference.exp
@@ -107,7 +107,7 @@ public fun m::add_when_missing($t0: address, $t1: u64) {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 815.m {
 struct MyMap has key {
 	table: Table<address, ValueWrap>

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/bug_14629.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/bug_14629.exp
@@ -75,7 +75,7 @@ fun M::t0_u128() {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 8675309.M {
 struct R<Ty0: key> {
 	r: Ty0

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/conditional_borrow.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/conditional_borrow.exp
@@ -413,7 +413,7 @@ public fun M::testb(): u64 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 8675.M {
 struct S has copy, drop {
 	f: u64

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/escape_autoref.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/escape_autoref.exp
@@ -117,7 +117,7 @@ fun m::will_autoref(): address {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.m {
 struct Object has copy, drop {
 	inner: address

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/fields.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/fields.exp
@@ -264,7 +264,7 @@ fun fields::write_val($t0: 0x42::fields::S): 0x42::fields::S {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.fields {
 struct T has drop {
 	h: u64

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/freeze_mut_ref.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/freeze_mut_ref.exp
@@ -404,7 +404,7 @@ warning: Unused assignment to `x`. Consider removing or prefixing with an unders
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.freeze_mut_ref {
 struct G {
 	f: u64

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/globals.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/globals.exp
@@ -114,7 +114,7 @@ fun globals::write($t0: address, $t1: u64): u64 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.globals {
 struct R has store, key {
 	f: u64

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/if_else.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/if_else.exp
@@ -97,7 +97,7 @@ fun if_else::if_else_nested($t0: bool, $t1: u64): u64 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.if_else {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/inline_specs.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/inline_specs.exp
@@ -80,7 +80,7 @@ fun inline_specs::succ($t0: u64): u64 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.inline_specs {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/loop.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/loop.exp
@@ -225,7 +225,7 @@ fun loops::while_loop_with_break_and_continue($t0: u64): u64 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.loops {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/loop_labels.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/loop_labels.exp
@@ -76,7 +76,7 @@ fun test::f1() {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 815.test {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_refutable_err.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/matching_refutable_err.exp
@@ -41,7 +41,7 @@ fun m::t($t0: 0x815::m::E): u64 {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 815.m {
 enum E {
  None{

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/operators.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/operators.exp
@@ -203,7 +203,7 @@ fun operators::order($t0: u64, $t1: u64): bool {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.operators {
 
 

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/pack_order.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/pack_order.exp
@@ -175,7 +175,7 @@ fun pack_unpack::pack6($t0: u8, $t1: u8, $t2: u8): 0x42::pack_unpack::S {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.pack_unpack {
 struct S {
 	f1: u8,

diff --git a/third_party/move/move-compiler-v2/tests/bytecode-generator/pack_unpack.exp b/third_party/move/move-compiler-v2/tests/bytecode-generator/pack_unpack.exp
@@ -66,7 +66,7 @@ fun pack_unpack::unpack($t0: 0x42::pack_unpack::S): (u64, u64) {
 
 
 ============ disassembled file-format ==================
-// Move bytecode v7
+// Move bytecode v8
 module 42.pack_unpack {
 struct T {
 	h: u64