fix: forest binary reorg

terraform/forest-calibnet/main.tf

@@ -24,6 +24,7 @@ module "calibnet" {
   attach_volume         = false
   destination_addresses = var.destination_addresses
   chain                 = var.chain
+  rpc_port              = "2345"
   project               = var.project
   fw_name               = var.fw_name
   NR_LICENSE_KEY        = var.NR_LICENSE_KEY

terraform/forest-mainnet/main.tf

@@ -24,6 +24,7 @@ module "mainnet" {
   initial_filesystem_type = var.initial_filesystem_type
   volume_size             = var.volume_size
   attach_volume           = false
+  rpc_port                = "2345"
   destination_addresses   = var.destination_addresses
   chain                   = var.chain
   volume_name             = var.volume_name

terraform/lotus-mainnet/main.tf

@@ -30,6 +30,7 @@ module "lotus-mainnet" {
   fw_name                 = "lotus-mainnet-fw"
   script                  = "lotus.sh"
   forest_user             = "forest"
+  rpc_port                = "1234"
   NR_LICENSE_KEY          = var.NR_LICENSE_KEY
   NEW_RELIC_API_KEY       = var.NEW_RELIC_API_KEY
   NEW_RELIC_ACCOUNT_ID    = var.NEW_RELIC_ACCOUNT_ID

terraform/modules/daily_snapshot/main.tf

@@ -138,7 +138,7 @@ resource "digitalocean_firewall" "forest-firewall" {
 
   inbound_rule {
     protocol         = "tcp"
-    port_range       = "1234"
+    port_range       = "2345"
     source_addresses = var.source_addresses
   }
 

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

@@ -9,7 +9,7 @@ resource "digitalocean_firewall" "forest_firewall" {
 
   inbound_rule {
     protocol         = "tcp"
-    port_range       = "1234"
+    port_range       = var.rpc_port
     source_addresses = var.source_addresses
   }
 

terraform/modules/filecoin_node/forest.sh

@@ -56,7 +56,7 @@ sudo --user="${NEW_USER}" -- \
   --name=forest-"${CHAIN}" \
   --env "FOREST_GC_TRIGGER_FACTOR=1.4" \
   --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/filecoin_node/variable.tf

@@ -55,6 +55,11 @@ variable "destination_addresses" {
   type        = list(string)
 }
 
+variable "rpc_port" {
+  description = "RPC Port for nodes"
+  type        = string
+}
+
 variable "chain" {
   description = "The chain tag to apply to resources."
   type        = string