fix: merge main.

Author: l-monninger

.cargo/config.toml

@@ -96,3 +96,5 @@ rustflags = [
 
 [http]
 check-revoke = false
+
+[env]

.github/workflows/nix-command.yml

@@ -19,18 +19,23 @@ on:
 
 jobs:
   run-command:
-    runs-on: macos-latest
+    runs-on: buildjet-16vcpu-ubuntu-2204
     steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+
       - uses: actions/checkout@v4
-      
+
       - name: Install Nix
         uses: DeterminateSystems/nix-installer-action@main
-        
+
       - name: Enable Nix Flakes
         run: |
           mkdir -p ~/.config/nix
           echo "experimental-features = nix-command flakes" >> ~/.config/nix/nix.conf
-          
+
       - name: Run Command in Nix Shell
         run: |
           echo "Running command: ${{ inputs.command }}"

.github/workflows/tests.yml

@@ -12,7 +12,7 @@ jobs:
           # cargo checks and tests
           - cargo check --all-targets
           - cargo test
-          
+
     with:
       command: ${{ matrix.command }}
       nix_flake_path: '.' 

Cargo.lock

@@ -12,11 +12,13 @@ members = [
     "checks/executor/util/*",
     "checks/executor/citeria/*",
     "checks/executor/checks/*",
+    "checks/executor/preludes",
     # e2e
     "checks/e2e/util/*",
     "checks/e2e/citeria/*",
     # util
-    "util/include-dir"
+    "util/include-dir",
+    "util/movement-syncing",
 
 ]
 
@@ -85,20 +87,26 @@ jemallocator = { version = "0.5.0", features = [
 jemalloc-sys = "0.5.4"
 
 either = "1.8.1"
+tempdir = "0.3.7"
+sysinfo = "0.34.2"
 
 # movement
 maptos-opt-executor = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
 movement-client = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
-
-# maptos-core
-aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "6da77d982f82d6e41ace3fcd3651e208a9c1e301" }
-aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "6da77d982f82d6e41ace3fcd3651e208a9c1e301" }
-aptos-rest-client = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "6da77d982f82d6e41ace3fcd3651e208a9c1e301" }
-aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "6da77d982f82d6e41ace3fcd3651e208a9c1e301" }
-aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "6da77d982f82d6e41ace3fcd3651e208a9c1e301" }
-aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "6da77d982f82d6e41ace3fcd3651e208a9c1e301" }
-aptos_schemadb = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "6da77d982f82d6e41ace3fcd3651e208a9c1e301" }
-aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "6da77d982f82d6e41ace3fcd3651e208a9c1e301" }
+syncador =  { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
+movement-types = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
+maptos-execution-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
+
+# aptos-core
+aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos-rest-client = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos-storage-interface = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos_schemadb = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos-db-indexer = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
 # model checking and verification
 
 
@@ -124,6 +132,10 @@ clap-markdown-ext = { git = "https://github.com/movementlabsxyz/clap-markdown-ex
 ### core
 mtma-core = { path = "migration/core/mtma" }
 mtma-null-core = { path = "migration/core/mtma-null" }
+
+### preludes
+migration-executor-preludes = { path = "checks/executor/preludes" }
+
 ### util
 migration-executor-types = { path = "migration/util/executor-types" }
 
@@ -140,6 +152,7 @@ migration-e2e-test-types = { path = "checks/e2e/util/types" }
 
 ## util
 include-dir = { path = "util/include-dir" }
+movement-syncing = { path = "util/movement-syncing" }
 
 [workspace.lints.clippy]
 debug_assert_with_mut_call = "deny"

Cargo.toml

@@ -0,0 +1,32 @@
+[package]
+name = "migration-executor-checks-mainnet"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+authors = { workspace = true }
+homepage = { workspace = true }
+publish = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+migration-executor-test-types = { workspace = true }
+anyhow = { workspace = true }
+mtma-null-core = { workspace = true }
+migration-executor-test-global-storage-injective-criterion = { workspace = true }
+migration-executor-test-global-storage-includes-criterion = { workspace = true }
+migration-executor-test-global-storage-not-empty-criterion = { workspace = true }
+migration-executor-preludes = { workspace = true }
+movement-syncing = { workspace = true }
+maptos-execution-util = { workspace = true }
+tokio = { workspace = true }
+chrono = { workspace = true }
+rand = { workspace = true }
+futures = { workspace = true }
+sysinfo = { workspace = true }
+
+[dev-dependencies]
+tracing-test = { workspace = true }
+tracing = { workspace = true }
+
+[lints]
+workspace = true

checks/e2e/util/types/src/criterion/mod.rs renamed to checks/e2e/util/types/src/criterion.rs

@@ -0,0 +1,67 @@
+#[cfg(test)]
+pub mod test {
+
+	use futures::channel::mpsc as futures_mpsc;
+	use maptos_execution_util::config::Config as MaptosConfig;
+	use migration_executor_test_global_storage_includes_criterion::GlobalStorageIncludes;
+	use migration_executor_test_types::{
+		check::checked_migration,
+		criterion::movement_executor::{MovementExecutor, MovementOptExecutor},
+		prelude::Prelude,
+	};
+	use movement_syncing::db::DbSync;
+	use mtma_null_core::config::Config as MtmaNullConfig;
+	use sysinfo::Disks;
+
+	#[tokio::test]
+	#[tracing_test::traced_test]
+	async fn test_global_storage_includess_null() -> Result<(), anyhow::Error> {
+		let disks = Disks::new_with_refreshed_list();
+
+		let total_disk_space: u64 = disks.iter().map(|disk| disk.total_space()).sum();
+
+		let total_free_space: u64 = disks.iter().map(|disk| disk.available_space()).sum();
+
+		const REQUIRED_SPACE: u64 = 1_000_000_000_000; // 1 TB
+
+		if total_disk_space < REQUIRED_SPACE {
+			println!("Device has less than 1 TB of *total* disk space — skipping test (not a viable test platform).");
+			return Ok(()); // soft pass
+		}
+
+		if total_free_space < REQUIRED_SPACE {
+			println!("Device has enough total disk space, but less than 1 TB is free.");
+			return Err(anyhow::anyhow!("not enough free disk space"));
+		}
+
+		println!("Sufficient disk space available.");
+
+		// sync the db
+		let db_sync = DbSync::mainnet_debug();
+		db_sync.pull().await?;
+
+		// form the executor
+		let (sender, _receiver) = futures_mpsc::channel(100);
+		let mut config = MaptosConfig::default();
+		config.chain.maptos_db_path = Some(db_sync.destination_db_path().clone());
+		let movement_opt_executor = MovementOptExecutor::try_from_config(config, sender).await?;
+		let mut movement_executor = MovementExecutor::new(movement_opt_executor);
+
+		// empty prelude
+		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_executor,
+			&prelude,
+			&migration,
+			vec![Box::new(GlobalStorageIncludes::new())],
+		)
+		.await?;
+		Ok(())
+	}
+}

checks/executor/checks/movement-mainnet/Cargo.toml

@@ -0,0 +1 @@
+pub mod global_storage_includes;

checks/executor/checks/movement-mainnet/src/global_storage_includes.rs

@@ -15,6 +15,7 @@ mtma-null-core = { workspace = true }
 migration-executor-test-global-storage-injective-criterion = { workspace = true }
 migration-executor-test-global-storage-includes-criterion = { workspace = true }
 migration-executor-test-global-storage-not-empty-criterion = { workspace = true }
+migration-executor-preludes = { workspace = true }
 tokio = { workspace = true }
 chrono = { workspace = true }
 rand = { workspace = true }