Merge branch 'main' into blacksmith_runners

Author: Mohiiit

configs/args/config.json

@@ -35,6 +35,7 @@
     "l2_sync_disabled": false,
     "unsafe_starting_block": null,
     "disable_tries": false,
+    "snap_sync": false,
     "gateway_key": null,
     "gateway_url": null,
     "warp_update_port_rpc": 9943,

configs/presets/mainnet.yaml

@@ -1,7 +1,7 @@
 config_version: 1
 chain_name: "Starknet Mainnet"
 chain_id: "SN_MAIN"
-feeder_gateway_url: "https://alpha-mainnet.starknet.io/feeder_gateway/"
+feeder_gateway_url: "https://feeder.alpha-mainnet.starknet.io/feeder_gateway/"
 gateway_url: "https://alpha-mainnet.starknet.io/gateway/"
 native_fee_token_address: "0x04718f5a0fc34cc1af16a1cdee98ffb20c31f5cd61d6ab07201858f4287c938d"
 parent_fee_token_address: "0x049d36570d4e46f48e99674bd3fcc84644ddd6b96f7c741b1562b82f9e004dc7"

madara/crates/client/db/src/lib.rs

@@ -733,7 +733,7 @@ impl<D: MadaraStorage> MadaraBackendWriter<D> {
     /// Write a state diff to the global tries.
     /// Returns the new state root.
     ///
-    /// **Warning**: The caller must ensure no block parts is saved on top of an existing confirmed block.
+    /// **Warning**: The caller must ensure no block parts are saved on top of an existing confirmed block.
     /// You are only allowed to write block parts past the latest confirmed block.
     pub fn apply_to_global_trie<'a>(
         &self,
@@ -801,6 +801,9 @@ impl<D: MadaraStorageRead> MadaraBackend<D> {
     pub fn get_latest_applied_trie_update(&self) -> Result<Option<u64>> {
         self.db.get_latest_applied_trie_update()
     }
+    pub fn get_snap_sync_latest_block(&self) -> Result<Option<u64>> {
+        self.db.get_snap_sync_latest_block()
+    }
 }
 // Delegate these db reads/writes. These are related to specific services, and are not specific to a block view / the chain tip writer handle.
 impl<D: MadaraStorageWrite> MadaraBackend<D> {
@@ -828,6 +831,9 @@ impl<D: MadaraStorageWrite> MadaraBackend<D> {
     pub fn write_latest_applied_trie_update(&self, block_n: &Option<u64>) -> Result<()> {
         self.db.write_latest_applied_trie_update(block_n)
     }
+    pub fn write_snap_sync_latest_block(&self, block_n: &Option<u64>) -> Result<()> {
+        self.db.write_snap_sync_latest_block(block_n)
+    }
 
     /// Revert the blockchain to a specific block hash.
     pub fn revert_to(&self, new_tip_block_hash: &Felt) -> Result<(u64, Felt)> {

madara/crates/client/db/src/rocksdb/update_global_trie/classes.rs renamed to madara/crates/client/db/src/rocksdb/global_trie/classes.rs

@@ -47,7 +47,7 @@ pub fn class_trie_root(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::{rocksdb::update_global_trie::tests::setup_test_backend, MadaraBackend};
+    use crate::{rocksdb::global_trie::tests::setup_test_backend, MadaraBackend};
     use rstest::*;
     use std::sync::Arc;
 

madara/crates/client/db/src/rocksdb/update_global_trie/contracts.rs renamed to madara/crates/client/db/src/rocksdb/global_trie/contracts.rs

@@ -136,7 +136,7 @@ fn contract_state_leaf_hash(
 #[cfg(test)]
 mod contract_trie_root_tests {
     use super::*;
-    use crate::{rocksdb::update_global_trie::tests::setup_test_backend, MadaraBackend};
+    use crate::{rocksdb::global_trie::tests::setup_test_backend, MadaraBackend};
     use mp_chain_config::ChainConfig;
     use rstest::*;
     use std::sync::Arc;

madara/crates/client/db/src/rocksdb/update_global_trie/mod.rs renamed to madara/crates/client/db/src/rocksdb/global_trie/mod.rs

@@ -4,6 +4,7 @@ use starknet_types_core::{
     felt::Felt,
     hash::{Poseidon, StarkHash},
 };
+use crate::rocksdb::trie::WrappedBonsaiError;
 
 mod classes;
 mod contracts;
@@ -57,6 +58,18 @@ fn calculate_state_root(contracts_trie_root: Felt, classes_trie_root: Felt) -> F
     }
 }
 
+pub fn get_state_root(backend: &RocksDBStorage) ->  Result<Felt> {
+    let contract_trie = backend.contract_trie();
+    let contract_trie_root_hash = contract_trie.root_hash(bonsai_identifier::CONTRACT).map_err(WrappedBonsaiError)?;
+
+    let class_trie = backend.class_trie();
+    let class_trie_root_hash = class_trie.root_hash(bonsai_identifier::CLASS).map_err(WrappedBonsaiError)?;
+
+    let state_root = calculate_state_root(contract_trie_root_hash, class_trie_root_hash);
+
+    Ok(state_root)
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;

madara/crates/client/db/src/rocksdb/meta.rs

@@ -16,6 +16,7 @@ const META_CONFIRMED_ON_L1_TIP_KEY: &[u8] = b"CONFIRMED_ON_L1_TIP";
 const META_CHAIN_TIP_KEY: &[u8] = b"CHAIN_TIP";
 const META_CHAIN_INFO_KEY: &[u8] = b"CHAIN_INFO";
 const META_LATEST_APPLIED_TRIE_UPDATE: &[u8] = b"LATEST_APPLIED_TRIE_UPDATE";
+const META_SNAP_SYNC_LATEST_BLOCK: &[u8] = b"SNAP_SYNC_LATEST_BLOCK";
 
 #[derive(serde::Deserialize, serde::Serialize)]
 pub enum StoredChainTipWithoutContent {
@@ -231,4 +232,39 @@ impl RocksDBStorageInner {
         }
         Ok(())
     }
+
+    /// Get the latest block number where snap sync computed the trie.
+    /// Returns None if snap sync was never used.
+    #[tracing::instrument(skip(self))]
+    pub(super) fn get_snap_sync_latest_block(&self) -> Result<Option<u64>> {
+        let Some(res) = self.db.get_pinned_cf(&self.get_column(META_COLUMN), META_SNAP_SYNC_LATEST_BLOCK)? else {
+            tracing::debug!("📖 Reading snap_sync_latest_block: None (snap sync never used)");
+            return Ok(None);
+        };
+        let block_n = super::deserialize(&res)?;
+        tracing::debug!("📖 Reading snap_sync_latest_block: Some({})", block_n);
+        Ok(Some(block_n))
+    }
+
+    /// Set the latest block number where snap sync computed the trie.
+    #[tracing::instrument(skip(self))]
+    pub(super) fn write_snap_sync_latest_block(&self, block_n: &Option<u64>) -> Result<()> {
+        if let Some(block_n) = block_n {
+            tracing::debug!("✍️  Setting snap_sync_latest_block to: {}", block_n);
+            self.db.put_cf_opt(
+                &self.get_column(META_COLUMN),
+                META_SNAP_SYNC_LATEST_BLOCK,
+                super::serialize_to_smallvec::<[u8; 128]>(block_n)?,
+                &self.writeopts,
+            )?;
+        } else {
+            tracing::debug!("🗑️  Clearing snap_sync_latest_block (set to None)");
+            self.db.delete_cf_opt(
+                &self.get_column(META_COLUMN),
+                META_SNAP_SYNC_LATEST_BLOCK,
+                &self.writeopts,
+            )?;
+        }
+        Ok(())
+    }
 }

madara/crates/client/db/src/rocksdb/mod.rs

@@ -8,7 +8,8 @@ use crate::{
         metrics::DbMetrics,
         options::rocksdb_global_options,
         snapshots::Snapshots,
-        update_global_trie::apply_to_global_trie,
+        global_trie::apply_to_global_trie,
+        global_trie::get_state_root
     },
     storage::{
         ClassInfoWithBlockN, CompiledSierraWithBlockN, DevnetPredeployedKeys, EventFilter, MadaraStorageRead,
@@ -47,7 +48,7 @@ mod state;
 // TODO: remove this pub. this is temporary until get_storage_proof is properly abstracted.
 pub mod trie;
 // TODO: remove this pub. this is temporary until get_storage_proof is properly abstracted.
-pub mod update_global_trie;
+pub mod global_trie;
 
 type WriteBatchWithTransaction = rocksdb::WriteBatchWithTransaction<false>;
 type DB = DBWithThreadMode<MultiThreaded>;
@@ -319,6 +320,9 @@ impl MadaraStorageRead for RocksDBStorage {
     fn get_latest_applied_trie_update(&self) -> Result<Option<u64>> {
         self.inner.get_latest_applied_trie_update().context("Getting latest applied trie update info from db")
     }
+    fn get_snap_sync_latest_block(&self) -> Result<Option<u64>> {
+        self.inner.get_snap_sync_latest_block().context("Getting snap sync latest block from db")
+    }
 
     // L1 to L2 messages
 
@@ -452,6 +456,10 @@ impl MadaraStorageWrite for RocksDBStorage {
         tracing::debug!("Write latest applied trie update block_n={block_n:?}");
         self.inner.write_latest_applied_trie_update(block_n).context("Writing latest applied trie update block_n")
     }
+    fn write_snap_sync_latest_block(&self, block_n: &Option<u64>) -> Result<()> {
+        tracing::debug!("Write snap sync latest block block_n={block_n:?}");
+        self.inner.write_snap_sync_latest_block(block_n).context("Writing snap sync latest block")
+    }
 
     fn remove_mempool_transactions(&self, tx_hashes: impl IntoIterator<Item = Felt>) -> Result<()> {
         tracing::debug!("Remove mempool transactions");
@@ -465,6 +473,10 @@ impl MadaraStorageWrite for RocksDBStorage {
             .with_context(|| format!("Writing mempool transaction from db for tx_hash={tx_hash:#x}"))
     }
 
+    fn get_state_root_hash(&self) -> Result<Felt> {
+        get_state_root(self)
+    }
+
     fn apply_to_global_trie<'a>(
         &self,
         start_block_n: u64,

madara/crates/client/db/src/storage.rs

@@ -130,6 +130,7 @@ pub trait MadaraStorageRead: Send + Sync + 'static {
     fn get_l1_messaging_sync_tip(&self) -> Result<Option<u64>>;
     fn get_stored_chain_info(&self) -> Result<Option<StoredChainInfo>>;
     fn get_latest_applied_trie_update(&self) -> Result<Option<u64>>;
+    fn get_snap_sync_latest_block(&self) -> Result<Option<u64>>;
 
     // L1 to L2 messages
 
@@ -165,6 +166,7 @@ pub trait MadaraStorageWrite: Send + Sync + 'static {
     fn write_devnet_predeployed_keys(&self, devnet_keys: &DevnetPredeployedKeys) -> Result<()>;
     fn write_chain_info(&self, info: &StoredChainInfo) -> Result<()>;
     fn write_latest_applied_trie_update(&self, block_n: &Option<u64>) -> Result<()>;
+    fn write_snap_sync_latest_block(&self, block_n: &Option<u64>) -> Result<()>;
 
     fn remove_mempool_transactions(&self, tx_hashes: impl IntoIterator<Item = Felt>) -> Result<()>;
     fn write_mempool_transaction(&self, tx: &ValidatedTransaction) -> Result<()>;
@@ -185,6 +187,9 @@ pub trait MadaraStorageWrite: Send + Sync + 'static {
     /// Remove all blocks in the database from this block_n inclusive. This includes partially imported blocks as well.
     fn remove_all_blocks_starting_from(&self, starting_from_block_n: u64) -> Result<()>;
 
+    /// Fetches the latest global state root.
+    fn get_state_root_hash(&self) -> Result<Felt>;
+
     /// Revert the blockchain state to a specific block hash.
     fn revert_to(&self, new_tip_block_hash: &Felt) -> Result<(u64, Felt)>;
 }

madara/crates/client/db/src/view/block_preconfirmed.rs

@@ -3,9 +3,7 @@ use crate::{
     prelude::*,
     rocksdb::RocksDBStorage,
 };
-use mp_block::{
-    header::PreconfirmedHeader, FullBlockWithoutCommitments, MadaraPreconfirmedBlockInfo, TransactionWithReceipt,
-};
+use mp_block::{header::PreconfirmedHeader, FullBlockWithoutCommitments, MadaraPreconfirmedBlockInfo, TransactionWithReceipt};
 use mp_class::ConvertedClass;
 use mp_receipt::EventWithTransactionHash;
 use mp_state_update::{