fix: diesel deps.

l-monninger · l-monninger · commit f4b1620ccc69 · 2025-05-30T14:20:41.000+08:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -103,12 +103,13 @@ portpicker = "0.1.0"
 
 
 # movement
-maptos-opt-executor = { git = "https://github.com/movementlabsxyz/movement.git", rev = "8f820a5c23ce2b632200043acdabb3e6582c078a" }
-movement-client = { git = "https://github.com/movementlabsxyz/movement.git", rev = "8f820a5c23ce2b632200043acdabb3e6582c078a" }
-syncador = { git = "https://github.com/movementlabsxyz/movement.git", rev = "8f820a5c23ce2b632200043acdabb3e6582c078a" }
-movement-types = { git = "https://github.com/movementlabsxyz/movement.git", rev = "8f820a5c23ce2b632200043acdabb3e6582c078a" }
-maptos-execution-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "8f820a5c23ce2b632200043acdabb3e6582c078a" }
-movement-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "8f820a5c23ce2b632200043acdabb3e6582c078a" }
+maptos-opt-executor = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
+movement-client = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
+syncador = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
+movement-types = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
+maptos-execution-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
+movement-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
+aptos-framework-pre-l1-merge-release = { git = "https://github.com/movementlabsxyz/movement.git", rev = "07d5fe82f2c824a7f7e032c9dce339afdbbcb5a0" }
 
 
 # aptos-core
@@ -168,8 +169,11 @@ mtma-track-dev = { path = "migration/cli/track-dev" }
 mtma-core = { path = "migration/core/mtma" }
 mtma-null-core = { path = "migration/core/mtma-null" }
 mtma-node-replay-core = { path = "migration/core/node/mtma-replay" }
+
 #### migrator
 mtma-migrator-null-core = { path = "migration/core/migrator/mtma-null" }
+mtma-migrator-pre-l1-merge-core = { path = "migration/core/migrator/pre-l1-merge" }
+mtma-migrate-chain-core = { path = "migration/core/mtma-migrate-chain" }
 
 #### node
 mtma-node-null-core = { path = "migration/core/node/mtma-null" }
diff --git a/checks/migrator/checks/sketchpad/src/example.rs b/checks/migrator/checks/sketchpad/src/example.rs
@@ -0,0 +1,50 @@
+#[cfg(test)]
+pub mod test {
+
+	use mtma_migrator_test_types::check::checked_migration;
+	use mtma_migrator_types::migrator::MovementMigrator;
+	use mtma_node_null_core::config::Config as MtmaNullConfig;
+	use mtma_node_test_types::prelude::Prelude;
+
+	#[tokio::test]
+	#[tracing_test::traced_test]
+	async fn test_pre_l1_merge() -> Result<(), anyhow::Error> {
+		// Form the migrator.
+		let mut movement_migrator = MovementMigrator::try_temp()?;
+
+		// Start the migrator so that it's running in the background.
+		// In the future, some migrators may be for already running nodes.
+		let movement_migrator_for_task = movement_migrator.clone();
+		let movement_migrator_task = kestrel::task(async move {
+			movement_migrator_for_task.run().await?;
+			Ok::<_, anyhow::Error>(())
+		});
+
+		// Form the prelude.
+		// todo: this needs to be updated to use the prelude generator
+		let prelude = Prelude::new_empty();
+
+		// Form the migration.
+		let migration_config = MtmaNullConfig::default();
+		let migration = migration_config.build()?;
+
+		// Run the checked migration.
+		checked_migration(&mut movement_migrator, &prelude, &migration, vec![]).await?;
+
+		// WITHIN THE CRITERION, you'd be able to do similar background startup and processing to the above. The [Migrationish] trait will give you a [MovementAptosMigrator] which can spawn the runner in the background.
+		//
+		// Note: WITHIN THE CRITERION, you'll be able to do something like the below.
+		// let movement_aptos_migrator_for_task = movement_aptos_migrator.clone();
+		// let movement_aptos_migrator_task = kestrel::task(async move {
+		// 	movement_aptos_migrator_for_task.run().await?;
+		// 	Ok::<_, anyhow::Error>(())
+		// });
+		// // TODO: SOMETHING
+		// kestrel::end!(movement_aptos_migrator_task)?;
+
+		// end the running migrators
+		kestrel::end!(movement_migrator_task)?;
+
+		Ok(())
+	}
+}
diff --git a/migration/cli/migrate-chain-dev/Cargo.toml b/migration/cli/migrate-chain-dev/Cargo.toml
@@ -17,6 +17,7 @@ anyhow = { workspace = true }
 clap-markdown-ext = { workspace = true }
 orfile = { workspace = true }
 mtma-core = { workspace = true }
