chore: restructure environments; remove node and migrator distinction for now.

Author: l-monninger

Cargo.lock

@@ -10,15 +10,22 @@ members = [
     "migration/core/node/*",
     "migration/core/migrator/*",
     "migration/util/*",
-    # executor
+
+    # environments
+    "environments/core/*",
+    "environments/util/*",
+
+    # checks
+    ## node
     "checks/node/util/*",
     "checks/node/citeria/*",
     "checks/node/checks/*",
     "checks/node/preludes",
-    # e2e
+    ## migrator
     "checks/migrator/util/*",
     "checks/migrator/citeria/*",
     "checks/migrator/checks/*",
+
     # util
     "util/bcs-ext",
     "util/movement/*",

Cargo.toml

@@ -0,0 +1,40 @@
+[package]
+name = "mtma-box-environment"
+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 }
+movement-signer = { workspace = true }
+movement-signer-loader = { workspace = true }
+hex = { workspace = true }
+mtma-types = { workspace = true }
+movement-core = { workspace = true }
+
+[lints]
+workspace = true

environments/core/box/Cargo.toml

@@ -0,0 +1,2 @@
+# `mtma-box-environment`
+The environment which provides a [Migrator](/README.md#migrator) constructed via access to state on the current node. 

environments/core/box/README.md

@@ -0,0 +1,2 @@
+pub mod migrate;
+pub use migrate::*;

environments/core/box/src/lib.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::*;

environments/core/box/src/migrate.rs

@@ -0,0 +1,103 @@
+use crate::Migrate;
+use anyhow::Context;
+use aptos_framework_pre_l1_merge_release::maptos_framework_release_util::{
+	LocalAccountReleaseSigner, OverrideAccountAddressReleaseSigner,
+};
+use clap::Parser;
+use movement_core::{
+	movement::{Celestia, Eth},
+	Config as MovementCoreConfig,
+};
+use mtma_node_null_core::Config as MtmaNodeNullConfig;
+use mtma_types::movement::aptos_sdk::types::{
+	account_address::AccountAddress, account_config::aptos_test_root_address, LocalAccount,
+};
+use mtma_types::movement::movement_config::Config as MovementConfig;
+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, Serialize, Deserialize, Clone)]
+#[clap(help_expected = true)]
+pub struct Config {
+	/// The config for the mtma-node-null.
+	#[clap(flatten)]
+	mtma_node_null: MtmaNodeNullConfig,
+	/// The movement config.
+	#[clap(flatten)]
+	movement_core: MovementCoreConfig,
+	/// The account address override for the release signer.
+	#[clap(long)]
+	pub account_address: Option<AccountAddress>,
+}
+
+impl Default for Config {
+	fn default() -> Self {
+		let mut movement_core = MovementCoreConfig {
+			movement_config_string: None,
+			setup: false,
+			celestia: Celestia::Local,
+			eth: Eth::Local,
+			biarritz_rc1_to_pre_l1_merge: false,
+			ping_rest_api: false,
+			ping_faucet: false,
+		};
+
+		// Create a default MovementConfig
+		let movement_config = MovementConfig::default();
+
+		// Hard-code the core resources address
+		let account_address = Some(aptos_test_root_address());
+
+		// Set the movement config
+		movement_core.set_movement_config(movement_config);
+
+		Self { mtma_node_null: MtmaNodeNullConfig::default(), movement_core, account_address }
+	}
+}
+
+impl Config {
+	/// Builds the release signer from the config.
+	pub fn build_release_signer(&self) -> Result<LocalAccountReleaseSigner, MigrateConfigError> {
+		// load the signer
+		let raw_private_key = self
+			.movement_core
+			.try_movement_signer_identifier()
+			.map_err(|e| MigrateConfigError::Build(e.into()))?
+			.try_raw_private_key()
+			.context("failed to load raw private key")
+			.map_err(|e| MigrateConfigError::Build(e.into()))?;
+
+		// get the 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)
+			.context("failed to build root account")
+			.map_err(|e| MigrateConfigError::Build(e.into()))?; // sequence number 0 is fine because the release API loads sequence numbers
+
+		Ok(LocalAccountReleaseSigner::new(root_account, None))
+	}
+
+	/// Builds the [Migrate] struct from the config.
+	pub fn build(
+		&self,
+	) -> Result<
+		Migrate<OverrideAccountAddressReleaseSigner<LocalAccountReleaseSigner>>,
+		MigrateConfigError,
+	> {
+		let mtma_node_null =
+			self.mtma_node_null.build().map_err(|e| MigrateConfigError::Build(e.into()))?;
+		let local_signer = self.build_release_signer()?;
+		let signer = OverrideAccountAddressReleaseSigner::core_resource_account(local_signer);
+		Ok(Migrate { release_signer: signer, mtma_node_null })
+	}
+}