fix: forest binary reorg

archival-snapshots-generate/src/main.rs

@@ -31,16 +31,16 @@ struct Args {
 }
 
 fn main() -> anyhow::Result<()> {
-    if which::which("forest-cli").is_err() {
-        bail!("forest-cli is not installed");
+    if which::which("forest-tool").is_err() {
+        bail!("forest-tool is not installed");
     }
 
     env_logger::Builder::from_env(Env::default().default_filter_or("info")).init();
 
     let args = Args::parse();
 
     info!("Analyzing the provided snapshot file");
-    let epochs = std::process::Command::new("forest-cli")
+    let epochs = std::process::Command::new("forest-tool")
         .args([
             "archive",
             "info",

terraform/modules/daily_snapshot/main.tf

@@ -135,6 +135,12 @@ resource "digitalocean_firewall" "forest-firewall" {
     source_addresses = var.source_addresses
   }
 
+  inbound_rule {
+    protocol         = "tcp"
+    port_range       = "2345"
+    source_addresses = var.source_addresses
+  }
+
   inbound_rule {
     protocol         = "tcp"
     port_range       = "80"

terraform/modules/daily_snapshot/service/upload_filops_snapshot.sh

@@ -34,7 +34,7 @@ send_slack_alert() {
 
 COMMANDS=$(cat << HEREDOC
 set -eux
-cd forest_db/filops && forest-cli --chain $CHAIN snapshot fetch --vendor filops
+cd forest_db/filops && forest-tool snapshot fetch --chain $CHAIN --vendor filops
 
 # Get the most recently downloaded snapshot's name
 DOWNLOADED_SNAPSHOT_NAME=\$(basename \$(find . -name "filops_snapshot_$CHAIN*" -type f -print0 | xargs -r -0 ls -1 -t | head -1))

terraform/modules/daily_snapshot/service/upload_snapshot.sh

@@ -59,7 +59,7 @@ echo "Snapshot: $NEWEST_SNAPSHOT"
 # spawn a task in the background to periodically write Prometheus metrics to a file
 write_metrics &
 
-forest-cli --config config.toml --chain "$CHAIN_NAME" db clean --force
+forest-tool db destroy --config config.toml --chain "$CHAIN_NAME" --force
 forest --config config.toml --chain "$CHAIN_NAME" --import-snapshot "$NEWEST_SNAPSHOT" --halt-after-import
 forest --config config.toml --chain "$CHAIN_NAME" --no-gc --save-token=token.txt --detach
 timeout "$SYNC_TIMEOUT" forest-cli --chain "$CHAIN_NAME" sync wait
@@ -68,10 +68,10 @@ forest-cli --token=\$(cat token.txt) shutdown --force
 
 # Run full checks only for calibnet, given that it takes too long for mainnet.
 if [ "$CHAIN_NAME" = "calibnet" ]; then
-  forest-cli snapshot validate --check-network "$CHAIN_NAME" forest_db/forest_snapshot_*.forest.car.zst
+  forest-tool snapshot validate --check-network "$CHAIN_NAME" forest_db/forest_snapshot_*.forest.car.zst
 else
-  forest-cli archive info forest_db/forest_snapshot_*.forest.car.zst
-  forest-cli snapshot validate --check-links 0 --check-network "$CHAIN_NAME" --check-stateroots 5 forest_db/forest_snapshot_*.forest.car.zst
+  forest-tool archive info forest_db/forest_snapshot_*.forest.car.zst
+  forest-tool snapshot validate --check-links 0 --check-network "$CHAIN_NAME" --check-stateroots 5 forest_db/forest_snapshot_*.forest.car.zst
 fi
 
 

terraform/modules/filecoin_node/firewall.tf

@@ -13,6 +13,12 @@ resource "digitalocean_firewall" "forest_firewall" {
     source_addresses = var.source_addresses
   }
 
+  inbound_rule {
+    protocol         = "tcp"
+    port_range       = "2345"
+    source_addresses = var.source_addresses
+  }
+
   inbound_rule {
     protocol         = "tcp"
     port_range       = "80"

terraform/modules/filecoin_node/forest.sh

@@ -52,7 +52,7 @@ sudo --user="${NEW_USER}" -- \
   --network=forest \
   --name=forest-"${CHAIN}" \
   --volume=/home/"${NEW_USER}"/forest_data:/home/"${NEW_USER}"/forest_data:z \
-  --publish=1234:1234 \
+  --publish=2345:2345 \
   --publish=6116:6116 \
   --restart=always \
   ghcr.io/chainsafe/forest:latest \

terraform/modules/sync_check/service/sync_check.rb

@@ -51,8 +51,8 @@ def get_and_assert_env_variable(name)
   client.post_message "✅ Sync check for #{hostname} passed. 🌲🌳🌲🌳🌲"
 else
   client.post_message "⛔ Sync check for #{hostname} fiascoed. 🔥🌲🔥"
-  SyncCheck.new.run_forest_cli("--chain #{network} db clean --force")
-  logger.info 'DB Cleaned'
+  SyncCheck.new.run_forest_cli("db destroy --chain #{network} --force")
+  logger.info 'DB Destroyed'
 end
 client.attach_files(LOG_HEALTH, LOG_SYNC, LOG_FOREST)