+mtma-migrate-chain-core = { workspace = true }
 jemallocator = { workspace = true }
 mtma-node-null-core = { workspace = true }
 mtma-node-test-global-storage-injective-criterion = { workspace = true }
diff --git a/migration/cli/migrate-chain-dev/docs/cli/README.md b/migration/cli/migrate-chain-dev/docs/cli/README.md
@@ -103,12 +103,16 @@ Migrate from Movement to MovementAptos
 
 Run migrate with all parameters passed explicitly as CLI flags. See Orfile documentation for more details: <https://github.com/movementlabsxyz/orfile>
 
-**Usage:** `mtma-migrate-chain-dev migrate where --movement-state-db-path <MOVEMENT_STATE_DB_PATH> --movement-aptos-state-db-path <MOVEMENT_APTOS_STATE_DB_PATH>`
+**Usage:** `mtma-migrate-chain-dev migrate where --from <FROM> --to <TO> --maptos-signer <MAPTOS_SIGNER> --da-signer <DA_SIGNER> --mcr-signer <MCR_SIGNER> --movement-args <MOVEMENT_ARGS>`
 
 ###### **Options:**
 
-* `--movement-state-db-path <MOVEMENT_STATE_DB_PATH>` — The path to the input Movement state database
-* `--movement-aptos-state-db-path <MOVEMENT_APTOS_STATE_DB_PATH>` — The path to the output MovementAptos state database
+* `--from <FROM>` — The known release you are migrating from, eg elsa or biarritz-rc1
+* `--to <TO>` — The known release you are migrating to, eg biarritz-rc1 or pre-l1-merge
+* `--maptos-signer <MAPTOS_SIGNER>` — The canonical string for the Maptos signer used in the migration
+* `--da-signer <DA_SIGNER>` — The canonical string for the DA signer used in the migration
+* `--mcr-signer <MCR_SIGNER>` — The canonical string for the MCR signer used in the migration
+* `--movement-args <MOVEMENT_ARGS>` — Movement configuration arguments
 
 
 
diff --git a/migration/cli/migrate-chain-dev/src/cli/migrate.rs b/migration/cli/migrate-chain-dev/src/cli/migrate.rs
@@ -1,5 +1,5 @@
 use clap::Parser;
-use mtma_core::Config;
+use mtma_migrate_chain_core::Config;
 use orfile::Orfile;
 use serde::{Deserialize, Serialize};
 
