Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
86c2d10
Removal commit
pietrodimarco-dfinity Apr 14, 2025
129a117
Add changes to Cargo deps
pietrodimarco-dfinity Apr 14, 2025
c2b753f
Add dashboard endpoints
pietrodimarco-dfinity Apr 14, 2025
9f04b66
Fetching daily metrics by subnets directly
pietrodimarco-dfinity Apr 14, 2025
df183b8
Fetch from registry rewardables per provider
pietrodimarco-dfinity Apr 14, 2025
15aa84f
Refactor rewards_calculator code with simplifications:
pietrodimarco-dfinity Apr 14, 2025
f07f2a3
Changes in tests and .did file
pietrodimarco-dfinity Apr 14, 2025
8e98407
Update Cargo.Bazel.lock to add and remove dependencies
pietrodimarco-dfinity Apr 14, 2025
fd5a278
Improve documentation and simplify test cases in rewards_calculator
pietrodimarco-dfinity Apr 14, 2025
6b302a8
Reduce maximum bytes for node metrics stored key in metrics_types
pietrodimarco-dfinity Apr 14, 2025
cd20ef7
Merge branch 'main' into pmarco/refactoring-node-provider-rewards
pietrodimarco-dfinity Apr 14, 2025
e61549c
Refactor rewards calculation structures and update API responses
pietrodimarco-dfinity Apr 15, 2025
fc60638
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 15, 2025
3d1db6b
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 15, 2025
12e3297
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 15, 2025
b04fd81
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 15, 2025
8dbf845
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 16, 2025
0472b12
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 16, 2025
1c18f1f
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 16, 2025
6a77a89
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 16, 2025
1f13e72
Merge branch 'main' into pmarco/refactoring-node-provider-rewards
pietrodimarco-dfinity Apr 16, 2025
6f7eb58
Merge main
pietrodimarco-dfinity Apr 16, 2025
654516f
Update dependencies in Cargo.lock to latest versions
pietrodimarco-dfinity Apr 16, 2025
23d0971
Update dependencies in Cargo.Bazel.lock to latest versions
pietrodimarco-dfinity Apr 16, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 43 additions & 24 deletions Cargo.Bazel.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "34097ca50e15a81e3fdba144fe7c424fb111d24be17ae2d11b3bc0d8cf8cf5c6",
"checksum": "80952ab119da0fffd649e1cbcadde128ebb36d72264184b293d01bc4667dc81b",
"crates": {
"actix-codec 0.5.2": {
"name": "actix-codec",
Expand Down Expand Up @@ -35828,6 +35828,22 @@
"id": "candid 0.10.13",
"target": "candid"
},
{
"id": "chrono 0.4.40",
"target": "chrono"
},
{
"id": "ic-base-types 0.9.0",
"target": "ic_base_types"
},
{
"id": "itertools 0.13.0",
"target": "itertools"
},
{
"id": "rust_decimal 1.37.1",
"target": "rust_decimal"
},
{
"id": "serde 1.0.219",
"target": "serde"
Expand All @@ -35836,6 +35852,15 @@
"selects": {}
},
"edition": "2021",
"proc_macro_deps": {
"common": [
{
"id": "rust_decimal_macros 1.37.1",
"target": "rust_decimal_macros"
}
],
"selects": {}
},
"version": "0.6.2"
},
"license": "Apache-2.0",
Expand Down Expand Up @@ -35938,10 +35963,6 @@
"id": "indexmap 2.8.0",
"target": "indexmap"
},
{
"id": "itertools 0.13.0",
"target": "itertools"
},
{
"id": "mockall 0.13.1",
"target": "mockall"
Expand All @@ -35950,13 +35971,13 @@
"id": "node-provider-rewards-canister 0.6.2",
"target": "build_script_build"
},
{
"id": "rust_decimal 1.37.1",
"target": "rust_decimal"
},
{
"id": "serde 1.0.219",
"target": "serde"
},
{
"id": "serde_cbor 0.11.2",
"target": "serde_cbor"
}
],
"selects": {}
Expand Down Expand Up @@ -45044,10 +45065,6 @@
],
"deps": {
"common": [
{
"id": "chrono 0.4.40",
"target": "chrono"
},
{
"id": "ic-base-types 0.9.0",
"target": "ic_base_types"
Expand All @@ -45064,25 +45081,26 @@
"id": "ic-types 0.9.0",
"target": "ic_types"
},
{
"id": "indexmap 2.8.0",
"target": "indexmap"
},
{
"id": "itertools 0.13.0",
"target": "itertools"
},
{
"id": "num-traits 0.2.19",
"target": "num_traits"
},
{
"id": "rust_decimal 1.37.1",
"target": "rust_decimal"
}
],
"selects": {}
},
"deps_dev": {
"common": [
{
"id": "chrono 0.4.40",
"target": "chrono"
},
{
"id": "tabled 0.18.0",
"target": "tabled"
"id": "maplit 1.0.2",
"target": "maplit"
}
],
"selects": {}
Expand Down Expand Up @@ -62702,7 +62720,6 @@
"lazy_static 1.5.0",
"log 0.4.26",
"mockall 0.13.1",
"num-traits 0.2.19",
"octocrab 0.41.2",
"opentelemetry 0.22.0",
"pretty_env_logger 0.5.0",
Expand All @@ -62720,6 +62737,7 @@
"rust_decimal_macros 1.37.1",
"self_update 0.41.0",
"serde 1.0.219",
"serde_cbor 0.11.2",
"serde_json 1.0.140",
"serde_yaml 0.9.34+deprecated",
"sha2 0.10.8",
Expand All @@ -62742,6 +62760,7 @@
"direct_dev_deps": [
"actix-rt 2.10.0",
"assert_cmd 2.0.16",
"maplit 1.0.2",
"wiremock 0.6.3"
],
"unused_patches": []
Expand Down
13 changes: 8 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ candid = { workspace = true }
serde = { workspace = true }
ic-interfaces-registry = { workspace = true }
ic-registry-keys = { workspace = true }
itertools = { workspace = true }
futures = { workspace = true }
indexmap = { workspace = true }
ic-base-types = { workspace = true }
Expand All @@ -35,7 +34,7 @@ ic-types = { workspace = true }
mockall = { workspace = true }
rewards-calculation = { workspace = true }
node-provider-rewards-api = { workspace = true }
rust_decimal = { workspace = true }
serde_cbor = "0.11.2"

[dev-dependencies]
tokio = { workspace = true }
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")

package(default_visibility = ["//visibility:public"])

DEPS = [
"//rs/dre-canisters/node-provider-rewards/rewards-calculation",
]

rust_library(
name = "api",
crate_name = "node_provider_rewards_api",
Expand All @@ -11,7 +15,7 @@ rust_library(
proc_macro_deps = all_crate_deps(
proc_macro = True,
),
deps = all_crate_deps(
deps = DEPS + all_crate_deps(
normal = True,
),
)
11 changes: 11 additions & 0 deletions rs/dre-canisters/node-provider-rewards/canister/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,20 @@ edition.workspace = true
license.workspace = true

[dependencies]
ic-base-types = { workspace = true }
rust_decimal = { workspace = true }
rust_decimal_macros = { workspace = true }
rewards-calculation = { workspace = true }
candid = { workspace = true }
serde = { workspace = true }

itertools = { workspace = true }
chrono = { version = "0.4.38", default-features = false, features = [
"alloc",
"clock",
"serde",
] }

[lib]
name = "node_provider_rewards_api"
path = "src/lib.rs"
Loading