fix: permissions issue with config.json.

Author: l-monninger

Cargo.lock

@@ -134,12 +134,12 @@ secure-signer-loader = { git = "https://github.com/movementlabsxyz/secure-signin
 secure-signer-aws-kms = { git = "https://github.com/movementlabsxyz/secure-signing.git", rev = "f37eebd6d494d21b26b2faa44e1188de42ff1007" }
 
 # kestrel 
-kestrel = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "0a23ffdad33b9398ec906dfea05b4369b5a58d37" }
-jsonlvar = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "0a23ffdad33b9398ec906dfea05b4369b5a58d37" }
-commander = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "0a23ffdad33b9398ec906dfea05b4369b5a58d37" }
-include-dir = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "0a23ffdad33b9398ec906dfea05b4369b5a58d37" }
-include-vendor = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "0a23ffdad33b9398ec906dfea05b4369b5a58d37" }
-ready-docker = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "0a23ffdad33b9398ec906dfea05b4369b5a58d37" }
+kestrel = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "3220d704df7e06d1dcc5266e15eaf05db86fdb07" }
+jsonlvar = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "3220d704df7e06d1dcc5266e15eaf05db86fdb07" }
+commander = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "3220d704df7e06d1dcc5266e15eaf05db86fdb07" }
+include-dir = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "3220d704df7e06d1dcc5266e15eaf05db86fdb07" }
+include-vendor = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "3220d704df7e06d1dcc5266e15eaf05db86fdb07" }
+ready-docker = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "3220d704df7e06d1dcc5266e15eaf05db86fdb07" }
 
 # orfile
 orfile = { git = "https://github.com/movementlabsxyz/orfile.git", rev = "b49cb42495816fa00a1107be5bbf41aff3a8255d" }

Cargo.toml

