[upgrade] Migrate to CL@v0.0.58 (#141)

* add buffer pool

* update size

Author: patrick-ogrady

Cargo.lock

@@ -10,18 +10,18 @@ resolver = "2"
 [workspace.dependencies]
 alto-client = { version = "0.0.13", path = "client" }
 alto-types = { version = "0.0.13", path = "types" }
-commonware-broadcast = { version = "0.0.57" }
-commonware-codec = { version = "0.0.57" }
-commonware-consensus = { version = "0.0.57" }
-commonware-cryptography = { version = "0.0.57" }
-commonware-deployer = { version = "0.0.57", default-features = false }
-commonware-macros = { version = "0.0.57" }
-commonware-p2p = { version = "0.0.57" }
-commonware-resolver = { version = "0.0.57" }
-commonware-runtime = { version = "0.0.57" }
-commonware-storage = { version = "0.0.57" }
-commonware-stream = { version = "0.0.57" }
-commonware-utils = { version = "0.0.57" }
+commonware-broadcast = { version = "0.0.58" }
+commonware-codec = { version = "0.0.58" }
+commonware-consensus = { version = "0.0.58" }
+commonware-cryptography = { version = "0.0.58" }
+commonware-deployer = { version = "0.0.58", default-features = false }
+commonware-macros = { version = "0.0.58" }
+commonware-p2p = { version = "0.0.58" }
+commonware-resolver = { version = "0.0.58" }
+commonware-runtime = { version = "0.0.58" }
+commonware-storage = { version = "0.0.58" }
+commonware-stream = { version = "0.0.58" }
+commonware-utils = { version = "0.0.58" }
 thiserror = "2.0.12"
 bytes = "1.7.1"
 rand = "0.8.5"

Cargo.toml

@@ -17,12 +17,13 @@ use commonware_cryptography::{
     Signer,
 };
 use commonware_p2p::{Blocker, Receiver, Sender};
-use commonware_runtime::{Clock, Handle, Metrics, Spawner, Storage};
+use commonware_runtime::{buffer::PoolRef, Clock, Handle, Metrics, Spawner, Storage};
+use commonware_utils::{NZUsize, NZU64};
 use futures::future::try_join_all;
 use governor::clock::Clock as GClock;
 use governor::Quota;
 use rand::{CryptoRng, Rng};
-use std::time::Duration;
+use std::{num::NonZero, time::Duration};
 use tracing::{error, warn};
 
 /// Reporter type for [threshold_simplex::Engine].
@@ -32,14 +33,16 @@ type Reporter<E, I> =
 /// To better support peers near tip during network instability, we multiply
 /// the consensus activity timeout by this factor.
 const SYNCER_ACTIVITY_TIMEOUT_MULTIPLIER: u64 = 10;
-const PRUNABLE_ITEMS_PER_SECTION: u64 = 4_096;
-const IMMUTABLE_ITEMS_PER_SECTION: u64 = 262_144;
+const PRUNABLE_ITEMS_PER_SECTION: NonZero<u64> = NZU64!(4_096);
+const IMMUTABLE_ITEMS_PER_SECTION: NonZero<u64> = NZU64!(262_144);
 const FREEZER_TABLE_RESIZE_FREQUENCY: u8 = 4;
 const FREEZER_TABLE_RESIZE_CHUNK_SIZE: u32 = 2u32.pow(16); // 3MB
 const FREEZER_JOURNAL_TARGET_SIZE: u64 = 1024 * 1024 * 1024; // 1GB
 const FREEZER_JOURNAL_COMPRESSION: Option<u8> = Some(3);
-const REPLAY_BUFFER: usize = 8 * 1024 * 1024; // 8MB
-const WRITE_BUFFER: usize = 1024 * 1024; // 1MB
+const REPLAY_BUFFER: NonZero<usize> = NZUsize!(8 * 1024 * 1024); // 8MB
+const WRITE_BUFFER: NonZero<usize> = NZUsize!(1024 * 1024); // 1MB
+const BUFFER_POOL_PAGE_SIZE: NonZero<usize> = NZUsize!(4_096); // 4KB
+const BUFFER_POOL_CAPACITY: NonZero<usize> = NZUsize!(8_192); // 32MB
 const MAX_REPAIR: u64 = 20;
 
 /// Configuration for the [Engine].
@@ -130,6 +133,9 @@ impl<
             },
         );
 
+        // Create the buffer pool
+        let buffer_pool = PoolRef::new(BUFFER_POOL_PAGE_SIZE, BUFFER_POOL_CAPACITY);
+
         // Create marshal
         let (marshal, marshal_mailbox): (_, marshal::Mailbox<MinSig, Block>) =
             marshal::Actor::init(
@@ -152,6 +158,7 @@ impl<
                     freezer_table_resize_chunk_size: FREEZER_TABLE_RESIZE_CHUNK_SIZE,
                     freezer_journal_target_size: FREEZER_JOURNAL_TARGET_SIZE,
                     freezer_journal_compression: FREEZER_JOURNAL_COMPRESSION,
+                    freezer_journal_buffer_pool: buffer_pool.clone(),
                     replay_buffer: REPLAY_BUFFER,
                     write_buffer: WRITE_BUFFER,
                     codec_config: (),
@@ -198,6 +205,7 @@ impl<
                 replay_buffer: REPLAY_BUFFER,
                 write_buffer: WRITE_BUFFER,
                 blocker: cfg.blocker,
+                buffer_pool,
             },
         );