From a3d8f479dd5a600aa5d3e489a43255be3d63c351 Mon Sep 17 00:00:00 2001 From: Igor Date: Mon, 27 Jan 2025 15:48:23 -0800 Subject: [PATCH] Bump gas version on main and update release.yaml template closer to what is used in the release, and add more details on release folder issues. --- aptos-move/aptos-gas-schedule/src/ver.rs | 2 +- .../aptos-release-builder/data/release.yaml | 15 ++++++--------- .../aptos-release-builder/src/components/mod.rs | 14 +++++++------- 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/aptos-move/aptos-gas-schedule/src/ver.rs b/aptos-move/aptos-gas-schedule/src/ver.rs index 41a42ce3cbcbbb..ad23e4d850b8f6 100644 --- a/aptos-move/aptos-gas-schedule/src/ver.rs +++ b/aptos-move/aptos-gas-schedule/src/ver.rs @@ -72,7 +72,7 @@ /// global operations. /// - V1 /// - TBA -pub const LATEST_GAS_FEATURE_VERSION: u64 = gas_feature_versions::RELEASE_V1_26; +pub const LATEST_GAS_FEATURE_VERSION: u64 = gas_feature_versions::RELEASE_V1_27; pub mod gas_feature_versions { pub const RELEASE_V1_8: u64 = 11; diff --git a/aptos-move/aptos-release-builder/data/release.yaml b/aptos-move/aptos-release-builder/data/release.yaml index 891bece480d33c..520dc34ef5cf58 100644 --- a/aptos-move/aptos-release-builder/data/release.yaml +++ b/aptos-move/aptos-release-builder/data/release.yaml @@ -1,19 +1,16 @@ --- -remote_endpoint: https://fullnode.mainnet.aptoslabs.com -name: "TBD" +remote_endpoint: ~ +name: "vX.YY.Z" proposals: - name: proposal_1_upgrade_framework metadata: - title: "Multi-step proposal to upgrade mainnet framework, version TBD" - description: "This includes changes in (TBA: URL to changes)" + title: "Multi-step proposal to upgrade mainnet framework, version vX.YY.Z" + description: "This includes changes in https://github.com/aptos-labs/aptos-core/releases/tag/aptos-node-vX.YY.Z" execution_mode: MultiStep update_sequence: - Gas: - new: current + old: https://raw.githubusercontent.com/aptos-labs/aptos-networks/main/gas/vX.WW.Z.json + new: https://raw.githubusercontent.com/aptos-labs/aptos-networks/main/gas/vX.YY.Z.json - Framework: bytecode_version: 7 git_hash: ~ - - FeatureFlag: - enabled: - - allow_serialized_script_args - diff --git a/aptos-move/aptos-release-builder/src/components/mod.rs b/aptos-move/aptos-release-builder/src/components/mod.rs index 745125cde95e3c..e8ef318664f57f 100644 --- a/aptos-move/aptos-release-builder/src/components/mod.rs +++ b/aptos-move/aptos-release-builder/src/components/mod.rs @@ -600,20 +600,20 @@ impl ReleaseConfig { source_dir.push("sources"); std::fs::create_dir(source_dir.as_path()) - .map_err(|err| anyhow!("Fail to create folder for source: {:?}", err))?; + .map_err(|err| anyhow!("Fail to create folder for source {}: {:?}", source_dir.display(), err))?; source_dir.push(&self.name); std::fs::create_dir(source_dir.as_path()) - .map_err(|err| anyhow!("Fail to create folder for source: {:?}", err))?; + .map_err(|err| anyhow!("Fail to create folder for source {}: {:?}", source_dir.display(), err))?; let mut metadata_dir = base_path.to_path_buf(); metadata_dir.push("metadata"); std::fs::create_dir(metadata_dir.as_path()) - .map_err(|err| anyhow!("Fail to create folder for metadata: {:?}", err))?; + .map_err(|err| anyhow!("Fail to create folder for metadata {}: {:?}", metadata_dir.display(), err))?; metadata_dir.push(&self.name); std::fs::create_dir(metadata_dir.as_path()) - .map_err(|err| anyhow!("Fail to create folder for metadata: {:?}", err))?; + .map_err(|err| anyhow!("Fail to create folder for metadata {}: {:?}", metadata_dir.display(), err))?; // If we are generating multi-step proposal files, we generate the files in reverse order, // since we need to pass in the hash of the next file to the previous file. @@ -624,7 +624,7 @@ impl ReleaseConfig { proposal_dir.push(proposal.name.as_str()); std::fs::create_dir(proposal_dir.as_path()) - .map_err(|err| anyhow!("Fail to create folder for proposal: {:?}", err))?; + .map_err(|err| anyhow!("Fail to create folder for proposal {}: {:?}", proposal_dir.display(), err))?; let mut result: Vec<(String, String)> = vec![]; if let ExecutionMode::MultiStep = &proposal.execution_mode { @@ -657,7 +657,7 @@ impl ReleaseConfig { script_path.set_extension("move"); std::fs::write(script_path.as_path(), append_script_hash(script).as_bytes()) - .map_err(|err| anyhow!("Failed to write to file: {:?}", err))?; + .map_err(|err| anyhow!("Failed to write to file {}: {:?}", script_path.display(), err))?; } let mut metadata_path = base_path.to_path_buf(); @@ -669,7 +669,7 @@ impl ReleaseConfig { metadata_path.as_path(), serde_json::to_string_pretty(&proposal.metadata)?, ) - .map_err(|err| anyhow!("Failed to write to file: {:?}", err))?; + .map_err(|err| anyhow!("Failed to write to file {}: {:?}", metadata_path.display(), err))?; } Ok(())