Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bytecode version for upgrade test #15758

Merged
merged 2 commits into from
Jan 16, 2025
Merged

fix bytecode version for upgrade test #15758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8384a09
fix bytecode version for upgrade test
rahxephon89 Jan 16, 2025
0248b9d
fix bytecode
rahxephon89 Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aptos-move/aptos-release-builder/data/example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ proposals:
execution_mode: MultiStep
update_sequence:
- Framework:
bytecode_version: 6
bytecode_version: 7
git_hash: ~
- name: gas
metadata:
Expand Down
2 changes: 1 addition & 1 deletion aptos-move/aptos-release-builder/data/release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ proposals:
- Gas:
new: current
- Framework:
bytecode_version: 6
bytecode_version: 7
git_hash: ~
- FeatureFlag:
enabled:
Expand Down
1 change: 1 addition & 0 deletions testsuite/smoke-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
3 changes: 2 additions & 1 deletion testsuite/smoke-test/src/upgrade.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
})],
},
Expand Down
Loading