Merge branch 'develop' into devx/add-package-manager-install-instruct…

…ions
iotaledger · Nov 14, 2024 · cf323cd · cf323cd
2 parents 7de6f88 + d107243
commit cf323cd
Show file tree

Hide file tree

Showing 9 changed files with 649 additions and 70 deletions.
diff --git a/crates/iota-indexer/database_schema.svg b/crates/iota-indexer/database_schema.svg
diff --git a/crates/iota-indexer/schema.md b/crates/iota-indexer/schema.md
diff --git a/crates/iota-indexer/src/indexer_reader.rs b/crates/iota-indexer/src/indexer_reader.rs
@@ -63,7 +63,7 @@ use crate::{
     },
     schema::{
         address_metrics, checkpoints, display, epochs, events, move_call_metrics, objects,
-        objects_snapshot, transactions,
+        objects_snapshot, packages, transactions,
     },
     store::{diesel_macro::*, package_resolver::IndexerStorePackageResolver},
     types::{IndexerResult, OwnerType},
@@ -1509,10 +1509,17 @@ impl<U: R2D2Connection> IndexerReader<U> {
     }
 
     pub fn get_latest_network_metrics(&self) -> IndexerResult<NetworkMetrics> {
-        let metrics = run_query!(&self.pool, |conn| {
+        let mut metrics = run_query!(&self.pool, |conn| {
             diesel::sql_query("SELECT * FROM network_metrics;")
                 .get_result::<StoredNetworkMetrics>(conn)
         })?;
+        if metrics.total_packages == -1 {
+            // this implies that the estimate is not available in the db
+            // so we fallback to the more expensive count query
+            metrics.total_packages = run_query!(&self.pool, |conn| {
+                packages::dsl::packages.count().get_result::<i64>(conn)
+            })?;
+        }
         Ok(metrics.into())
     }
 

diff --git a/crates/iota-sdk/README.md b/crates/iota-sdk/README.md
@@ -1,4 +1,4 @@
-This crate provides the IOTA Rust SDK, containing APIs to interact with the IOTA network. Auto-generated documentation for this crate is [here](https://github.com/iotaledger/iota/iota_sdk/index.html).
+This crate provides the IOTA Rust SDK, containing APIs to interact with the IOTA network. Auto-generated documentation for this crate is [here](https://iotaledger.github.io/iota/iota_sdk/index.html).
 
 ## Getting started
 

diff --git a/docker/fullnode/docker-compose.yaml b/docker/fullnode/docker-compose.yaml
@@ -12,6 +12,7 @@ services:
     volumes:
       - ./fullnode-template.yaml:/opt/iota/config/fullnode.yaml:ro
       - ./genesis.blob:/opt/iota/config/genesis.blob:ro
+      - ./migration.blob:/opt/iota/config/migration.blob:ro
       - ./iotadb:/opt/iota/db:rw
     command: [
       "/opt/iota/bin/iota-node",