fix: embedded aptos-runner; we still have problems with port randomization being flaky; it seems like the node config might be read improperly, but hard to tell.

Author: l-monninger

Cargo.lock

@@ -45,6 +45,7 @@ futures = "0.3.17"
 futures-channel = "0.3.17"
 serde = "1.0"
 serde_json = "1.0.140"
+serde_yaml = "0.8.24"
 serde_derive = "1.0"
 thiserror = "1.0.50"
 tracing = "0.1.40"
@@ -94,6 +95,7 @@ reqwest = { version = "0.12.11", features = ["json"] }
 either = "1.8.1"
 tempdir = "0.3.7"
 sysinfo = "0.34.2"
+portpicker = "0.1.0"
 
 
 # movement
@@ -123,12 +125,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 = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
-jsonlvar = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
-commander = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
-include-dir = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
-include-vendor = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
-ready-docker = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "96fa1a31088af992748c8dbe6b8fe4ccfba771fa" }
+kestrel = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "9c56eb9f6dde1564493835c7e2c61b9fd2b00a6c" }
+jsonlvar = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "9c56eb9f6dde1564493835c7e2c61b9fd2b00a6c" }
+commander = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "9c56eb9f6dde1564493835c7e2c61b9fd2b00a6c" }
+include-dir = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "9c56eb9f6dde1564493835c7e2c61b9fd2b00a6c" }
+include-vendor = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "9c56eb9f6dde1564493835c7e2c61b9fd2b00a6c" }
+ready-docker = { git = "https://github.com/movementlabsxyz/kestrel.git", rev = "9c56eb9f6dde1564493835c7e2c61b9fd2b00a6c" }
 
 # orfile
 orfile = { git = "https://github.com/movementlabsxyz/orfile.git", rev = "b49cb42495816fa00a1107be5bbf41aff3a8255d" }
@@ -181,7 +183,6 @@ mtma-migrator-test-types = { path = "checks/migrator/util/types" }
 movement-syncing = { path = "util/movement/movement-syncing" }
 movement-core = { path = "util/movement/movement-core" }
 movement-util = { path = "util/movement/movement-util" }
-movement-aptos-core-inner = { path = "util/movement-aptos/movement-aptos-core-inner" }
 movement-aptos = { path = "util/movement-aptos/movement-aptos" }
 movement-aptos-core = { path = "util/movement-aptos/movement-aptos-core" }
 

Cargo.toml

@@ -136,10 +136,6 @@
               cp $(pwd)/.githooks/pre-commit $(pwd)/.git/hooks/pre-commit
               chmod +x $(pwd)/.git/hooks/pre-commit
 
-              # Hack
-              # Build the movement-aptos binary, so that we can spawn it and avoid tokio runtime deallocation limitations. 
-              cargo build --bin movement-aptos
-
               cat <<'EOF'
                MOVEMENT => MAPTOS
               EOF

flake.nix

@@ -9,8 +9,31 @@ publish = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-movement-aptos-core-inner = { workspace = true }
-movement-aptos = { workspace = true }
+thiserror = { workspace = true }
+serde = { workspace = true }
+anyhow = { workspace = true }
+hex = { workspace = true }
+syncador = { workspace = true }
+tokio = { workspace = true }
+aptos-node = { workspace = true }
+aptos-config = { workspace = true }
+serde_json = { workspace = true }
+clap = { workspace = true }
+jsonlvar = { workspace = true }
+orfile = { workspace = true }
+kestrel = { workspace = true }
+reqwest = { workspace = true }
+aptos-cached-packages = { workspace = true }
+rand = { workspace = true }
+chrono = { workspace = true }
+uuid = { workspace = true }
+serde_yaml = { workspace = true }
+tracing = { workspace = true }
+
+[dev-dependencies]
+uuid = { workspace = true }
+chrono = { workspace = true }
+tracing-test = { workspace = true }
 
 [build-dependencies]
 cargo_metadata = { workspace = true }