[aptos cli] update cli 7.13.0 to mark lang version 2.3 and bytecode version 9 as default (#18400)

Author: junxzm1990

api/goldens/aptos_api__tests__state_test__test_get_account_module.json

@@ -1,5 +1,5 @@
 {
-  "bytecode": "0xa11ceb0b0800000a0b010002020208030a3f054923076c7b08e70120108702b9010ac0030d0ccd037e0dcb04060fd10404000000010600000307000006000100010000070304000101010004060200010101000806070001010100090809000101010002060400010101000a0a0200010101000b0a07000101010205070301080001030205030108010001060800010502060800060801010101060801046775696404475549440269640249440c6372656174696f6e5f6e756d046164647206637265617465096372656174655f69640f63726561746f725f616464726573730565715f69640f69645f6372656174696f6e5f6e756d1269645f63726561746f725f61646472657373076163636f756e74066f626a656374000000000000000000000000000000000000000000000000000000000000000114636f6d70696c6174696f6e5f6d65746164617461090003322e3003322e32126170746f733a3a6d657461646174615f763185010100000000000000001d45475549445f47454e455241544f525f4e4f545f5055424c49534845445b475549442067656e657261746f72206d757374206265207075626c6973686564206168656164206f66206669727374207573616765206f6620606372656174655f776974685f6361706162696c697479602066756e6374696f6e2e00000002010208010102020403050500030000020d0a01140c020a02060100000000000000160b01150b020b0012011200020101000005040b010b001201020201000005050b001000100114020301000005050b001000100214020401000005050b0010000b0121020501000005040b00100014020601000005040b00100114020701000005040b0010021402000001000101000c000d00",
+  "bytecode": "0xa11ceb0b0900000a0b010002020208030a3f054923076c7b08e70120108702b9010ac0030d0ccd037e0dcb04060fd10404000000010600000307000006000100010000070304000101010004060200010101000806070001010100090809000101010002060400010101000a0a0200010101000b0a07000101010205070301080001030205030108010001060800010502060800060801010101060801046775696404475549440269640249440c6372656174696f6e5f6e756d046164647206637265617465096372656174655f69640f63726561746f725f616464726573730565715f69640f69645f6372656174696f6e5f6e756d1269645f63726561746f725f61646472657373076163636f756e74066f626a656374000000000000000000000000000000000000000000000000000000000000000114636f6d70696c6174696f6e5f6d65746164617461090003322e3003322e33126170746f733a3a6d657461646174615f763185010100000000000000001d45475549445f47454e455241544f525f4e4f545f5055424c49534845445b475549442067656e657261746f72206d757374206265207075626c6973686564206168656164206f66206669727374207573616765206f6620606372656174655f776974685f6361706162696c697479602066756e6374696f6e2e00000002010208010102020403050500030000020d0a01140c020a02060100000000000000160b01150b020b0012011200020101000005040b010b001201020201000005050b001000100114020301000005050b001000100214020401000005050b0010000b0121020501000005040b00100014020601000005040b00100114020701000005040b0010021402000001000101000c000d00",
   "abi": {
     "address": "0x1",
     "name": "guid",

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

@@ -26,7 +26,7 @@ use aptos_types::{
 };
 use futures::executor::block_on;
 use handlebars::Handlebars;
-use move_binary_format::file_format_common::VERSION_DEFAULT_LANG_V2;
+use move_binary_format::file_format_common::VERSION_DEFAULT;
 use once_cell::sync::Lazy;
 use serde::{de::Visitor, Deserialize, Deserializer, Serialize, Serializer};
 use std::{
@@ -773,7 +773,7 @@ impl Default for ReleaseConfig {
                     metadata: ProposalMetadata::default(),
                     name: "framework".to_string(),
                     update_sequence: vec![ReleaseEntry::Framework(FrameworkReleaseConfig {
-                        bytecode_version: VERSION_DEFAULT_LANG_V2,
+                        bytecode_version: VERSION_DEFAULT,
                         git_hash: None,
                     })],
                 },

crates/aptos/CHANGELOG.md

@@ -3,10 +3,10 @@
 All notable changes to the Aptos CLI will be captured in this file. This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html) and the format set out by [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 # Unreleased
-- Updated default version of formatter to 1.4.5 and move mutation tests to 2.2.0.
 
 ## [7.13.0]
-- Set language version 2.3 as stable, which adds support for signed integer types.
+- Set language version 2.3 and bytecode version v9 as default, adding support for signed integer types.
+- Update default version of formatter to 1.4.5 and move mutation tests to 2.2.0.
 
 ## [7.12.1]
 - Fix link time optimization issues with Aptos CLI released via homebrew.

testsuite/smoke-test/src/upgrade.rs

@@ -20,7 +20,7 @@ use aptos_release_builder::{
 };
 use aptos_temppath::TempPath;
 use aptos_types::on_chain_config::{FeatureFlag as AptosFeatureFlag, OnChainConsensusConfig};
-use move_binary_format::file_format_common::VERSION_DEFAULT_LANG_V2;
+use move_binary_format::file_format_common::VERSION_DEFAULT;
 use std::{fs, path::PathBuf, process::Command, sync::Arc};
 
 // Ignored. This is redundant with the forge compat test but this test is easier to run locally and
@@ -114,7 +114,7 @@ async fn test_upgrade_flow() {
                 name: "framework".to_string(),
                 metadata: ProposalMetadata::default(),
                 update_sequence: vec![ReleaseEntry::Framework(FrameworkReleaseConfig {
-                    bytecode_version: VERSION_DEFAULT_LANG_V2, // TODO: remove explicit bytecode version from sources
+                    bytecode_version: VERSION_DEFAULT, // TODO: remove explicit bytecode version from sources
                     git_hash: None,
                 })],
             },

third_party/move/move-binary-format/src/file_format_common.rs

@@ -552,22 +552,21 @@ pub const VERSION_8: u32 = 8;
 /// + allow `$` in identifiers
 pub const VERSION_9: u32 = 9;
 
+/// Mark which oldest version is supported.
+pub const VERSION_MIN: u32 = VERSION_5;
+
 /// Mark which version is the latest version.
 pub const VERSION_MAX: u32 = VERSION_9;
 
 /// 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.
 /// The node's max version is determined by the on-chain config for that node.
-pub const VERSION_DEFAULT: u32 = VERSION_8;
-
-/// Mark which version is the default version if compiling Move 2.
-pub const VERSION_DEFAULT_LANG_V2: u32 = VERSION_8;
+/// !!! For user experience, the default version needs to be already in production.
+pub const VERSION_DEFAULT: u32 = VERSION_9;
 
-/// Mark which version is the default version if compiling with language version 2.3
-pub const VERSION_DEFAULT_LANG_V2_3: u32 = VERSION_9;
-
-// Mark which oldest version is supported.
-pub const VERSION_MIN: u32 = VERSION_5;
+/// Mark which bytecode version is the default if compiling with language version 2.4 -
+/// In general, these are used to set up the default bytecode version for language versions higher than the default.
+pub const VERSION_DEFAULT_LANG_V2_4: u32 = VERSION_9;
 
 pub(crate) mod versioned_data {
     use crate::{errors::*, file_format_common::*};

third_party/move/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/function.exp

@@ -1,6 +1,6 @@
 processed 2 tasks
 task 0 lines 1-31:  print-bytecode --input=module [// This module defines several public functions with complex bodies.]
-// Bytecode version v8
+// Bytecode version v9
 module 0x3d10::Example
 struct Coin
   value: u64
@@ -53,7 +53,7 @@ public fun deposit(l0: &mut Coin, l1: Coin)
 
 
 task 1 lines 33-46:  print-bytecode --input=module [// Functions may be declared with entry modifier]
-// Bytecode version v8
+// Bytecode version v9
 module 0x4d10::M
 // Function definition at index 0
 entry public fun f()

third_party/move/move-ir-compiler/transactional-tests/tests/bytecode-generation/declarations/let.exp

@@ -1,6 +1,6 @@
 processed 2 tasks
 task 0 lines 1-7:  print-bytecode [// `let` generates a local with the given type.]
-// Bytecode version v8
+// Bytecode version v9
 script
 // Function definition at index 0
 entry public fun main()

third_party/move/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/binary_add.exp

@@ -1,6 +1,6 @@
 processed 1 task
 task 0 lines 1-13:  print-bytecode --input=module [module 0xE.Expressions {]
-// Bytecode version v8
+// Bytecode version v9
 module 0xe::Expressions
 // Function definition at index 0
 fun binary_add()

third_party/move/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow.exp

@@ -1,6 +1,6 @@
 processed 9 tasks
 task 0 lines 1-11:  print-bytecode [// Borrowing a local produces a reference type.]
-// Bytecode version v8
+// Bytecode version v9
 script
 // Function definition at index 0
 entry public fun main()
@@ -17,7 +17,7 @@ entry public fun main()
 
 
 task 1 lines 13-24:  print-bytecode [// Borrowing a local reference produces a reference type.]
-// Bytecode version v8
+// Bytecode version v9
 script
 // Function definition at index 0
 entry public fun main()
@@ -35,7 +35,7 @@ entry public fun main()
 
 
 task 2 lines 26-59:  print-bytecode --input=module [module 0x1d4.M {]
-// Bytecode version v8
+// Bytecode version v9
 module 0x1d4::M
 struct T
   u: u64
@@ -75,7 +75,7 @@ public fun h(l0: &mut T)
 
 
 task 3 lines 61-80:  print-bytecode --input=module [module 0x2d4.M {]
-// Bytecode version v8
+// Bytecode version v9
 module 0x2d4::M
 struct T<T0>
   u: T0

third_party/move/move-ir-compiler/transactional-tests/tests/bytecode-generation/expressions/borrow_mut.exp

@@ -1,6 +1,6 @@
 processed 3 tasks
 task 0 lines 1-10:  print-bytecode [main() {]
-// Bytecode version v8
+// Bytecode version v9
 script
 // Function definition at index 0
 entry public fun main()
@@ -18,7 +18,7 @@ entry public fun main()
 
 
 task 1 lines 12-23:  print-bytecode --input=module [module 0x3d.Foobar {]
-// Bytecode version v8
+// Bytecode version v9
 module 0x3d::Foobar
 struct FooCoin
   value: u64
@@ -36,7 +36,7 @@ public fun borrow_mut_field(l0: &mut FooCoin)
 
 
 task 2 lines 25-36:  print-bytecode --input=module [module 0x4d.Foobar {]
-// Bytecode version v8
+// Bytecode version v9
 module 0x4d::Foobar
 struct FooCoin<T0>
   value: u64