@@ -3,15 +3,16 @@ pub mod test {
 
 	use mtma_migrator_test_accounts_equal_criterion::AccountsEqual;
 	use mtma_migrator_test_types::check::checked_migration;
-	use mtma_migrator_types::migrator::MovementMigrator;
+	use mtma_migrator_types::migrator::{movement_migrator::Overlays, 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_accounts_equal() -> Result<(), anyhow::Error> {
 		// Form the migrator.
-		let mut movement_migrator = MovementMigrator::try_debug()?;
+		let mut movement_migrator = MovementMigrator::try_debug_home()?;
+		movement_migrator.set_overlays(Overlays::default());
 
 		// Start the migrator so that it's running in the background.
 		// In the future, some migrators may be for already running nodes.

checks/migrator/checks/sketchpad/src/accounts_equal.rs

@@ -1,4 +1,5 @@
 use crate::criterion::{Criterionish, MovementMigrator};
+use anyhow::Context;
 use mtma_migrator_types::migration::Migrationish;
 use mtma_node_test_types::prelude::Prelude;
 
@@ -23,26 +24,32 @@ pub async fn checked_migration<T: Criterionish + Send + Sync>(
 	criteria: Vec<T>,
 ) -> Result<(), CheckError> {
 	// Get the executor
-	let mut movement_executor =
-		movement_migrator.node().await.map_err(|e| CheckError::Internal(e.into()))?;
+	let mut movement_executor = movement_migrator
+		.node()
+		.await
+		.context("failed to get movement node")
+		.map_err(|e| CheckError::Internal(e.into()))?;
 
 	// Run the prelude
 	prelude
 		.run(&mut movement_executor)
 		.await
+		.context("failed to run prelude")
 		.map_err(|e| CheckError::Prelude(e.into()))?;
 
 	// Run the migration
 	let movement_aptos_migrator = migration
 		.migrate(movement_migrator)
 		.await
+		.context("failed to run migration")
 		.map_err(|e| CheckError::Migration(e.into()))?;
 
 	// Run the criteria
 	for criterion in criteria {
 		criterion
 			.satisfies(&movement_migrator, &movement_aptos_migrator)
 			.await
+			.context("failed to satisfy criterion")
 			.map_err(|e| CheckError::Criteria(e.into()))?;
 	}
 

checks/migrator/util/types/src/check.rs

@@ -3,7 +3,7 @@ use kestrel::WaitCondition;
 pub use maptos_opt_executor;
 pub use maptos_opt_executor::aptos_types::{chain_id::ChainId, state_store::TStateView};
 use movement_client::rest_client::Client as MovementRestClient;
-use movement_core::Movement;
+pub use movement_core::{Movement, Overlay, Overlays};
 use mtma_node_types::executor::MovementNode;
 
 /// An enum supporting different types of runners.
@@ -50,6 +50,12 @@ impl MovementMigrator {
 		Ok(Self::new(Runner::Movement(movement)))
 	}
 
+	/// Create a new [MovementMigrator] with a debug_home [Movement] runner.
+	pub fn try_debug_home() -> Result<Self, anyhow::Error> {
+		let movement = Movement::try_debug_home()?;
+		Ok(Self::new(Runner::Movement(movement)))
+	}
+
 	/// Rest Api url for the runner.
 	pub async fn wait_for_rest_api_url(
 		&self,
@@ -86,8 +92,15 @@ impl MovementMigrator {
 	pub async fn node(&self) -> Result<MovementNode, anyhow::Error> {
 		match &self.runner {
 			Runner::Movement(movement) => {
-				MovementNode::from_dir(movement.workspace_path().to_path_buf()).await
+				MovementNode::try_from_dir(movement.workspace_path().to_path_buf()).await
 			}
 		}
 	}
+
+	/// Sets the overlays for the runner.
+	pub fn set_overlays(&mut self, overlays: Overlays) {
+		match &mut self.runner {
+			Runner::Movement(movement) => movement.set_overlays(overlays),
+		}
+	}
 }

migration/util/migrator-types/src/migrator/movement_migrator.rs

@@ -12,6 +12,8 @@ use maptos_opt_executor::aptos_types::{
 };
 pub use maptos_opt_executor::Executor as MovementOptExecutor;
 use movement_util::common_args::MovementArgs;
+use std::fs::Permissions;
+use std::os::unix::fs::PermissionsExt;
 use std::sync::Arc;
 
 use anyhow::Context;
@@ -32,14 +34,29 @@ impl MovementNode {
 		Self { opt_executor }
 	}
 
-	pub async fn from_dir(dir: PathBuf) -> Result<Self, anyhow::Error> {
+	pub async fn try_from_dir(dir: PathBuf) -> Result<Self, anyhow::Error> {
 		let movement_args = MovementArgs { movement_path: Some(dir.clone().display().to_string()) };
 
-		let config = movement_args.config().await?;
+		// print the tokio::fs:metadata for the dir and dir/config.json
+		println!("dir: {:?}", dir);
+		let dir_metadata = tokio::fs::metadata(dir.clone()).await?;
+		println!("dir metadata: {:?}", dir_metadata);
+		let config_metadata = tokio::fs::metadata(dir.join("config.json")).await?;
+		println!("config metadata: {:?}", config_metadata);
+
+		// because the config.json is in a nix shell, it will be reassigned read-only permissions
+		// reassing it to be 755
+		tokio::fs::set_permissions(dir.join("config.json"), Permissions::from_mode(0o755))
+			.await
+			.context("failed to reset permissions on config.json")?;
+
+		let config = movement_args.config().await.context("failed to get movement config")?;
 		let maptos_config = config.execution_config.maptos_config;
 
 		let (sender, _receiver) = futures_channel::mpsc::channel(1024);
-		let opt_executor = MovementOptExecutor::try_from_config(maptos_config, sender).await?;
+		let opt_executor = MovementOptExecutor::try_from_config(maptos_config, sender)
+			.await
+			.context("failed to create movement opt executor")?;
 
 		Ok(Self::new(opt_executor))
 	}

migration/util/node-types/src/executor/movement_executor.rs

@@ -193,6 +193,14 @@ impl Movement {
 		Ok(Self::new(workspace, BTreeSet::new().into()))
 	}
 
+	/// Creates a new [Movement] within a debug home directory.
+	pub fn try_debug_home() -> Result<Self, MovementError> {
+		let workspace =
+			MovementWorkspace::try_debug_home().map_err(|e| MovementError::Internal(e.into()))?;
+
+		Ok(Self::new(workspace, BTreeSet::new().into()))
+	}
+
 	/// Adds an overlay to [Movement].
 	pub fn add_overlay(&mut self, overlay: Overlay) {
 		self.overlays.add(overlay);