From e6b2039159b0598f35f5e8986cec437924089e00 Mon Sep 17 00:00:00 2001 From: Andy Golay Date: Fri, 6 Dec 2024 08:58:10 -0800 Subject: [PATCH 1/7] test: replace movement cli with aptos cli in bridge setup --- protocol-units/bridge/setup/src/deploy.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/protocol-units/bridge/setup/src/deploy.rs b/protocol-units/bridge/setup/src/deploy.rs index 1a6cf8a8e..326dbb8fa 100644 --- a/protocol-units/bridge/setup/src/deploy.rs +++ b/protocol-units/bridge/setup/src/deploy.rs @@ -203,7 +203,7 @@ pub fn deploy_local_movement_node(config: &mut MovementConfig) -> Result<(), any pub fn init_movement_node(config: &mut MovementConfig) -> Result<(), anyhow::Error> { tracing::info!("Start deploy_local_movement_node rpc url:{}", config.mvt_rpc_connection_url()); - let mut process = Command::new("movement") //--network + let mut process = Command::new("aptos") //--network .args(&[ "init", "--network", @@ -257,7 +257,7 @@ pub fn init_movement_node(config: &mut MovementConfig) -> Result<(), anyhow::Err pub fn deploy_on_movement_framework(config: &mut MovementConfig) -> Result<(), anyhow::Error> { tracing::info!("Before compile move modules"); - let compile_output = Command::new("movement") + let compile_output = Command::new("aptos") .args(&["move", "compile", "--package-dir", "protocol-units/bridge/move-modules/"]) .stdout(Stdio::piped()) .stderr(Stdio::piped()) @@ -269,7 +269,7 @@ pub fn deploy_on_movement_framework(config: &mut MovementConfig) -> Result<(), a if !compile_output.stderr.is_empty() { tracing::info!("move compile stderr: {}", String::from_utf8_lossy(&compile_output.stderr)); } - let enable_bridge_feature_output = Command::new("movement") + let enable_bridge_feature_output = Command::new("aptos") .args(&[ "move", "run-script", @@ -296,7 +296,7 @@ pub fn deploy_on_movement_framework(config: &mut MovementConfig) -> Result<(), a ); } - let store_mint_burn_caps_output = Command::new("movement") + let store_mint_burn_caps_output = Command::new("aptos") .args(&[ "move", "run-script", @@ -323,7 +323,7 @@ pub fn deploy_on_movement_framework(config: &mut MovementConfig) -> Result<(), a ); } - let update_bridge_relayer_output = Command::new("movement") + let update_bridge_relayer_output = Command::new("aptos") .args(&[ "move", "run-script", @@ -352,7 +352,7 @@ pub fn deploy_on_movement_framework(config: &mut MovementConfig) -> Result<(), a ); } - let set_initiator_time_lock_script_output = Command::new("movement") + let set_initiator_time_lock_script_output = Command::new("aptos") .args(&[ "move", "run-script", @@ -381,7 +381,7 @@ pub fn deploy_on_movement_framework(config: &mut MovementConfig) -> Result<(), a ); } - let set_counterparty_time_lock_script_output = Command::new("movement") + let set_counterparty_time_lock_script_output = Command::new("aptos") .args(&[ "move", "run-script", @@ -416,7 +416,7 @@ pub fn deploy_on_movement_framework(config: &mut MovementConfig) -> Result<(), a } fn update_mvt_account_address() -> Result<(), anyhow::Error> { - let config_file_path = std::env::current_dir()?.join(".movement/config.yaml"); + let config_file_path = std::env::current_dir()?.join(".aptos/config.yaml"); let new_address = "0xA550C18"; let mut tmp_lines: Vec = Vec::new(); From ebceec8c0034a2b6c2ed10fdae8f2a9c61eb3aba Mon Sep 17 00:00:00 2001 From: Andy Golay Date: Fri, 6 Dec 2024 10:50:29 -0800 Subject: [PATCH 2/7] test: try self-hosted version of install_cli.py --- .github/workflows/checks-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks-all.yml b/.github/workflows/checks-all.yml index 8c041ea50..41a639fc9 100755 --- a/.github/workflows/checks-all.yml +++ b/.github/workflows/checks-all.yml @@ -294,7 +294,7 @@ jobs: - name: Install Aptos CLI run: | - curl -fsSL "https://aptos.dev/scripts/install_cli.py" | python3 + curl -fsSL "https://github.com/andygolay/aptos-cli-install/blob/main/install_cli.py" | python3 - name: Install Nix uses: DeterminateSystems/nix-installer-action@main From 471a91b3bcd73599002dc28117d8ac7c47742136 Mon Sep 17 00:00:00 2001 From: Andy Golay Date: Fri, 6 Dec 2024 10:55:41 -0800 Subject: [PATCH 3/7] remove bridge label from move modules test --- .github/workflows/checks-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks-all.yml b/.github/workflows/checks-all.yml index 41a639fc9..0050ff5dd 100755 --- a/.github/workflows/checks-all.yml +++ b/.github/workflows/checks-all.yml @@ -278,7 +278,7 @@ jobs: ## any use of Move CLI requires ubuntu-24.04 and to not run on buildjet move-modules-test: - if: github.event.label.name == 'cicd:bridge' || github.ref == 'refs/heads/main' + # if: github.event.label.name == 'cicd:bridge' || github.ref == 'refs/heads/main' strategy: matrix: include: From c94976fb17ca611dfe51a73a3c184672cebd2fc2 Mon Sep 17 00:00:00 2001 From: Andy Golay Date: Fri, 6 Dec 2024 10:58:09 -0800 Subject: [PATCH 4/7] use aptos hosted link for install_cli.py --- .github/workflows/checks-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks-all.yml b/.github/workflows/checks-all.yml index 0050ff5dd..8fd81d269 100755 --- a/.github/workflows/checks-all.yml +++ b/.github/workflows/checks-all.yml @@ -294,7 +294,7 @@ jobs: - name: Install Aptos CLI run: | - curl -fsSL "https://github.com/andygolay/aptos-cli-install/blob/main/install_cli.py" | python3 + curl -fsSL "https://aptos.dev/scripts/install_cli.py" | python3 - name: Install Nix uses: DeterminateSystems/nix-installer-action@main From 763485cb08118576598cf8a4cac560de3e8403c4 Mon Sep 17 00:00:00 2001 From: Andy Golay Date: Fri, 6 Dec 2024 11:04:11 -0800 Subject: [PATCH 5/7] test: try with raw file hosted on github --- .github/workflows/checks-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks-all.yml b/.github/workflows/checks-all.yml index 8fd81d269..5f182fce0 100755 --- a/.github/workflows/checks-all.yml +++ b/.github/workflows/checks-all.yml @@ -294,7 +294,7 @@ jobs: - name: Install Aptos CLI run: | - curl -fsSL "https://aptos.dev/scripts/install_cli.py" | python3 + curl -fsSL "https://raw.githubusercontent.com/andygolay/aptos-cli-install/refs/heads/main/install_cli.py" | python3 - name: Install Nix uses: DeterminateSystems/nix-installer-action@main From 75468d0d480d64dfbbde03661c4882acad9f6717 Mon Sep 17 00:00:00 2001 From: Andy Golay Date: Fri, 6 Dec 2024 11:08:23 -0800 Subject: [PATCH 6/7] test: try with aptos-cli-v3.5.1 --- .github/workflows/checks-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks-all.yml b/.github/workflows/checks-all.yml index 5f182fce0..0c6dec9a6 100755 --- a/.github/workflows/checks-all.yml +++ b/.github/workflows/checks-all.yml @@ -278,7 +278,7 @@ jobs: ## any use of Move CLI requires ubuntu-24.04 and to not run on buildjet move-modules-test: - # if: github.event.label.name == 'cicd:bridge' || github.ref == 'refs/heads/main' + # if: github.event.label.name == 'cicd:bridge' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/feature/trusted-relayer' strategy: matrix: include: From d5f4df4d088b80c36eee75d7a03ddf9b4f2eeaa0 Mon Sep 17 00:00:00 2001 From: Andy Golay Date: Fri, 6 Dec 2024 11:10:29 -0800 Subject: [PATCH 7/7] update python script filename --- .github/workflows/checks-all.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/checks-all.yml b/.github/workflows/checks-all.yml index 0c6dec9a6..1467c2fe5 100755 --- a/.github/workflows/checks-all.yml +++ b/.github/workflows/checks-all.yml @@ -294,7 +294,7 @@ jobs: - name: Install Aptos CLI run: | - curl -fsSL "https://raw.githubusercontent.com/andygolay/aptos-cli-install/refs/heads/main/install_cli.py" | python3 + curl -fsSL "https://raw.githubusercontent.com/andygolay/aptos-cli-install/refs/heads/main/install_cli_v3.5.py" | python3 - name: Install Nix uses: DeterminateSystems/nix-installer-action@main