chore: update overlays.

Author: l-monninger

flake.lock

@@ -4,7 +4,7 @@
     rust-overlay.url = "github:oxalica/rust-overlay/47beae969336c05e892e1e4a9dbaac9593de34ab";
     flake-utils.url = "github:numtide/flake-utils";
     crane.url = "github:ipetkov/crane";
-    movement.url = "github:movementlabsxyz/movement/c57483427c16ab637ba05bd345b65d94785a8b08";
+    movement.url = "github:movementlabsxyz/movement/ecb4dddebfdd6363af26977163c0803e57a0bbad";
   };
 
   outputs = { nixpkgs, rust-overlay, flake-utils, crane, movement, ... }:

flake.nix

@@ -143,15 +143,11 @@ The config for the [BoxEnvironment]
 Usage: --environment-box.* [OPTIONS] --rest-api-url <REST_API_URL> --db-dir <DB_DIR>
 
 Options:
-      --rest-api-url <REST_API_URL>
-          The rest api url of the box environment
-      --db-dir <DB_DIR>
-          The db dir of the box environment
-      --snapshot-dir <SNAPSHOT_DIR>
-          Whether to isolate the box environment by snapshotting the movement
-          runner and where to store the snapshot
-  -h, --help
-          Print help (see more with '--help')
+      --rest-api-url <REST_API_URL>  The rest api url of the box environment
+      --db-dir <DB_DIR>              The db dir of the box environment
+      --snapshot-dir <SNAPSHOT_DIR>  Whether to isolate the box environment by snapshotting the movement runner and where
+                                     to store the snapshot
+  -h, --help                         Print help (see more with '--help')
 
 **Selection (3/4):** `environment-provisioner`
 The config for the [ProvisionerEnvironment]

migration/cli/migrate-node/docs/cli/README.md

@@ -4,10 +4,7 @@ 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 movement_core::{Config as MovementCoreConfig, Overlays};
 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,
