Skip to content

Commit 7f900aa

Browse files
authored
set v10 and 2.4 as default (#19702)
Co-authored-by: Teng Zhang <teng@aptoslabs.com>
1 parent 887e877 commit 7f900aa

115 files changed

Lines changed: 216 additions & 218 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

api/goldens/aptos_api__tests__state_test__test_get_account_module.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"bytecode": "0xa11ceb0b0900000a0b010002020208030a3f054923076c7b08e70120108702b9010ac0030d0ccd037e0dcb04060fd10404000000010600000307000006000100010000070304000101010004060200010101000806070001010100090809000101010002060400010101000a0a0200010101000b0a07000101010205070301080001030205030108010001060800010502060800060801010101060801046775696404475549440269640249440c6372656174696f6e5f6e756d046164647206637265617465096372656174655f69640f63726561746f725f616464726573730565715f69640f69645f6372656174696f6e5f6e756d1269645f63726561746f725f61646472657373076163636f756e74066f626a656374000000000000000000000000000000000000000000000000000000000000000114636f6d70696c6174696f6e5f6d65746164617461090003322e3003322e33126170746f733a3a6d657461646174615f763185010100000000000000001d45475549445f47454e455241544f525f4e4f545f5055424c49534845445b475549442067656e657261746f72206d757374206265207075626c6973686564206168656164206f66206669727374207573616765206f6620606372656174655f776974685f6361706162696c697479602066756e6374696f6e2e00000002010208010102020403050500030000020d0a01140c020a02060100000000000000160b01150b020b0012011200020101000005040b010b001201020201000005050b001000100114020301000005050b001000100214020401000005050b0010000b0121020501000005040b00100014020601000005040b00100114020701000005040b0010021402000001000101000c000d00",
2+
"bytecode": "0xa11ceb0b0a00000a0b010002020208030a3f054923076c7b08e70120108702b9010ac0030d0ccd037e0dcb04060fd10404000000010600000307000006000100010000070304000101010004060200010101000806070001010100090809000101010002060400010101000a0a0200010101000b0a07000101010205070301080001030205030108010001060800010502060800060801010101060801046775696404475549440269640249440c6372656174696f6e5f6e756d046164647206637265617465096372656174655f69640f63726561746f725f616464726573730565715f69640f69645f6372656174696f6e5f6e756d1269645f63726561746f725f61646472657373076163636f756e74066f626a656374000000000000000000000000000000000000000000000000000000000000000114636f6d70696c6174696f6e5f6d65746164617461090003322e3003322e34126170746f733a3a6d657461646174615f763185010100000000000000001d45475549445f47454e455241544f525f4e4f545f5055424c49534845445b475549442067656e657261746f72206d757374206265207075626c6973686564206168656164206f66206669727374207573616765206f6620606372656174655f776974685f6361706162696c697479602066756e6374696f6e2e00000002010208010102020403050500030000020d0a01140c020a02060100000000000000160b01150b020b0012011200020101000005040b010b001201020201000005050b001000100114020301000005050b001000100214020401000005050b0010000b0121020501000005040b00100014020601000005040b00100114020701000005040b0010021402000001000101000c000d00",
33
"abi": {
44
"address": "0x1",
55
"name": "guid",

aptos-move/cli/src/tests/compile_script/success.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@ BUILDING script_pkg
22
{
33
"Result": {
44
"script_location": "<TEMPDIR>/script.mv",
5-
"script_hash": "6ddc1c9b3d6383073a75c85b49dcaf09d4220f8a411ae3198346b78aad3be611"
5+
"script_hash": "d9129c7f1ab7c1222f0dd5fdeb31ac4d773f9051073a8afad6a5b8fcbc44a2fb"
66
}
77
}

aptos-move/e2e-move-tests/src/tests/memory_quota.data/nested_struct/sources/test.move

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ module 0xbeef::very_nested_structure {
107107
struct W98 has copy, drop, store { id: W97 }
108108
struct W99 has copy, drop, store { id: W98 }
109109

110-
public struct NestedStructVector has key, drop, store {
110+
struct NestedStructVector has key, drop, store {
111111
wraps: vector<W99>,
112112
}
113113

0 Bytes
Binary file not shown.

crates/aptos/CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ All notable changes to the Aptos CLI will be captured in this file. This project
44

55
# Unreleased
66

7-
- _No changes yet._
7+
_No changes yet._
8+
9+
## [9.4.0]
10+
- Set language version 2.4 and bytecode version v10 as default.
811

912
## [9.3.0]
1013
- Replaced `aptos node verify-digest-key` with two commands: `aptos node validate-digest-key` and `aptos node validate-public-parameters`. Both compute and report a blake3 checksum (instead of SHA-256) along with the file size, and verify that the blob deserializes to the corresponding type. The JSON output field is renamed from `sha256` to `blake3`.

crates/aptos/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "aptos"
33
description = "Aptos tool for management of nodes and interacting with the blockchain"
4-
version = "9.3.0"
4+
version = "9.4.0"
55

66
# Workspace inherited keys
77
authors = { workspace = true }

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -577,13 +577,10 @@ pub const VERSION_MAX: u32 = VERSION_10;
577577
/// the compiler. Notice that this version might be different from the one supported on nodes.
578578
/// The node's max version is determined by the on-chain config for that node.
579579
/// !!! For user experience, the default version needs to be already in production.
580-
pub const VERSION_DEFAULT: u32 = VERSION_9;
580+
pub const VERSION_DEFAULT: u32 = VERSION_10;
581581

582-
/// Mark which bytecode version is the default if compiling with language version 2.4 -
582+
/// Mark which bytecode version is the default if compiling with language version 2.5 -
583583
/// In general, these are used to set up the default bytecode version for language versions higher than the default.
584-
pub const VERSION_DEFAULT_LANG_V2_4: u32 = VERSION_10;
585-
586-
/// Mark which version is the default version if compiling with language version 2.5.
587584
pub const VERSION_DEFAULT_LANG_V2_5: u32 = VERSION_10;
588585

589586
pub(crate) mod versioned_data {

third_party/move/move-compiler-v2/tests/checking-lang-v2.2/primitive_match_not_supported.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Diagnostics:
3-
error: match over integers, booleans, or byte strings is not supported before language version 2.4-unstable
3+
error: match over integers, booleans, or byte strings is not supported before language version 2.4
44
┌─ tests/checking-lang-v2.2/primitive_match_not_supported.move:3:16
55
66
3 │ match (x) {

third_party/move/move-compiler-v2/tests/checking-lang-v2.2/primitive_match_range.exp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
Diagnostics:
3-
error: match over integers, booleans, or byte strings is not supported before language version 2.4-unstable
3+
error: match over integers, booleans, or byte strings is not supported before language version 2.4
44
┌─ tests/checking-lang-v2.2/primitive_match_range.move:4:16
55
66
4 │ match (x) {

0 commit comments

Comments
 (0)