feat(NRC): Compute rewardable nodes between two days (#1629)

Author: pietrodimarco-dfinity

Cargo.Bazel.lock

@@ -1,5 +1,5 @@
 {
-  "checksum": "804b6a3865666ec1f16e50dab94dc25a59d61839903c18fce16929eb8a2db21c",
+  "checksum": "1cdfce59bbac59b9678f238a447e128345310b3864dbedc1c99f63c8de09e76c",
   "crates": {
     "actix-codec 0.5.2": {
       "name": "actix-codec",
@@ -35780,6 +35780,10 @@
               "id": "ic-cdk-timers 0.11.0",
               "target": "ic_cdk_timers"
             },
+            {
+              "id": "ic-dummy-getrandom-for-wasm 0.1.0",
+              "target": "ic_dummy_getrandom_for_wasm"
+            },
             {
               "id": "ic-http-types 0.1.0",
               "target": "ic_http_types"
@@ -35865,6 +35869,10 @@
         },
         "deps_dev": {
           "common": [
+            {
+              "id": "prost 0.13.5",
+              "target": "prost"
+            },
             {
               "id": "tokio 1.46.1",
               "target": "tokio"
@@ -60132,6 +60140,7 @@
     "ic-cdk-timers 0.11.0",
     "ic-config 0.9.0",
     "ic-crypto-utils-threshold-sig-der 0.9.0",
+    "ic-dummy-getrandom-for-wasm 0.1.0",
     "ic-http-endpoints-metrics 0.9.0",
     "ic-http-types 0.1.0",
     "ic-icrc1-test-utils 0.9.0",

Cargo.lock

@@ -103,6 +103,7 @@ ic-canisters = { path = "rs/ic-canisters" }
 ic-http-types = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
 ic-config = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
 ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
+ic-dummy-getrandom-for-wasm = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
 ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
 ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "2f87fe95207dc6371a2f2dc273362ba03b41e0e9" }
 ic-management-backend = { path = "rs/ic-management-backend" }

Cargo.toml

@@ -17,6 +17,7 @@ MACRO_DEPENDENCIES = [
 DEV_DEPENDENCIES = [
     # Keep sorted.
     "@crate_index_dre//:tokio",
+    "@crate_index_dre//:prost",
 ]
 
 ALIASES = {}

rs/dre-canisters/node-provider-rewards/canister/BUILD.bazel

@@ -25,6 +25,7 @@ ic-registry-keys = { workspace = true }
 futures = { workspace = true }
 indexmap = { workspace = true }
 ic-base-types = { workspace = true }
+ic-dummy-getrandom-for-wasm = { workspace = true }
 ic-management-canister-types-private = { workspace = true }
 ic-metrics-encoder = { workspace = true }
 ic-nervous-system-canisters = { workspace = true }
@@ -43,3 +44,4 @@ serde_cbor = "0.11.2"
 
 [dev-dependencies]
 tokio = { workspace = true }
+prost = "0.13.5"

rs/dre-canisters/node-provider-rewards/canister/Cargo.toml

@@ -210,17 +210,14 @@ fn http_request(request: HttpRequest) -> HttpResponse {
 
 fn rewards_calculator(reward_period: RewardPeriodArgs) -> Result<RewardsCalculator, String> {
     let reward_period = RewardPeriod::new(reward_period.start_ts, reward_period.end_ts).map_err(|err| err.to_string())?;
-    let start_ts = reward_period.from.unix_ts_at_day_start();
-    let end_ts = reward_period.to.unix_ts_at_day_end();
-
     let metrics_manager = METRICS_MANAGER.with(|m| m.clone());
     let registry_store = REGISTRY_STORE.with(|m| m.clone());
 
     let rewards_table = registry_store.get_rewards_table();
-    let daily_metrics_by_subnet = metrics_manager.daily_metrics_by_subnet(start_ts, end_ts);
+    let daily_metrics_by_subnet = metrics_manager.daily_metrics_by_subnet(reward_period.from, reward_period.to);
 
     let rewardable_nodes_per_provider = registry_store
-        .get_rewardable_nodes_per_provider(start_ts, end_ts)
+        .get_rewardable_nodes_per_provider(reward_period.from, reward_period.to)
         .map_err(|err| err.to_string())?;
 
     let rewards_calculator = RewardsCalculatorBuilder {

rs/dre-canisters/node-provider-rewards/canister/src/lib.rs

@@ -7,6 +7,7 @@ use ic_cdk::api::call::CallResult;
 use ic_management_canister_types_private::{NodeMetricsHistoryArgs, NodeMetricsHistoryResponse};
 use ic_stable_structures::StableBTreeMap;
 use itertools::Itertools;
+use rewards_calculation::rewards_calculator_results::DayUTC;
 use rewards_calculation::types::{DayEnd, NodeMetricsDailyRaw, SubnetMetricsDailyKey, UnixTsNanos};
 use std::cell::RefCell;
 use std::collections::{BTreeMap, HashMap};
@@ -143,15 +144,16 @@ where
             }
         }
     }
-    pub fn daily_metrics_by_subnet(&self, start_ts: UnixTsNanos, end_ts: UnixTsNanos) -> BTreeMap<SubnetMetricsDailyKey, Vec<NodeMetricsDailyRaw>> {
+    pub fn daily_metrics_by_subnet(&self, from: DayUTC, to: DayUTC) -> BTreeMap<SubnetMetricsDailyKey, Vec<NodeMetricsDailyRaw>> {
         let mut daily_metrics_by_subnet = BTreeMap::new();
+        let start_ts = from.unix_ts_at_day_start();
         let one_day_before_start = start_ts.checked_sub(DAY_IN_SECONDS * 1_000_000_000).unwrap_or_default();
         let first_key = SubnetMetricsKeyStored {
             ts: one_day_before_start,
             ..SubnetMetricsKeyStored::min_key()
         };
         let last_key = SubnetMetricsKeyStored {
-            ts: end_ts,
+            ts: to.unix_ts_at_day_end(),
             ..SubnetMetricsKeyStored::max_key()
         };
 

rs/dre-canisters/node-provider-rewards/canister/src/metrics.rs

@@ -272,7 +272,7 @@ async fn _daily_metrics_correct_different_update_size(size: usize) {
     for _ in 0..MAX_TIMES {
         mm.update_subnets_metrics(vec![subnet_id(1)]).await;
     }
-    let daily_metrics: Vec<Vec<NodeMetricsDailyRaw>> = mm.daily_metrics_by_subnet(0, 4 * ONE_DAY_NANOS).into_values().collect();
+    let daily_metrics: Vec<Vec<NodeMetricsDailyRaw>> = mm.daily_metrics_by_subnet(0.into(), (4 * ONE_DAY_NANOS).into()).into_values().collect();
 
     // (7, 5)
     assert_eq!(daily_metrics[0][0].num_blocks_proposed, 7);
@@ -332,7 +332,7 @@ async fn daily_metrics_correct_2_subs() {
     }
 
     let node_1_daily_metrics = mm
-        .daily_metrics_by_subnet(0, 8 * ONE_DAY_NANOS)
+        .daily_metrics_by_subnet(0.into(), (8 * ONE_DAY_NANOS).into())
         .into_iter()
         .collect::<BTreeMap<_, _>>()
         .into_iter()
@@ -400,7 +400,7 @@ async fn daily_metrics_correct_overlapping_days() {
     }
 
     let daily_metrics = mm
-        .daily_metrics_by_subnet(0, 4 * ONE_DAY_NANOS)
+        .daily_metrics_by_subnet(0.into(), (4 * ONE_DAY_NANOS).into())
         .into_iter()
         .collect::<BTreeMap<_, _>>()
         .into_iter()