@@ -46,9 +43,7 @@ impl Default for Config {
 		let mut movement_core = MovementCoreConfig {
 			movement_config_string: None,
 			setup: false,
-			celestia: Celestia::Local,
-			eth: Eth::Local,
-			biarritz_rc1_to_pre_l1_merge: false,
+			overlays: Overlays::default().as_vec(),
 			ping_rest_api: false,
 			ping_faucet: false,
 		};

migration/core/migrator/pre-l1-merge/src/migrate/config.rs

@@ -4,7 +4,7 @@ pub use movement_config;
 pub use movement_util::{self, *};
 
 pub const CONTAINER_REPO: &str = "ghcr.io/movementlabsxyz";
-pub const CONTAINER_REV: &str = "c574834";
+pub const CONTAINER_REV: &str = "ecb4ddd";
 
 #[derive(Debug, Clone)]
 pub struct Container<'a> {
@@ -33,10 +33,5 @@ impl<'a> Container<'a> {
 
 pub const CONTAINERS: &[Container] = &[
 	Container { repo: CONTAINER_REPO, name: "movement-full-node", rev: CONTAINER_REV },
-	Container { repo: CONTAINER_REPO, name: "movement-celestia-da-light-node", rev: CONTAINER_REV },
-	Container { repo: CONTAINER_REPO, name: "movement-full-node-setup", rev: CONTAINER_REV },
 	Container { repo: CONTAINER_REPO, name: "movement-faucet-service", rev: CONTAINER_REV },
-	Container { repo: CONTAINER_REPO, name: "movement-celestia-bridge", rev: CONTAINER_REV },
-	Container { repo: CONTAINER_REPO, name: "movement-celestia-appd", rev: CONTAINER_REV },
-	Container { repo: CONTAINER_REPO, name: "wait-for-celestia-light-node", rev: CONTAINER_REV },
 ];

util/movement/core-util/src/lib.rs

@@ -1,4 +1,4 @@
-use crate::movement::{Celestia, Eth, Movement, MovementWorkspace, Overlay, Overlays};
+use crate::movement::{Movement, MovementWorkspace, Overlay, Overlays};
 use clap::Parser;
 use jsonlvar::Jsonl;
 use movement_signer_loader::identifiers::SignerIdentifier;
@@ -23,21 +23,15 @@ pub struct Config {
 	/// Whether to use the setup overlay.
 	#[clap(long)]
 	pub setup: bool,
-	/// Which celestia network to use.
-	#[clap(long)]
-	pub celestia: Celestia,
-	/// Which ethereum network to use.
-	#[clap(long)]
-	pub eth: Eth,
-	/// Whether to use the BiarritizRc1ToPreL1Merge overlay.
-	#[clap(long)]
-	pub biarritz_rc1_to_pre_l1_merge: bool,
 	/// Whether to ping the rest api to ensure it is responding to pings.
 	#[clap(long)]
 	pub ping_rest_api: bool,
 	/// Whether to ping the faucet to ensure it is responding to pings.
 	#[clap(long)]
 	pub ping_faucet: bool,
+	/// Overlays
+	#[clap(long)]
+	pub overlays: Vec<Overlay>,
 }
 
 impl Config {
@@ -63,16 +57,7 @@ impl Config {
 
 	/// Computes the overlays for the movement runner.
 	pub fn overlays(&self) -> Overlays {
-		let mut overlays = Overlays::empty();
-
-		overlays.add(Overlay::Celestia(self.celestia));
-		overlays.add(Overlay::Eth(self.eth));
-
-		if self.biarritz_rc1_to_pre_l1_merge {
-			overlays.add(Overlay::TestMigrateBiarritzRc1ToPreL1Merge);
-		}
-
-		overlays
+		Overlays::new(self.overlays.iter().cloned().collect())
 	}
 
 	/// Builds the config into a [Movement] runner.

util/movement/core/src/config.rs

@@ -11,7 +11,7 @@ pub mod faucet;
 pub mod rest_api;
 use std::path::PathBuf;
 
-use faucet::{Faucet, ParseFaucet};
+use faucet::{Faucet as FaucetApi, ParseFaucet};
 use movement_signer_loader::identifiers::SignerIdentifier;
 use mtma_types::movement::movement_config::Config as MovementConfig;
 use rest_api::{ParseRestApi, RestApi};
@@ -26,90 +26,72 @@ vendor_workspace!(MovementWorkspace, "movement");
 /// The different overlays that can be applied to the movement runner. s
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
 pub enum Overlay {
-	/// The celestia overlay is used to run the movement runner on a select Celestia network.
-	Celestia(Celestia),
-	/// The eth overlay is used to run the movement runner on a select Ethereum network.
-	Eth(Eth),
-	/// The test migration overlay is used to run and check the migration to the L1 pre-merge chain.
-	///
-	/// TODO: in this repo, we may want to remove this from the runner and place it actual embeeded code under the -core lib for https://github.com/movementlabsxyz/movement-migration/issues/61
-	TestMigrateBiarritzRc1ToPreL1Merge,
+	/// The local overlay takes care of setting up the DA sequencer and the full nodd
+	Local(Local),
+	/// The faucet overlay adds the faucet to whatever orchestration
+	Faucet(Faucet),
+	/// The fullnode overlay is best used for connecting to an existing network
+	Fullnode(Fullnode),
 }
 
 impl Overlay {
 	/// Returns the overlay as a string as would be used in a nix command.
 	pub fn overlay_arg(&self) -> &str {
 		match self {
-			Self::Celestia(celestia) => celestia.overlay_arg(),
-			Self::Eth(eth) => eth.overlay_arg(),
-			Self::TestMigrateBiarritzRc1ToPreL1Merge => "test-migrate-biarritz-rc1-to-pre-l1-merge",
+			Self::Local(local) => local.overlay_arg(),
+			Self::Faucet(faucet) => faucet.overlay_arg(),
+			Self::Fullnode(fullnode) => fullnode.overlay_arg(),
 		}
 	}
 }
 
-/// Errors thrown when parsing an [Eth] network.
+/// Errors thrown when parsing an [Overlay] network.
 #[derive(Debug, thiserror::Error)]
-pub enum EthError {
-	#[error("invalid ethereum network: {0}")]
-	InvalidNetwork(#[source] Box<dyn std::error::Error + Send + Sync>),
-}
-
-#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-pub enum Eth {
-	/// The local network.
-	Local,
+pub enum OverlayError {
+	#[error("invalid overlay selection: {0}")]
+	InvalidOverlaySelection(#[source] Box<dyn std::error::Error + Send + Sync>),
 }
 
-impl FromStr for Eth {
-	type Err = EthError;
+impl FromStr for Overlay {
+	type Err = OverlayError;
 
 	fn from_str(s: &str) -> Result<Self, Self::Err> {
 		Ok(match s {
-			"local" => Self::Local,
-			network => return Err(EthError::InvalidNetwork(network.into())),
+			"local" => Self::Local(Local),
+			"faucet" => Self::Faucet(Faucet),
+			"fullnode" => Self::Fullnode(Fullnode),
+			overlay => return Err(OverlayError::InvalidOverlaySelection(overlay.into())),
 		})
 	}
 }
 
-impl Eth {
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct Local;
+
+impl Local {
 	/// Returns the overlay as a string as would be used in a nix command.
 	pub fn overlay_arg(&self) -> &str {
-		match self {
-			Self::Local => "local",
-		}
+		"local"
 	}
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
-pub enum Celestia {
-	/// The local network.
-	Local,
-}
-
-/// Errors thrown when parsing a [Celestia] network.
-#[derive(Debug, thiserror::Error)]
-pub enum CelestiaError {
-	#[error("invalid celestia network: {0}")]
-	InvalidNetwork(#[source] Box<dyn std::error::Error + Send + Sync>),
-}
+pub struct Faucet;
 
-impl FromStr for Celestia {
-	type Err = CelestiaError;
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		Ok(match s {
-			"local" => Self::Local,
-			network => return Err(CelestiaError::InvalidNetwork(network.into())),
-		})
+impl Faucet {
+	/// Returns the overlay as a string as would be used in a nix command.
+	pub fn overlay_arg(&self) -> &str {
+		"faucet"
 	}
 }
 
-impl Celestia {
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Serialize, Deserialize)]
+pub struct Fullnode;
+
+impl Fullnode {
 	/// Returns the overlay as a string as would be used in a nix command.
 	pub fn overlay_arg(&self) -> &str {
-		match self {
-			Self::Local => "local",
-		}
+		"fullnode"
 	}
 }
 
@@ -141,6 +123,10 @@ impl Overlays {
 	pub fn to_overlay_args(&self) -> String {
 		self.0.iter().map(|o| o.overlay_arg()).collect::<Vec<_>>().join(".")
 	}
+
+	pub fn as_vec(&self) -> Vec<Overlay> {
+		self.0.iter().cloned().collect()
+	}
 }
 
 impl From<BTreeSet<Overlay>> for Overlays {
@@ -152,8 +138,8 @@ impl From<BTreeSet<Overlay>> for Overlays {
 impl Default for Overlays {
 	fn default() -> Self {
 		Self::new(BTreeSet::new())
-			.with(Overlay::Eth(Eth::Local))
-			.with(Overlay::Celestia(Celestia::Local))
+			.with(Overlay::Local(Local))
+			.with(Overlay::Faucet(Faucet))
 	}
 }
 
@@ -199,7 +185,7 @@ pub struct Movement {
 	/// Whether to ping the faucet to ensure it is responding to pings.
 	ping_faucet: bool,
 	/// The faucet state.
-	faucet: State<Faucet>,
+	faucet: State<FaucetApi>,
 }
 
 /// Errors thrown when running [Movement].
@@ -376,8 +362,8 @@ impl Movement {
 		&self.rest_api
 	}
 
-	/// Borrows the [Faucet] state.
-	pub fn faucet(&self) -> &State<Faucet> {
+	/// Borrows the [FaucetApi] state.
+	pub fn faucet(&self) -> &State<FaucetApi> {
 		&self.faucet
 	}
 

util/movement/core/src/movement.rs

@@ -103,17 +103,15 @@ Run the movement
 
 Run run with all parameters passed explicitly as CLI flags. See Orfile documentation for more details: <https://github.com/movementlabsxyz/orfile>
 
-**Usage:** `movement run where [OPTIONS] --celestia <CELESTIA> --eth <ETH>`
+**Usage:** `movement run where [OPTIONS]`
 
 ###### **Options:**
 
 * `--movement-config-string <MOVEMENT_CONFIG_STRING>` — The movement config
 * `--setup` — Whether to use the setup overlay
-* `--celestia <CELESTIA>` — Which celestia network to use
-* `--eth <ETH>` — Which ethereum network to use
-* `--biarritz-rc1-to-pre-l1-merge` — Whether to use the BiarritizRc1ToPreL1Merge overlay
 * `--ping-rest-api` — Whether to ping the rest api to ensure it is responding to pings
 * `--ping-faucet` — Whether to ping the faucet to ensure it is responding to pings
+* `--overlays <OVERLAYS>` — Overlays