Skip to content

Commit c12575a

Browse files
l-monningerl-monninger
committed
feat: adopt da seqeuncer without faucet.
1 parent 3b5d0a9 commit c12575a

File tree

14 files changed

+1823
-1542
lines changed

14 files changed

+1823
-1542
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ debug
77
.direnv
88
.DS_Store
99
.vendors
10-
.vendor
10+
.vendor
11+
*.log

‎Cargo.lock‎

Lines changed: 1691 additions & 1481 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,16 @@ portpicker = "0.1.0"
112112

113113

114114
# movement
115-
maptos-opt-executor = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
116-
movement-client = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
117-
syncador = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
118-
movement-types = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
119-
maptos-execution-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
120-
movement-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
121-
aptos-framework-pre-l1-merge-release = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
122-
movement-signer = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
123-
movement-signer-loader = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
124-
movement-config = { git = "https://github.com/movementlabsxyz/movement.git", rev = "e6592d45495835ff2323a56090d06e4ba64f8ca2" }
115+
maptos-opt-executor = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
116+
movement-client = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
117+
syncador = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
118+
movement-types = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
119+
maptos-execution-util = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
120+
movement-full-node = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
121+
aptos-framework-pre-l1-merge-release = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
122+
movement-signer = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
123+
movement-signer-loader = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
124+
movement-config = { git = "https://github.com/movementlabsxyz/movement.git", rev = "2abf42ea1eb192b7f877a7cdc7a3365c8912789d" }
125125

126126
# aptos-core
127127
aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "cb3b7b02f68c7d6982257e4c59955d0e63b513db" }

