From 8384a09f0186db560df878247441c9ed0b425acc Mon Sep 17 00:00:00 2001 From: Teng Zhang Date: Thu, 16 Jan 2025 11:40:57 -0800 Subject: [PATCH 1/2] fix bytecode version for upgrade test --- Cargo.lock | 1 + testsuite/smoke-test/Cargo.toml | 1 + testsuite/smoke-test/src/upgrade.rs | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 498226c81cb2b..e602839f1babc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -15858,6 +15858,7 @@ dependencies = [ "hex", "hyper 0.14.28", "itertools 0.13.0", + "move-binary-format", "move-core-types", "num_cpus", "once_cell", diff --git a/testsuite/smoke-test/Cargo.toml b/testsuite/smoke-test/Cargo.toml index 07fdf4b1af195..e08175b1fdb60 100644 --- a/testsuite/smoke-test/Cargo.toml +++ b/testsuite/smoke-test/Cargo.toml @@ -54,6 +54,7 @@ diesel = { workspace = true, features = [ digest = { workspace = true } hex = { workspace = true } hyper = { workspace = true } +move-binary-format = { workspace = true } move-core-types = { workspace = true } reqwest = { workspace = true } serde = { workspace = true } diff --git a/testsuite/smoke-test/src/upgrade.rs b/testsuite/smoke-test/src/upgrade.rs index 5e0ce9fa0bc59..5cca2bc44c5c1 100644 --- a/testsuite/smoke-test/src/upgrade.rs +++ b/testsuite/smoke-test/src/upgrade.rs @@ -20,6 +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 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 @@ -113,7 +114,7 @@ async fn test_upgrade_flow() { name: "framework".to_string(), metadata: ProposalMetadata::default(), update_sequence: vec![ReleaseEntry::Framework(FrameworkReleaseConfig { - bytecode_version: 6, // TODO: remove explicit bytecode version from sources + bytecode_version: VERSION_DEFAULT_LANG_V2, // TODO: remove explicit bytecode version from sources git_hash: None, })], }, From 0248b9d74fd200afcc9343284ac740b9eb136d8e Mon Sep 17 00:00:00 2001 From: Teng Zhang Date: Thu, 16 Jan 2025 12:33:44 -0800 Subject: [PATCH 2/2] fix bytecode --- aptos-move/aptos-release-builder/data/example.yaml | 2 +- aptos-move/aptos-release-builder/data/release.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/aptos-move/aptos-release-builder/data/example.yaml b/aptos-move/aptos-release-builder/data/example.yaml index 8d50c14abcffc..456fd49f5186f 100644 --- a/aptos-move/aptos-release-builder/data/example.yaml +++ b/aptos-move/aptos-release-builder/data/example.yaml @@ -10,7 +10,7 @@ proposals: execution_mode: MultiStep update_sequence: - Framework: - bytecode_version: 6 + bytecode_version: 7 git_hash: ~ - name: gas metadata: diff --git a/aptos-move/aptos-release-builder/data/release.yaml b/aptos-move/aptos-release-builder/data/release.yaml index a12d498463731..891bece480d33 100644 --- a/aptos-move/aptos-release-builder/data/release.yaml +++ b/aptos-move/aptos-release-builder/data/release.yaml @@ -11,7 +11,7 @@ proposals: - Gas: new: current - Framework: - bytecode_version: 6 + bytecode_version: 7 git_hash: ~ - FeatureFlag: enabled: