start validator fullnode

[feature] start VFN

Author: areshand

aptos-node/src/storage.rs

@@ -11,7 +11,9 @@ use aptos_indexer_grpc_table_info::internal_indexer_db_service::InternalIndexerD
 use aptos_logger::{debug, info};
 use aptos_storage_interface::{DbReader, DbReaderWriter};
 use aptos_types::{
-    ledger_info::LedgerInfoWithSignatures, transaction::Version, waypoint::Waypoint,
+    ledger_info::{set_waypoint_version, LedgerInfoWithSignatures},
+    transaction::Version,
+    waypoint::Waypoint,
 };
 use aptos_vm::aptos_vm::AptosVMBlockExecutor;
 use either::Either;
@@ -195,10 +197,12 @@ pub fn initialize_database_and_checkpoints(
         instant.elapsed().as_millis()
     );
 
+    let waypoint = node_config.base.waypoint.waypoint();
+    set_waypoint_version(waypoint.version());
     Ok((
         db_rw,
         backup_service,
-        node_config.base.waypoint.genesis_waypoint(),
+        waypoint,
         indexer_db_opt,
         update_receiver,
     ))

movement-migration/validation-tool/src/checks/api.rs

@@ -1,8 +1,9 @@
 // Copyright (c) Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::checks::api::active_feature_flags::GlobalFeatureCheck;
-use crate::types::api::MovementAptosRestClient;
+use crate::{
+    checks::api::active_feature_flags::GlobalFeatureCheck, types::api::MovementAptosRestClient,
+};
 use clap::Parser;
 
 mod active_feature_flags;

movement-migration/validation-tool/src/checks/api/active_feature_flags.rs

@@ -1,11 +1,9 @@
 // Copyright (c) Aptos Foundation
 // SPDX-License-Identifier: Apache-2.0
 
-use crate::checks::error::ValidationError;
-use crate::types::api::MovementAptosRestClient;
+use crate::{checks::error::ValidationError, types::api::MovementAptosRestClient};
 use aptos_rest_client::aptos_api_types::ViewFunction;
-use move_core_types::identifier::Identifier;
-use move_core_types::language_storage::ModuleId;
+use move_core_types::{identifier::Identifier, language_storage::ModuleId};
 use std::str::FromStr;
 use tracing::debug;
 

state-sync/inter-component/event-notifications/src/lib.rs

@@ -13,6 +13,7 @@ use aptos_storage_interface::{
 use aptos_types::{
     contract_event::ContractEvent,
     event::EventKey,
+    ledger_info::get_waypoint_version,
     on_chain_config::{
         ConfigurationResource, OnChainConfig, OnChainConfigPayload, OnChainConfigProvider,
     },
@@ -283,41 +284,51 @@ impl EventSubscriptionService {
         &self,
         version: Version,
     ) -> Result<OnChainConfigPayload<DbBackedOnChainConfig>, Error> {
-        let db_state_view = &self
-            .storage
-            .read()
-            .reader
-            .state_view_at_version(Some(version))
+        // Check if the requested version is below the minimum available version (waypoint)
+        let reader = self.storage.read().reader.clone();
+        let min_available_version = reader
+            .get_first_txn_version()
+            .map_err(|e| {
+                Error::UnexpectedErrorEncountered(format!(
+                    "Failed to get first transaction version: {:?}",
+                    e
+                ))
+            })?
+            .unwrap_or(0);
+        let effective_version = if version < min_available_version {
+            min_available_version
+        } else {
+            version
+        };
+
+        let db_state_view = &reader
+            .state_view_at_version(Some(effective_version))
             .map_err(|error| {
                 Error::UnexpectedErrorEncountered(format!(
                     "Failed to create account state view {:?}",
                     error
                 ))
             })?;
 
-        let mut epoch = ConfigurationResource::fetch_config(&db_state_view)
+        let mut epoch = ConfigurationResource::fetch_config(db_state_view)
             .ok_or_else(|| {
                 Error::UnexpectedErrorEncountered("Configuration resource does not exist!".into())
             })?
             .epoch();
 
-        let db_epoch_state = self
-            .storage
-            .read()
-            .reader
-            .get_latest_epoch_state()
-            .map_err(|_e| {
-                Error::UnexpectedErrorEncountered("Cannot read epoch state from DB".into())
-            })?;
+        let db_epoch_state = reader.get_latest_epoch_state().map_err(|_e| {
+            Error::UnexpectedErrorEncountered("Cannot read epoch state from DB".into())
+        })?;
         // TODO(l1-migration): update once config fixed
         if epoch < db_epoch_state.epoch {
             epoch = db_epoch_state.epoch;
         }
 
         // Return the new on-chain config payload (containing all found configs at this version).
+        // Use the effective version for the DbBackedOnChainConfig
         Ok(OnChainConfigPayload::new(
             epoch,
-            DbBackedOnChainConfig::new(self.storage.read().reader.clone(), version),
+            DbBackedOnChainConfig::new(reader, effective_version),
         ))
     }
 }
@@ -404,7 +415,11 @@ pub struct DbBackedOnChainConfig {
 }
 
 impl DbBackedOnChainConfig {
-    pub fn new(reader: Arc<dyn DbReader>, version: Version) -> Self {
+    pub fn new(reader: Arc<dyn DbReader>, mut version: Version) -> Self {
+        let waypoint_version = get_waypoint_version().expect("Waypoint version is missing");
+        if version < waypoint_version {
+            version = waypoint_version as Version;
+        }
         Self { reader, version }
     }
 }

tools/l1-migration/data/mainnet/genesis_waypoint.txt

@@ -0,0 +1 @@
+0:fb098815125443b6337c61b81aade770e7dcf69d93e8a636365a664939f100a3

tools/l1-migration/local-node-configs/validator_fullnode.yaml

@@ -0,0 +1,33 @@
+base:
+  data_dir: /Users/bowu/data/.maptos # update to your path
+  role: full_node
+  waypoint:
+    from_file: /Users/bowu/data/.maptos/mainnet/waypoint.txt # update to your path
+
+execution:
+  genesis_file_location: /Users/bowu/data/.maptos/mainnet/genesis.blob # update to your path
+  genesis_waypoint: 
+    from_file: /Users/bowu/data/.maptos/mainnet/genesis_waypoint.txt
+
+storage:
+  rocksdb_configs:
+    enable_storage_sharding: false
+
+full_node_networks:
+- network_id:
+    private: "vfn"
+  listen_address: "/ip4/0.0.0.0/tcp/6181"
+  seeds:
+    00000000000000000000000000000000d58bc7bb154b38039bc9096ce04e1237:
+      addresses:
+      - "/ip4/100.112.207.119/tcp/6181/noise-ik/f0274c2774519281a8332d0bb9d8101bd58bc7bb154b38039bc9096ce04e1237/handshake/0"
+      role: "Validator"
+
+api:
+  enabled: true
+  address: 0.0.0.0:8080  # Different port from validator
+
+state_sync:
+  state_sync_driver:
+    bootstrapping_mode: DownloadLatestStates
+    continuous_syncing_mode: ApplyTransactionOutputs

tools/l1-migration/local-node-configs/validator_node.yaml

@@ -31,6 +31,14 @@ validator_network:
     type: from_file
     path: /Users/bowu/data/.maptos/operator_keys/mainnet/validator-identity.yaml # update to your path
   listen_address: /ip4/0.0.0.0/tcp/6180
+full_node_networks:
+  - network_id:
+      private: "vfn"
+    listen_address: "/ip4/0.0.0.0/tcp/6181"
+    identity:
+      type: "from_config"
+      key: "b0f405a3e75516763c43a2ae1d70423699f34cd68fa9f8c6bb2d67aa87d0af69"
+      peer_id: "00000000000000000000000000000000d58bc7bb154b38039bc9096ce04e1237"
 api:
   enabled: true
   address: 0.0.0.0:8080

tools/l1-migration/src/main.rs

@@ -1,5 +1,4 @@
-use anyhow::{anyhow, Result};
-use aptos_crypto::x25519;
+use anyhow::Result;
 use clap::Parser;
 use l1_migration::extract_genesis_and_waypoint;
 use std::path::PathBuf;

tools/l1-migration/src/utils.rs

@@ -1,21 +1,9 @@
 use anyhow::Result;
-use aptos_config::config::{
-    Peer, PeerRole, PeerSet, RocksdbConfigs, StorageDirPaths, NO_OP_STORAGE_PRUNER_CONFIG,
-};
-use aptos_crypto::{x25519, ValidCryptoMaterialStringExt};
+use aptos_config::config::{RocksdbConfigs, StorageDirPaths, NO_OP_STORAGE_PRUNER_CONFIG};
 use aptos_db::AptosDB;
 use aptos_storage_interface::DbReader;
-use aptos_types::{
-    account_address::from_identity_public_key, network_address::NetworkAddress,
-    transaction::Transaction, waypoint::Waypoint, PeerId,
-};
-use serde_yaml;
-use std::{
-    collections::{HashMap, HashSet},
-    fs,
-    path::Path,
-    str::FromStr,
-};
+use aptos_types::{transaction::Transaction, waypoint::Waypoint};
+use std::{fs, path::Path};
 
 /// Extract genesis transaction and waypoint from an Aptos database
 pub fn extract_genesis_and_waypoint(db_path: &str, output_dir: &str) -> Result<()> {
@@ -51,11 +39,15 @@ pub fn extract_genesis_and_waypoint(db_path: &str, output_dir: &str) -> Result<(
     // Extract genesis transaction
     extract_genesis_transaction(&db, latest_ver, output_dir)?;
 
+    // Extract genesis waypoint
+    extract_genesis_waypoint(&db, latest_ver, output_dir)?;
+
     // Extract waypoint
     extract_waypoint(&db, output_dir)?;
 
     println!("✓ Genesis extraction completed successfully!");
     println!("  - genesis.blob: Contains the BCS-serialized genesis transaction");
+    println!("  - genesis_waypoint.txt: Contains the genesis waypoint for bootstrapping");
     println!("  - waypoint.txt: Contains the initial waypoint for bootstrapping");
 
     Ok(())
@@ -82,6 +74,30 @@ fn extract_genesis_transaction(db: &AptosDB, latest_ver: u64, output_dir: &str)
     Ok(())
 }
 
+/// Extract the genesis waypoint from the database at version 0
+fn extract_genesis_waypoint(db: &AptosDB, _latest_ver: u64, output_dir: &str) -> Result<()> {
+    println!("Extracting genesis waypoint (version 0)...");
+
+    // Get the epoch ending ledger info for version 0 (genesis)
+    // This should always exist for a properly initialized database
+    let genesis_ledger_info_with_sigs = db
+        .get_epoch_ending_ledger_info(0)
+        .expect("genesis waypoint should exist");
+
+    let genesis_ledger_info = genesis_ledger_info_with_sigs.ledger_info();
+
+    // Generate genesis waypoint using the genesis ledger info
+    let genesis_waypoint = Waypoint::new_any(genesis_ledger_info);
+
+    // Write genesis_waypoint.txt
+    let genesis_waypoint_path = format!("{}/genesis_waypoint.txt", output_dir);
+    fs::write(&genesis_waypoint_path, genesis_waypoint.to_string())?;
+    println!("Genesis waypoint written to: {}", genesis_waypoint_path);
+    println!("Genesis waypoint: {}", genesis_waypoint);
+
+    Ok(())
+}
+
 /// Extract the waypoint from the database using proper waypoint conversion
 fn extract_waypoint(db: &AptosDB, output_dir: &str) -> Result<()> {
     // Get the ledger info to extract waypoint

types/src/ledger_info.rs

@@ -28,10 +28,23 @@ use std::{
     ops::{Deref, DerefMut},
     sync::{
         atomic::{AtomicBool, Ordering},
-        Arc,
+        Arc, OnceLock,
     },
 };
 
+/// Global waypoint version storage for bypassing verification of historical data
+static WAYPOINT_VERSION: OnceLock<Version> = OnceLock::new();
+
+/// Initialize the waypoint version (should be called once during node startup)
+pub fn set_waypoint_version(version: Version) {
+    let _ = WAYPOINT_VERSION.set(version);
+}
+
+/// Get the waypoint version if it has been set
+pub fn get_waypoint_version() -> Option<Version> {
+    WAYPOINT_VERSION.get().copied()
+}
+
 /// This structure serves a dual purpose.
 ///
 /// First, if this structure is signed by 2f+1 validators it signifies the state of the ledger at
@@ -305,6 +318,13 @@ impl LedgerInfoWithV0 {
         &self,
         validator: &ValidatorVerifier,
     ) -> ::std::result::Result<(), VerifyError> {
+        // Check if this LedgerInfo is before the waypoint version
+        if let Some(waypoint_version) = get_waypoint_version() {
+            if self.ledger_info().version() <= waypoint_version {
+                return Ok(());
+            }
+        }
+
         validator.verify_multi_signatures(self.ledger_info(), &self.signatures)
     }