diff --git a/migration/core/migrator/pre-l1-merge/Cargo.toml b/migration/core/migrator/pre-l1-merge/Cargo.toml
@@ -0,0 +1,35 @@
+[package]
+name = "mtma-migrator-pre-l1-merge-core"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+authors = { workspace = true }
+homepage = { workspace = true }
+publish = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+tokio = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
+dotenv = { workspace = true }
+anyhow = { workspace = true }
+clap-markdown-ext = { workspace = true }
+thiserror = { workspace = true }
+orfile = { workspace = true }
+mtma-node-types = { workspace = true }
+mtma-migrator-types = { workspace = true }
+mtma-node-null-core = { workspace = true }
+aptos-db = { workspace = true }
+aptos-storage-interface = { workspace = true }
+aptos-config = { workspace = true }
+aptos-executor = { workspace = true }
+aptos-vm = { workspace = true }
+chrono = { workspace = true }
+walkdir = { workspace = true }
+uuid = { workspace = true }
+tracing = { workspace = true }
+aptos-framework-pre-l1-merge-release = { workspace = true }
+
+[lints]
+workspace = true
diff --git a/migration/core/migrator/pre-l1-merge/README.md b/migration/core/migrator/pre-l1-merge/README.md
@@ -0,0 +1,2 @@
+# `mtma-migrator-pre-l1-merge`
+Use the [`pre-l1-merge`](https://github.com/movementlabsxyz/movement/tree/main/protocol-units/execution/maptos/framework/releases/pre-l1-merge) release from `movement` to perform the over the wire framework migration. Additionally, runs the [`mtma-node-null-core`](/migration/core/node/null/README.md) migration. 
diff --git a/migration/core/migrator/pre-l1-merge/src/lib.rs b/migration/core/migrator/pre-l1-merge/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod migrate;
+pub use migrate::*;
diff --git a/migration/core/migrator/pre-l1-merge/src/migrate.rs b/migration/core/migrator/pre-l1-merge/src/migrate.rs
@@ -0,0 +1,7 @@
+/// Contains the configuration structs and logic for the migration.
+pub mod config;
+/// Contains the logic for the migration.
+pub mod migrate;
+
+pub use config::*;
+pub use migrate::*;
diff --git a/migration/core/migrator/pre-l1-merge/src/migrate/config.rs b/migration/core/migrator/pre-l1-merge/src/migrate/config.rs
@@ -0,0 +1,46 @@
+use crate::Migrate;
+use aptos_framework_pre_l1_merge_release::maptos_framework_release_util::ReleaseSigner;
+use clap::Parser;
+use mtma_node_null_core::Config as MtmaNodeNullConfig;
+use serde::{Deserialize, Serialize};
+use std::fmt::Debug;
+
+/// Errors thrown when working with the [Config].
+#[derive(Debug, thiserror::Error)]
+pub enum MigrateConfigError {
+	#[error("failed to build from config: {0}")]
+	Build(#[source] Box<dyn std::error::Error + Send + Sync>),
+}
+
+/// The config for the migration.
+///
+/// All fields should be easily statically encodable to a CLI argument.
+/// This is the frontend for the core API.
+#[derive(Parser, Debug, Default, Serialize, Deserialize, Clone)]
+#[clap(help_expected = true)]
+pub struct Config {
+	/// The config for the mtma-node-null.
+	#[clap(flatten)]
+	mtma_node_null: MtmaNodeNullConfig,
+}
+
+impl Config {
+	/// Builds the release signer from the config.
+	pub fn build_release_signer<S>(&self) -> Result<S, MigrateConfigError>
+	where
+		S: ReleaseSigner + Debug + Clone + Send + Sync + 'static,
+	{
+		todo!()
+	}
+
+	/// Builds the [Migrate] struct from the config.
+	pub fn build<S>(&self) -> Result<Migrate<S>, MigrateConfigError>
+	where
+		S: ReleaseSigner + Debug + Clone + Send + Sync + 'static,
+	{
+		let mtma_node_null =
+			self.mtma_node_null.build().map_err(|e| MigrateConfigError::Build(e.into()))?;
+
+		Ok(Migrate { release_signer: self.build_release_signer()?, mtma_node_null })
+	}
+}
diff --git a/migration/core/migrator/pre-l1-merge/src/migrate/migrate.rs b/migration/core/migrator/pre-l1-merge/src/migrate/migrate.rs
@@ -0,0 +1,85 @@
+use aptos_framework_pre_l1_merge_release::{
+	cached::full::feature_upgrade::PreL1Merge,
+	maptos_framework_release_util::{Release, ReleaseSigner},
+};
+use mtma_migrator_types::migration::{MigrationError, Migrationish};
+use mtma_migrator_types::migrator::{
+	movement_aptos_migrator::MovementAptosMigrator, movement_migrator::MovementMigrator,
+};
+use mtma_node_null_core::Migrate as MtmaNodeNullMigrate;
+
+use anyhow::Context;
+use std::fmt::Debug;
+
+/// Errors thrown during the migration.
+#[derive(Debug, thiserror::Error)]
+pub enum MigrateError {
+	#[error("failed to migrate with pre-l1-merge: {0}")]
+	Migrate(#[source] Box<dyn std::error::Error + Send + Sync>),
+}
+
+/// The migration struct will be use to run a migration from Movement
+#[derive(Debug, Clone)]
+pub struct Migrate<S>
+where
+	S: ReleaseSigner + Debug + Clone + Send + Sync + 'static,
+{
+	pub(crate) release_signer: S,
+	pub(crate) mtma_node_null: MtmaNodeNullMigrate,
+}
+
+impl<S> Migrate<S>
+where
+	S: ReleaseSigner + Debug + Clone + Send + Sync + 'static,
+{
+	pub fn new(release_signer: S, mtma_node_null: MtmaNodeNullMigrate) -> Self {
+		Self { release_signer, mtma_node_null }
+	}
+
+	pub fn release_signer(&self) -> &S {
+		&self.release_signer
+	}
+
+	pub fn mtma_node_null(&self) -> &MtmaNodeNullMigrate {
+		&self.mtma_node_null
+	}
+}
+
+impl<S> Migrationish for Migrate<S>
+where
+	S: ReleaseSigner + Debug + Clone + Send + Sync + 'static,
+{
+	async fn migrate(
+		&self,
+		movement_migrator: &MovementMigrator,
+	) -> Result<MovementAptosMigrator, MigrationError> {
+		// wait for the rest client to be ready
+		let rest_client = movement_migrator
+			.wait_for_rest_client_ready(tokio::time::Duration::from_secs(300))
+			.await
+			.context("failed to wait for rest client to be ready")
+			.map_err(|e| MigrationError::Internal(e.into()))?;
+
+		// build the pre-l1-merge
+		let pre_l1_merge = PreL1Merge::new();
+
+		// Run the release
+		pre_l1_merge
+			.release(self.release_signer(), 2_000_000, 100, 60, &rest_client)
+			.await
+			.context("failed to release with pre-l1-merge")
+			.map_err(|e| MigrationError::Internal(e.into()))?;
+
+		// migrate with `mtma-node-null`
+		// NOTE: we're using the blanket implementation to upcast from a node migration to a migrator migration
+		let movement_aptos_migrator = self
+			.mtma_node_null
+			.migrate(movement_migrator)
+			.await
+			.context("failed to migrate node with mtma-node-null")
+			.map_err(|e| MigrationError::Internal(e.into()))?;
+
+		// return the movement aptos migrator
+		Ok(movement_aptos_migrator)
+	}
+}
diff --git a/migration/core/mtma-migrate-chain/Cargo.toml b/migration/core/mtma-migrate-chain/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "mtma-migrate-chain-core"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+authors = { workspace = true }
+homepage = { workspace = true }
+publish = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+tokio = { workspace = true }
+serde = { workspace = true, features = ["derive"] }
+clap = { workspace = true, features = ["derive"] }
+dotenv = { workspace = true }
+anyhow = { workspace = true }
+clap-markdown-ext = { workspace = true }
+thiserror = { workspace = true }
+orfile = { workspace = true }
+mtma-core = { workspace = true }
+
+[lints]
+workspace = true 
diff --git a/migration/core/mtma-migrate-chain/src/lib.rs b/migration/core/mtma-migrate-chain/src/lib.rs
@@ -0,0 +1,2 @@
+pub mod migrate;
+pub use migrate::*;
diff --git a/migration/core/mtma-migrate-chain/src/migrate.rs b/migration/core/mtma-migrate-chain/src/migrate.rs
@@ -0,0 +1,7 @@
+/// Contains the configuration structs and logic for the migration.
+pub mod config;
+/// Contains the logic for the migration.
+pub mod migrate;
+
+pub use config::*;
+pub use migrate::*;
diff --git a/migration/core/mtma-migrate-chain/src/migrate/config.rs b/migration/core/mtma-migrate-chain/src/migrate/config.rs
@@ -0,0 +1,43 @@
+use clap::Parser;
+use serde::{Deserialize, Serialize};
+
+/// Errors thrown when working with the [Config].
+#[derive(Debug, thiserror::Error)]
+pub enum MigrateConfigError {
+	#[error("failed to build from config: {0}")]
+	Build(#[source] Box<dyn std::error::Error + Send + Sync>),
+}
+
+/// The config for the framework migration.
+///
+/// All fields should be easily statically encodable to a CLI argument.
+/// This is the frontend for the core API.
+#[derive(Parser, Debug, Serialize, Deserialize, Clone)]
+#[clap(help_expected = true)]
+pub struct Config {
+	/// The known release you are migrating from, eg elsa or biarritz-rc1.
+	#[clap(long)]
+	pub from: String,
+	/// The known release you are migrating to, eg biarritz-rc1 or pre-l1-merge.
+	#[clap(long)]
+	pub to: String,
+	/// The canonical string for the Maptos signer used in the migration
+	#[clap(long)]
+	pub maptos_signer: String,
+	/// The canonical string for the DA signer used in the migration
+	#[clap(long)]
+	pub da_signer: String,
+	/// The canonical string for the MCR signer used in the migration
+	#[clap(long)]
+	pub mcr_signer: String,
+	/// Movement configuration arguments
+	#[clap(long)]
+	pub movement_args: String,
+}
+
+impl Config {
+	/// Builds the [Framework] struct from the config.
+	pub fn build(&self) -> Result<crate::migrate::Migrate, MigrateConfigError> {
+		Ok(crate::migrate::Migrate { config: self.clone() })
+	}
+}
diff --git a/migration/core/mtma-migrate-chain/src/migrate/migrate.rs b/migration/core/mtma-migrate-chain/src/migrate/migrate.rs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+# `mtma-migrator-pre-l1-merge`
	`2`	+Use the [`pre-l1-merge`](https://github.com/movementlabsxyz/movement/tree/main/protocol-units/execution/maptos/framework/releases/pre-l1-merge) release from `movement` to perform the over the wire framework migration. Additionally, runs the [`mtma-node-null-core`](/migration/core/node/null/README.md) migration.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+pub mod migrate;`
	`2`	`+pub use migrate::*;`