update setup.sh

Author: 0xmovses

rollup/src/main.rs

@@ -4,10 +4,14 @@ use aptos_infallible::RwLock;
 use aptos_node::network;
 use aptos_storage_interface::{DbReader, DbReaderWriter, DbWriter};
 use aptos_temppath::TempPath;
-use aptos_types::on_chain_config::{
-	ApprovedExecutionHashes, ConfigID, OnChainConfig, OnChainConsensusConfig, ValidatorSet, Version,
+use aptos_types::{
+	chain_id::ChainId,
+	on_chain_config::{
+		ApprovedExecutionHashes, ConfigID, OnChainConfig, OnChainConsensusConfig, ValidatorSet,
+		Version,
+	},
+	waypoint::Waypoint,
 };
-use aptos_types::{chain_id::ChainId, waypoint::Waypoint};
 use log::info;
 use std::sync::Arc;
 /// State sync will panic if the value of any config in this registry is uninitialized
@@ -26,13 +30,9 @@ impl DbWriter for MockDatabase {}
 
 fn main() {
 	env_logger::init();
-	let temp_path = TempPath::new();
-
 	let mut node_config = NodeConfig::load_from_path("rollup/test_data/validator.yaml")
 		.expect("Failed to load node config");
 	info!("Node config: {:?}", node_config);
-	node_config.set_data_dir(temp_path.path().to_path_buf());
-	info!("node config data dir set");
 	node_config.base.waypoint = WaypointConfig::FromConfig(Waypoint::default());
 	info!("way point set");
 	// Create an event subscription service

rollup/test_data/validator.yaml

@@ -16,7 +16,7 @@ consensus:
       from_file:
         waypoint:
           from_file: waypoint.txt
-        identity_blob_path: validator-identity.yaml
+        identity_blob_path: ../test_data/validator-identity.yaml
 
 execution:
   genesis_file_location: "genesis.blob"
@@ -26,7 +26,7 @@ validator_network:
   mutual_authentication: true
   identity:
     type: "from_file"
-    path: validator-identity.yaml
+    path: ../test_data/validator-identity.yaml
 
 full_node_networks:
   - network_id:
@@ -39,4 +39,4 @@ full_node_networks:
 
 api:
   enabled: true
-  address: "0.0.0.0:8080"
+  address: "0.0.0.0:8080"

scripts/setup.sh

@@ -1,17 +1,51 @@
 #!/bin/bash
 
-# Specify the directory path
-directory="/opt/aptos/data"
+# Specify the directory paths
+data_dir="/opt/aptos/data"
+genesis_dir="/opt/aptos/genesis"
 
-# Check if the directory exists
-if [ ! -d "$directory" ]; then
-  # Create the directory if it doesn't exist
-  if mkdir -p "$directory" 2>/dev/null; then
-    echo "Directory '$directory' created."
-  else
-    echo "Failed to create directory '$directory'. Please check permissions and try again with appropriate privileges (e.g., using sudo)."
+# Check if the data directory exists
+if [ ! -d "$data_dir" ]; then
+    # Create the data directory if it doesn't exist
+    if mkdir -p "$data_dir" 2>/dev/null; then
+        echo "Directory '$data_dir' created."
+    else
+        echo "Failed to create directory '$data_dir'. Please check permissions and try again with appropriate privileges (e.g., using sudo)."
+        exit 1
+    fi
+else
+    echo "Directory '$data_dir' already exists."
+fi
+
+# Check if the genesis directory exists
+if [ ! -d "$genesis_dir" ]; then
+    # Create the genesis directory if it doesn't exist
+    if mkdir -p "$genesis_dir" 2>/dev/null; then
+        echo "Directory '$genesis_dir' created."
+    else
+        echo "Failed to create directory '$genesis_dir'. Please check permissions and try again with appropriate privileges (e.g., using sudo)."
+        exit 1
+    fi
+else
+    echo "Directory '$genesis_dir' already exists."
+fi
+
+# Download the genesis.blob file
+echo "Downloading genesis.blob..."
+curl -s https://devnet.aptoslabs.com/genesis.blob -o "$genesis_dir/genesis.blob"
+if [ $? -eq 0 ]; then
+    echo "genesis.blob downloaded successfully."
+else
+    echo "Failed to download genesis.blob. Please check your internet connection and try again."
     exit 1
-  fi
+fi
+
+# Download the waypoint.txt file
+echo "Downloading waypoint.txt..."
+curl -s https://devnet.aptoslabs.com/waypoint.txt -o "$genesis_dir/waypoint.txt"
+if [ $? -eq 0 ]; then
+    echo "waypoint.txt downloaded successfully."
 else
-  echo "Directory '$directory' already exists."
-fi
+    echo "Failed to download waypoint.txt. Please check your internet connection and try again."
+    exit 1
+fi