feat: post merge upgrade

Cargo.toml

@@ -83,6 +83,7 @@ aptos-framework-head-release = { path = "protocol-units/execution/maptos/framewo
 aptos-framework-elsa-release = { path = "protocol-units/execution/maptos/framework/releases/elsa" }
 aptos-framework-biarritz-rc1-release = { path = "protocol-units/execution/maptos/framework/releases/biarritz-rc1" }
 aptos-framework-pre-l1-merge-release = { path = "protocol-units/execution/maptos/framework/releases/pre-l1-merge" }
+aptos-framework-post-l1-merge-release = { path = "protocol-units/execution/maptos/framework/releases/post-l1-merge" }
 aptos-framework-upgrade-gas-release = { path = "protocol-units/execution/maptos/framework/releases/upgrade-gas" }
 aptos-framework-known-release = { path = "protocol-units/execution/maptos/framework/releases/known-release" }
 aptos-framework-set-feature-flags-release = { path = "protocol-units/execution/maptos/framework/releases/feature-flags" }

process-compose/movement-full-node/process-compose.test-migrate-post-l1-merge.yml

@@ -0,0 +1,18 @@
+version: "3"
+
+processes:
+
+  setup:
+    environment:
+      - "KNOWN_FRAMEWORK_RELEASE=biarritz-rc1"
+      - APTOS_ACCOUNT_WHITELIST=$DOT_MOVEMENT_PATH/default_signer_address_whitelist
+      - MAPTOS_PRIVATE_KEY=random
+
+  test-migrate-pre-to-post-l1-merge:
+    command: |
+      cargo run --bin aptos-framework-post-l1-merge-release-tool
+    depends_on:
+      movement-full-node:
+        condition: process_healthy
+      movement-faucet:
+        condition: process_healthy

protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/Cargo.toml

@@ -0,0 +1,22 @@
+[package]
+name = "pre-l1-merge-to-post-l1-merge"
+description = "post-l1-merge migration"
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+
+version = { workspace = true }
+
+[lib]
+path = "src/lib.rs"
+
+[dependencies]
+maptos-framework-release-util = { workspace = true }
+aptos-sdk = { workspace = true }
+aptos-framework-biarritz-rc1-release = { workspace = true }
+aptos-framework-pre-l1-merge-release = { workspace = true }
+thiserror = { workspace = true }
+dot-movement = { workspace = true }
+movement-config = { workspace = true }

protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/src/dot_movement.rs

@@ -0,0 +1,48 @@
+use crate::{
+	MigratePreL1MergeToPostL1Merge, PreL1MergeToPostL1Merge, PreL1MergeToPostL1MergeError,
+};
+use dot_movement::DotMovement;
+use maptos_framework_release_util::OverrideAccountAddressReleaseSigner;
+use movement_config::{
+	ops::aptos::{
+		framework::releases::release_signer::ReleaseSignerOperations,
+		rest_client::RestClientOperations,
+	},
+	Config,
+};
+
+impl MigratePreL1MergeToPostL1Merge for DotMovement {
+	async fn migrate_framework_from_biarritza_rc1_to_pre_l1_merge(
+		&self,
+	) -> Result<(), PreL1MergeToPostL1MergeError> {
+		// get the movement config from dot movement
+		let config = self.try_get_config_from_json::<Config>().map_err(|e| {
+			PreL1MergeToPostL1MergeError::MigrationFailed(
+				format!("failed to get config: {}", e).into(),
+			)
+		})?;
+
+		// get the rest client from the movement config
+		let rest_client = config
+			.get_rest_client()
+			.await
+			.map_err(|e| PreL1MergeToPostL1MergeError::MigrationFailed(e.into()))?;
+
+		// get the release signer from the movement config
+		let signer = config
+			.get_release_signer()
+			.await
+			.map_err(|e| PreL1MergeToPostL1MergeError::MigrationFailed(e.into()))?;
+
+		// write the signer with a core resource account override
+		let signer = OverrideAccountAddressReleaseSigner::core_resource_account(signer);
+
+		// migrate the framework from Elsa to Biarritz RC1
+		let biarritza_rc1_to_pre_l1_merge = PreL1MergeToPostL1Merge::new();
+		biarritza_rc1_to_pre_l1_merge
+			.migrate_framework_from_pre_l1_merge_to_post_l1_merge(&rest_client, &signer)
+			.await?;
+
+		Ok(())
+	}
+}

protocol-units/execution/maptos/framework/migrations/pre-l1-merge-to-post-l1-merge/src/lib.rs

@@ -0,0 +1,44 @@
+pub mod dot_movement;
+
+use aptos_framework_biarritz_rc1_release::cached::full::feature_upgrade::BiarritzRc1;
+use maptos_framework_release_util::{Release, ReleaseSigner};
+use std::future::Future;
+
+pub struct PreL1MergeToPostL1Merge;
+
+impl PreL1MergeToPostL1Merge {
+	pub fn new() -> Self {
+		Self
+	}
+
+	pub async fn migrate_framework_from_pre_l1_merge_to_post_l1_merge(
+		&self,
+		client: &aptos_sdk::rest_client::Client,
+		signer: &impl ReleaseSigner,
+	) -> Result<(), PreL1MergeToPostL1MergeError> {
+		// todo: validate that the current release is Elsa
+
+		// upgrade to PostL1Merge with the gas upgrade
+		let biarritz_rc1 = BiarritzRc1::new();
+		biarritz_rc1
+			.release(signer, 2_000_000, 100, 60_000, client)
+			.await
+			.map_err(|e| PreL1MergeToPostL1MergeError::MigrationFailed(e.into()))?;
+
+		Ok(())
+	}
+}
+
+/// Errors thrown by PreL1MergeToPostL1Merge migrations.
+#[derive(Debug, thiserror::Error)]
+pub enum PreL1MergeToPostL1MergeError {
+	#[error("migration failed: {0}")]
+	MigrationFailed(#[source] Box<dyn std::error::Error + Send + Sync>),
+}
+
+pub trait MigratePreL1MergeToPostL1Merge {
+	/// Migrate from PreL1Merge to PostL1Merge.
+	fn migrate_framework_from_biarritza_rc1_to_pre_l1_merge(
+		&self,
+	) -> impl Future<Output = Result<(), PreL1MergeToPostL1MergeError>>;
+}

protocol-units/execution/maptos/framework/releases/post-l1-merge/Cargo.toml

@@ -0,0 +1,53 @@
+[package]
+name = "aptos-framework-post-l1-merge-release"
+description = "Post L1 Merge Releaser Binary"
+authors = { workspace = true }
+edition = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+repository = { workspace = true }
+
+version = { workspace = true }
+
+[lib]
+path = "src/lib.rs"
+
+[[bin]]
+name = "aptos-framework-post-l1-merge-release-tool"
+path = "src/bin/release.rs"
+
+[dependencies]
+maptos-framework-release-util = { workspace = true }
+movement-config = { workspace = true }
+movement-client = { workspace = true }
+once_cell = { workspace = true }
+aptos-framework = { workspace = true }
+tokio = { workspace = true }
+anyhow = { workspace = true }
+url = { workspace = true }
+dot-movement = { workspace = true }
+tempfile = { workspace = true }
+bcs = { workspace = true }
+aptos-framework-upgrade-gas-release = { workspace = true }
+aptos-framework-set-feature-flags-release = { workspace = true }
+aptos-framework-release-script-release = { workspace = true }
+aptos-types = { workspace = true }
+aptos-gas-schedule = { workspace = true }
+aptos-sdk = { workspace = true }
+aptos-release-builder = { workspace = true }
+hex = { workspace = true }
+tracing = { workspace = true }
+tracing-subscriber = { workspace = true }
+
+[build-dependencies]
+maptos-framework-release-util = { workspace = true }
+movement-config = { workspace = true }
+movement-client = { workspace = true }
+once_cell = { workspace = true }
+aptos-framework = { workspace = true }
+tokio = { workspace = true }
+anyhow = { workspace = true }
+url = { workspace = true }
+dot-movement = { workspace = true }
+tempfile = { workspace = true }
+bcs = { workspace = true }

protocol-units/execution/maptos/framework/releases/post-l1-merge/build.rs

@@ -0,0 +1,10 @@
+use maptos_framework_release_util::commit_hash_with_script;
+
+commit_hash_with_script!(
+	PostL1Merge,                                         // Struct name
+	"https://github.com/movementlabsxyz/aptos-core.git", // Repository URL
+	"867b1828618ad33bfb3b10c50665cb67113f60e2",          // Commit hash
+	6,                                                   // Bytecode version
+	"post-l1-merge.mrb",                                 // MRB file name
+	"CACHE_POST_L1_MERGE_FRAMEWORK_RELEASE" // Cache environment variable for the post-l1-merge framework release
+);

protocol-units/execution/maptos/framework/releases/post-l1-merge/src/bin/release.rs

@@ -0,0 +1,71 @@
+use aptos_framework_post_l1_merge_release::cached::full::feature_upgrade::PostL1Merge;
+use maptos_framework_release_util::{LocalAccountReleaseSigner, Release};
+use movement_client::types::{account_config::aptos_test_root_address, LocalAccount};
+use once_cell::sync::Lazy;
+use std::str::FromStr;
+use url::Url;
+
+static MOVEMENT_CONFIG: Lazy<movement_config::Config> = Lazy::new(|| {
+	let dot_movement = dot_movement::DotMovement::try_from_env().unwrap();
+	let config = dot_movement.try_get_config_from_json::<movement_config::Config>().unwrap();
+	config
+});
+
+// :!:>section_1c
+static NODE_URL: Lazy<Url> = Lazy::new(|| {
+	let node_connection_address = MOVEMENT_CONFIG
+		.execution_config
+		.maptos_config
+		.client
+		.maptos_rest_connection_hostname
+		.clone();
+	let node_connection_port = MOVEMENT_CONFIG
+		.execution_config
+		.maptos_config
+		.client
+		.maptos_rest_connection_port
+		.clone();
+
+	let node_connection_url =
+		format!("http://{}:{}", node_connection_address, node_connection_port);
+
+	Url::from_str(node_connection_url.as_str()).unwrap()
+});
+
+#[tokio::main]
+async fn main() -> Result<(), anyhow::Error> {
+	// setup the logger
+	use tracing_subscriber::EnvFilter;
+
+	tracing_subscriber::fmt()
+		.with_env_filter(
+			EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info")),
+		)
+		.init();
+
+	let post_l1_release = PostL1Merge::new();
+
+	// get the root account
+	let raw_private_key = MOVEMENT_CONFIG
+		.execution_config
+		.maptos_config
+		.chain
+		.maptos_private_key_signer_identifier
+		.try_raw_private_key()?;
+	let private_key_hex = hex::encode(raw_private_key);
+	let root_account = LocalAccount::from_private_key(private_key_hex.as_str(), 0)?;
+
+	// form the local account release signer
+	let local_account_release_signer =
+		LocalAccountReleaseSigner::new(root_account, Some(aptos_test_root_address()));
+
+	// form the rest client
+	let rest_client = movement_client::rest_client::Client::new(NODE_URL.clone());
+
+	// release the elsa release
+	post_l1_release
+		.release(&local_account_release_signer, 2_000_000, 100, 60, &rest_client)
+		.await?;
+
+	Ok(())
+}