‎checks/node/checks/movement-mainnet/src/global_storage_includes.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#[cfg(test)]
22
pub mod test {
33

4-
use futures::channel::mpsc as futures_mpsc;
54
use maptos_execution_util::config::Config as MaptosConfig;
65
use movement_syncing::db::DbSync;
76
use mtma_node_null_core::config::Config as MtmaNullConfig;
@@ -43,7 +42,7 @@ pub mod test {
4342
db_sync.pull().await?;
4443

4544
// form the executor
46-
let (sender, _receiver) = futures_mpsc::channel(100);
45+
let (sender, _receiver) = tokio::sync::mpsc::unbounded_channel();
4746
let mut config = MaptosConfig::default();
4847
config.chain.maptos_db_path = Some(db_sync.destination_db_path().clone());
4948
let movement_opt_executor = MovementOptExecutor::try_from_config(config, sender).await?;

‎checks/node/util/types/src/prelude.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ impl Prelude {
132132
movement_executor
133133
.opt_executor_mut()
134134
.execute_block(block)
135-
.await
136135
.map_err(|e| PreludeError::Internal(e.into()))?;
137136
}
138137

‎flake.lock‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎flake.nix‎

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
rust-overlay.url = "github:oxalica/rust-overlay/47beae969336c05e892e1e4a9dbaac9593de34ab";
55
flake-utils.url = "github:numtide/flake-utils";
66
crane.url = "github:ipetkov/crane";
7-
movement.url = "github:movementlabsxyz/movement/ecb4dddebfdd6363af26977163c0803e57a0bbad";
7+
movement.url = "github:movementlabsxyz/movement/278863e49276f280fb7c719c5fddeb3826fe85ee";
88
};
99

1010
outputs = { nixpkgs, rust-overlay, flake-utils, crane, movement, ... }:
@@ -127,27 +127,41 @@
127127
export CPPFLAGS="-I/opt/homebrew/opt/zlib/include"
128128
fi
129129
130-
# Check if podman machine exists and is running
131-
if [ "$BUILD" != "docker" ]; then
132-
if ! podman machine inspect podman-machine-default &>/dev/null; then
133-
echo "Initializing podman machine..."
134-
podman machine init
135-
podman machine start
136-
elif ! podman machine inspect podman-machine-default --format '{{.State}}' | grep -q 'running'; then
137-
echo "Starting podman machine..."
138-
podman machine start
130+
# Always force recreation of the podman machine
131+
if podman machine inspect podman-machine-default &>/dev/null; then
132+
echo "Destroying existing podman machine..."
133+
if ! podman machine stop podman-machine-default 2>podman_stop_err.log; then
134+
echo "podman machine stop failed. Error output:" >&2
135+
cat podman_stop_err.log >&2
139136
fi
140-
141-
# Find the actual podman socket location
142-
PODMAN_SOCKET=$(find /tmp/nix-shell.*/podman -name "podman-machine-default-api.sock" -type s 2>/dev/null | head -n 1)
143-
if [ -n "$PODMAN_SOCKET" ]; then
144-
export DOCKER_HOST="unix://$PODMAN_SOCKET"
145-
echo "Set DOCKER_HOST to Podman socket: $DOCKER_HOST"
146-
else
147-
echo "Warning: Could not find Podman socket"
137+
if ! podman machine rm podman-machine-default -f 2>podman_rm_err.log; then
138+
echo "podman machine rm failed. Error output:" >&2
139+
cat podman_rm_err.log >&2
140+
exit 1
148141
fi
149-
else
150-
echo "Build is docker podman will not be started."
142+
fi
143+
144+
echo "Initializing podman machine..."
145+
if ! podman machine init 2>podman_init_err.log; then
146+
echo "podman machine init failed. Error output:" >&2
147+
cat podman_init_err.log >&2
148+
exit 1
149+
fi
150+
if ! podman machine start 2>podman_start_err.log; then
151+
echo "podman machine start failed. Error output:" >&2
152+
cat podman_start_err.log >&2
153+
exit 1
154+
fi
155+
156+
echo "Podman machine is running"
157+
158+
# Find the actual podman socket location
159+
PODMAN_SOCKET=$(find /tmp/nix-shell.*/podman -name "podman-machine-default-api.sock" -type s 2>/dev/null | head -n 1)
160+
if [ -n "$PODMAN_SOCKET" ]; then
161+
export DOCKER_HOST="unix://$PODMAN_SOCKET"
162+
echo "Set DOCKER_HOST to Podman socket: $DOCKER_HOST"
163+
else
164+
echo "Warning: Could not find Podman socket"
151165
fi
152166
153167
# Add ./target/debug/* to PATH

‎migration/cli/migrate-node-dev/src/cli/migrate_checked.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
use clap::Parser;
2-
use futures::channel::mpsc as futures_mpsc;
32
use maptos_execution_util::config::Config as MaptosConfig;
43
use movement_syncing::db::DbSync;
54
use mtma_node_null_core::config::Config as MtmaNullConfig;
@@ -88,7 +87,7 @@ impl MigrateChecked {
8887
};
8988

9089
// form the executor
91-
let (sender, _receiver) = futures_mpsc::channel(100);
90+
let (sender, _receiver) = tokio::sync::mpsc::unbounded_channel();
9291
let mut config = MaptosConfig::default();
9392
config.chain.maptos_db_path = Some(db_path.clone());
9493
let movement_opt_executor = MovementOptExecutor::try_from_config(config, sender).await?;

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,7 @@ Usage: --environment-box.* [OPTIONS] --rest-api-url <REST_API_URL> --db-dir <DB_
145145
Options:
146146
--rest-api-url <REST_API_URL> The rest api url of the box environment
147147
--db-dir <DB_DIR> The db dir of the box environment
148-
--snapshot-dir <SNAPSHOT_DIR> Whether to isolate the box environment by snapshotting the movement runner and where
149-
to store the snapshot
148+
--snapshot-dir <SNAPSHOT_DIR> Whether to isolate the box environment by snapshotting the movement runner and where to store the snapshot
150149
-h, --help Print help (see more with '--help')
151150

152151
**Selection (3/4):** `environment-provisioner`

‎migration/util/node-types/Cargo.toml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ either = { workspace = true }
1616
tracing = { workspace = true }
1717
movement-aptos-core = { workspace = true }
1818
futures-channel = { workspace = true }
19-
movement-util = { workspace = true }
19+
2020
uuid = { workspace = true }
2121
walkdir = { workspace = true }
2222
mtma-types = { workspace = true }
2323
mtma-util = { workspace = true }
24+
movement-full-node = { workspace = true }
25+
tokio = { workspace = true }
2426

2527
[dev-dependencies]
2628
tempfile = { workspace = true }

0 commit comments

Comments
 (0)