Merge branch 'master' into feature/consensus/sync

broxus · Jul 31, 2024 · 4659ec9 · 4659ec9
2 parents 11636b8 + 975ee1b
commit 4659ec9
Show file tree

Hide file tree

Showing 17 changed files with 866 additions and 405 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -8,11 +8,10 @@ on:
     branches:
       - master
     paths:
-      - 'Cargo.toml'
-      - 'Cargo.lock'
+      - "Cargo.toml"
+      - "Cargo.lock"
       - "**.rs"
 jobs:
-
   # test:
   #   name: Test Suite
   #   runs-on: ubuntu-latest
@@ -55,6 +54,18 @@ jobs:
         with:
           command: fmt
           args: --all -- --check
+  metrics:
+    name: Metrics
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - name: check dashboard
+        run: python scripts/metrics_check.py
 
   # clippy:
   #   name: Clippy

diff --git a/Cargo.toml b/Cargo.toml
@@ -55,7 +55,7 @@ libc = "0.2"
 metrics = "0.23"
 metrics-exporter-prometheus = "0.15"
 moka = { version = "0.12", features = ["sync"] }
-parking_lot = "0.12.1"
+parking_lot = { version = "0.12.1" }
 parking_lot_core = "0.9.9"
 pin-project-lite = "0.2"
 pkcs8 = "0.10"

diff --git a/collator/src/collator/mod.rs b/collator/src/collator/mod.rs
@@ -23,9 +23,9 @@ use crate::types::{
     TopBlockDescription,
 };
 use crate::utils::async_queued_dispatcher::{
-    AsyncQueuedDispatcher, STANDARD_DISPATCHER_QUEUE_BUFFER_SIZE,
+    AsyncQueuedDispatcher, STANDARD_QUEUED_DISPATCHER_BUFFER_SIZE,
 };
-use crate::{method_to_async_task_closure, tracing_targets};
+use crate::{method_to_queued_async_closure, tracing_targets};
 
 mod build_block;
 mod do_collate;
@@ -135,15 +135,15 @@ impl Collator for AsyncQueuedDispatcher<CollatorStdImpl> {
     }
 
     async fn equeue_update_mc_data_and_try_collate(&self, mc_data: Arc<McData>) -> Result<()> {
-        self.enqueue_task(method_to_async_task_closure!(
+        self.enqueue_task(method_to_queued_async_closure!(
             update_mc_data_and_try_collate,
             mc_data
         ))
         .await
     }
 
     async fn equeue_try_collate(&self) -> Result<()> {
-        self.enqueue_task(method_to_async_task_closure!(try_collate,))
+        self.enqueue_task(method_to_queued_async_closure!(try_collate,))
             .await
     }
 
@@ -152,7 +152,7 @@ impl Collator for AsyncQueuedDispatcher<CollatorStdImpl> {
         next_chain_time: u64,
         top_shard_blocks_info: Vec<TopBlockDescription>,
     ) -> Result<()> {
-        self.enqueue_task(method_to_async_task_closure!(
+        self.enqueue_task(method_to_queued_async_closure!(
             wait_state_and_do_collate,
             next_chain_time,
             top_shard_blocks_info
@@ -219,7 +219,7 @@ impl CollatorStdImpl {
 
         // create dispatcher for own async tasks queue
         let (dispatcher, receiver) =
-            AsyncQueuedDispatcher::new(STANDARD_DISPATCHER_QUEUE_BUFFER_SIZE);
+            AsyncQueuedDispatcher::new(STANDARD_QUEUED_DISPATCHER_BUFFER_SIZE);
 
         let exec_manager = ExecutionManager::new(
             shard_id,
@@ -268,7 +268,7 @@ impl CollatorStdImpl {
         // equeue first initialization task
         // sending to the receiver here cannot return Error because it is guaranteed not closed or dropped
         dispatcher
-            .enqueue_task(method_to_async_task_closure!(
+            .enqueue_task(method_to_queued_async_closure!(
                 init,
                 prev_blocks_ids,
                 mc_data,
@@ -343,7 +343,7 @@ impl CollatorStdImpl {
 
         // enqueue collation attempt of next block
         self.dispatcher
-            .enqueue_task(method_to_async_task_closure!(try_collate,))
+            .enqueue_task(method_to_queued_async_closure!(try_collate,))
             .await?;
         tracing::info!(target: tracing_targets::COLLATOR,
             "Collator (block_id={}): init: collation attempt enqueued", self.next_block_id_short,

diff --git a/collator/src/collator/tests/do_collate_tests.rs b/collator/src/collator/tests/do_collate_tests.rs
@@ -8,6 +8,26 @@ use crate::collator::CollatorStdImpl;
 use crate::mempool::make_stub_anchor;
 use crate::test_utils::try_init_test_tracing;
 
+fn get_test_block_limits() -> BlockLimits {
+    BlockLimits {
+        bytes: everscale_types::models::BlockParamLimits {
+            underload: 1_000_000,
+            soft_limit: 2_000_000,
+            hard_limit: 3_000_000,
+        },
+        gas: everscale_types::models::BlockParamLimits {
+            underload: 1_000_000,
+            soft_limit: 2_000_000,
+            hard_limit: 3_000_000,
+        },
+        lt_delta: everscale_types::models::BlockParamLimits {
+            underload: 1_000_000,
+            soft_limit: 2_000_000,
+            hard_limit: 3_000_000,
+        },
+    }
+}
+
 #[test]
 fn test_read_next_externals() {
     try_init_test_tracing(tracing_subscriber::filter::LevelFilter::TRACE);

diff --git a/collator/src/collator/types.rs b/collator/src/collator/types.rs
@@ -500,7 +500,6 @@ impl BlockLimitStats {
 
 #[derive(Debug, Clone, Copy, Eq, Ord, PartialEq, PartialOrd)]
 pub enum BlockLimitsLevel {
-    Underload,
     Soft,
     Hard,
 }
@@ -831,7 +830,7 @@ impl ShardAccountStuff {
             );
 
             anyhow::ensure!(
-                old_lib_descr.publishers.get(&self.account_addr)?.is_none(),
+                old_lib_descr.publishers.get(self.account_addr)?.is_none(),
                 "cannot add public library {key} of account {} because this public library's \
                 LibDescr record already lists this account as a publisher",
                 self.account_addr,