Merge branch 'main' into aschran/cov2-core

Cargo.toml

@@ -503,6 +503,7 @@ toml_edit = { version = "0.19.10" }
 tonic = { version = "0.12", features = ["transport", "tls-webpki-roots"] }
 tonic-build = { version = "0.12", features = ["prost", "transport"] }
 tonic-health = "0.12"
+tonic-reflection = "0.12"
 tonic-rustls = "0.1.0"
 tower = { version = "0.4.12", features = [
     "full",

crates/sui-benchmark/src/workloads/workload.rs

@@ -47,7 +47,7 @@ impl TryFrom<u32> for ExpectedFailureType {
         match value {
             0 => {
                 let mut rng = rand::thread_rng();
-                let n = rng.gen_range(0..ExpectedFailureType::COUNT - 1);
+                let n = rng.gen_range(1..ExpectedFailureType::COUNT - 1);
                 Ok(ExpectedFailureType::iter().nth(n).unwrap())
             }
             _ => ExpectedFailureType::iter()

crates/sui-benchmark/tests/simtest.rs

@@ -912,6 +912,9 @@ mod test {
                 // having queued certs which are missing dependencies.
                 check_system_overload_at_execution: false,
                 check_system_overload_at_signing: false,
+                max_txn_age_in_queue: Duration::from_secs(10000),
+                max_transaction_manager_queue_length: 10000,
+                max_transaction_manager_per_object_queue_length: 10000,
                 ..Default::default()
             })
             .with_execution_cache_config(cache_config)
@@ -1015,7 +1018,7 @@ mod test {
                 shared_deletion_weight: 1,
                 shared_counter_hotness_factor: 50,
                 randomness_weight: 1,
-                randomized_transaction_weight: 1,
+                randomized_transaction_weight: 0,
                 num_shared_counters: Some(1),
                 use_shared_counter_max_tip: false,
                 shared_counter_max_tip: 0,

crates/sui-bridge-indexer/README.md

@@ -21,7 +21,7 @@ bridge-indexer --config-path config.yaml
 
 ```yaml
 ---
-remote_store_url: https://checkpoints.mainnet.sui.io
+remote_store_url: https://storage.googleapis/mysten-mainnet-checkpoints
 eth_rpc_url: {eth rpc url}
 sui_rpc_url: {sui rpc url}
 

crates/sui-config/src/node.rs

@@ -637,6 +637,10 @@ impl NodeConfig {
     pub fn jsonrpc_server_type(&self) -> ServerType {
         self.jsonrpc_server_type.unwrap_or(ServerType::Http)
     }
+
+    pub fn rpc(&self) -> Option<&sui_rpc_api::Config> {
+        self.rpc.as_ref()
+    }
 }
 
 #[derive(Debug, Clone, Deserialize, Serialize)]

crates/sui-data-ingestion/src/lib.rs

@@ -4,7 +4,7 @@
 mod progress_store;
 mod workers;
 
-pub use progress_store::IngestionWorkflowsProgressStore;
+pub use progress_store::DynamoDBProgressStore;
 pub use workers::{
     ArchivalConfig, ArchivalReducer, ArchivalWorker, BlobTaskConfig, BlobWorker, KVStoreTaskConfig,
     KVStoreWorker,

crates/sui-data-ingestion/src/main.rs

@@ -9,7 +9,7 @@ use std::path::PathBuf;
 use std::time::Duration;
 use sui_data_ingestion::{
     ArchivalConfig, ArchivalReducer, ArchivalWorker, BlobTaskConfig, BlobWorker,
-    IngestionWorkflowsProgressStore, KVStoreTaskConfig, KVStoreWorker,
+    DynamoDBProgressStore, KVStoreTaskConfig, KVStoreWorker,
 };
 use sui_data_ingestion_core::{DataIngestionMetrics, ReaderOptions};
 use sui_data_ingestion_core::{IndexerExecutor, WorkerPool};
@@ -119,27 +119,12 @@ async fn main() -> Result<()> {
     mysten_metrics::init_metrics(&registry);
     let metrics = DataIngestionMetrics::new(&registry);
 
-    let mut bigtable_client = None;
-    for task in &config.tasks {
-        if let Task::BigTableKV(kv_config) = &task.task {
-            bigtable_client = Some(
-                BigTableClient::new_remote(
-                    kv_config.instance_id.clone(),
-                    false,
-                    Some(Duration::from_secs(kv_config.timeout_secs as u64)),
-                )
-                .await?,
-            );
-        }
-    }
-
-    let progress_store = IngestionWorkflowsProgressStore::new(
+    let progress_store = DynamoDBProgressStore::new(
         &config.progress_store.aws_access_key_id,
         &config.progress_store.aws_secret_access_key,
         config.progress_store.aws_region,
         config.progress_store.table_name,
         config.is_backfill,
-        bigtable_client,
     )
     .await;
     let mut executor = IndexerExecutor::new(progress_store, config.tasks.len(), metrics);