Merge branch 'main' of https://github.com/movementlabsxyz/movement-migration into l-monninger/docker-build-with-d-in-d

Author: l-monninger

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
         command:
           # cargo checks and tests
           - cargo check --all-targets
-          - RUST_MIN_STACK=8388608 cargo test
+          - RUST_MIN_STACK=8388608 cargo test -- --nocapture
 
     with:
       command: ${{ matrix.command }}

Cargo.lock

@@ -254,12 +254,4 @@ debug = true
 [patch.crates-io]
 serde-reflection = { git = "https://github.com/aptos-labs/serde-reflection", rev = "73b6bbf748334b71ff6d7d09d06a29e3062ca075" }
 merlin = { git = "https://github.com/aptos-labs/merlin" }
-x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }
-futures = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
-futures-channel = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
-futures-executor = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
-futures-core = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
-futures-util = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
-futures-sink = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
-futures-io = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
-futures-task = { git = "https://github.com/aptos-labs/futures-rs", branch = "backport" }
+x25519-dalek = { git = "https://github.com/aptos-labs/x25519-dalek", branch = "zeroize_v1" }

Cargo.toml

@@ -9,9 +9,12 @@ MOVEMENT => MOVEMENT APTOS
 `movement-to-movement-aptos` herein abbreviated as `mtma` is the logic and validation of migration from [`movement`](https://github.com/movementlabsxyz/movement) to [`movement-aptos`](https://github.com/movementlabsxyz/movement-aptos-core).
 
 ## Getting started
+
+We have a video motivating, abstracting, and demonstrating this repository. Please review it [here](https://www.loom.com/share/b0b121ac3cec4823ab9938163cdefe83?sid=ff45bf58-46fe-429d-bb9d-9f68b3c5bbb5).
+
 To run or work with existing migration tools check the [CLI documentation](./docs/cli/README.md).
 
-To get an initial grounding, we recommend spending 10-15 minutes reading the [checks](./checks/README.md) and working down into various elements of the API from there. This should provide you with a sense of both the high-level requirements against which we are attempting to implement and validate as well as the approaches we are taking to perform the migration. 
+To further your initial grounding, we recommend spending 10-15 minutes reading the [checks](./checks/README.md) and working down into various elements of the API from there. This should provide you with a sense of both the high-level requirements against which we are attempting to implement and validate as well as the approaches we are taking to perform the migration. 
 
 Once you have completed the above, review the following:
 

README.md

@@ -9,7 +9,6 @@ publish = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-hex = { workspace = true }
 mtma-types = { workspace = true }
 mtma-migrator-types = { workspace = true }
 mtma-migrator-test-types = { workspace = true }

checks/migrator/checks/pre-l1-merge/Cargo.toml

@@ -2,22 +2,19 @@
 pub mod test {
 
 	use anyhow::Context;
-	use mtma_node_test_types::criterion::movement_executor::maptos_opt_executor::aptos_types::account_address::AccountAddress;
+	use movement_core::Movement;
 	use mtma_migrator_pre_l1_merge_core::config::Config as PreL1MergeConfig;
 	use mtma_migrator_test_accounts_equal_criterion::AccountsEqual;
 	use mtma_migrator_test_types::check::checked_migration;
-	use mtma_migrator_types::migrator::{movement_migrator::{Overlays, MovementMigrator, Runner}};
+	use mtma_migrator_types::migrator::movement_migrator::{MovementMigrator, Overlays, Runner};
 	use mtma_node_test_types::prelude::Prelude;
-	use std::str::FromStr;
-	use tracing::info;
-	use movement_core::Movement;
-	use mtma_types::movement::movement_config::Config as MovementConfig;
-	use hex;
 	use mtma_types::movement::aptos_sdk::types::account_config::aptos_test_root_address;
+	use mtma_types::movement::movement_config::Config as MovementConfig;
+	use tracing::info;
 
 	#[tokio::test(flavor = "multi_thread")]
 	#[tracing_test::traced_test]
-	async fn test_accounts_equal() -> Result<(), anyhow::Error> {
+	async fn test_pre_l1_merge() -> Result<(), anyhow::Error> {
 		// use a scope to ensure everything is dropped
 		{
 			// Create a MovementConfig with the correct port
@@ -56,7 +53,7 @@ pub mod test {
 
 			// wait for the rest client to be ready
 			info!("Waiting for REST client to be ready (timeout: 600s)");
-			let mut rest_api_url = movement_migrator
+			let rest_api_url = movement_migrator
 				.wait_for_rest_api_url(tokio::time::Duration::from_secs(600))
 				.await?;
 			info!("REST API URL: {}", rest_api_url);
@@ -112,13 +109,13 @@ pub mod test {
 			}
 			info!("Migration succeeded");
 
-			// Let the task run in the background and let the Drop implementation handle the shutdown
-			drop(movement_migrator_task);
+			kestrel::end!(movement_migrator_task)?;
 		}
 
 		// exit the test is fine when you only have one test per crate because when cargo test is run across a workspace, it actually multi-processes the tests by crate
 		std::process::exit(0);
 
+		#[allow(unreachable_code)]
 		Ok(())
 	}
 }

checks/migrator/checks/pre-l1-merge/src/pre_l1_merge.rs

@@ -1,12 +1,13 @@
 use crate::Migrate;
 use anyhow::Context;
-use aptos_framework_pre_l1_merge_release::maptos_framework_release_util::LocalAccountReleaseSigner;
-use aptos_framework_pre_l1_merge_release::maptos_framework_release_util::OverrideAccountAddressReleaseSigner;
+use aptos_framework_pre_l1_merge_release::maptos_framework_release_util::{
+	LocalAccountReleaseSigner, OverrideAccountAddressReleaseSigner,
+};
 use clap::Parser;
-use movement_core::movement::{Celestia, Eth};
-use movement_core::Config as MovementCoreConfig;
-use movement_signer::key::TryFromCanonicalString;
-use movement_signer_loader::identifiers::{local::Local, SignerIdentifier};
+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,