Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
5d788a7
feat: make type4 nodes go through API BNs
pierugo-dfinity Mar 25, 2026
b5663b5
test: extend unit tests
pierugo-dfinity Mar 25, 2026
2a905f8
test: extend system test
pierugo-dfinity Mar 26, 2026
69a2a2b
style: consistent styling
pierugo-dfinity Mar 26, 2026
c1b333a
Merge branch 'master' into pierugo/delegations/type4-adjustments
pierugo-dfinity Mar 26, 2026
53fd4e6
trying out Daniel's new lint
pierugo-dfinity Mar 26, 2026
43469e2
it works!
pierugo-dfinity Mar 26, 2026
a1bfec0
refactor: simplify cloud engine creation
pierugo-dfinity Mar 26, 2026
61c3624
fix: clippy
pierugo-dfinity Mar 26, 2026
d359111
fix: non-empty subnet
pierugo-dfinity Mar 26, 2026
b9eb752
fix: satisfy cost schedule registry invariant
pierugo-dfinity Mar 26, 2026
91281b6
fix: install canister on cloud engine
pierugo-dfinity Mar 26, 2026
bcb57b4
fix: install canister on NNS
pierugo-dfinity Mar 26, 2026
0a4de55
feat: works when DNS and TLS certs are setup
pierugo-dfinity Mar 26, 2026
61a3ae4
Merge branch 'master' into pierugo/delegations/type4-adjustments
pierugo-dfinity Mar 26, 2026
61b714f
Merge branch 'master' into pierugo/delegations/type4-adjustments
pierugo-dfinity Mar 26, 2026
d93c932
docs
pierugo-dfinity Mar 26, 2026
d013ae7
fix: clippy
pierugo-dfinity Mar 26, 2026
613fb55
test: ensure free cost schedule
pierugo-dfinity Mar 26, 2026
81030b7
test: ensure type4 node reward types
pierugo-dfinity Mar 26, 2026
38c5891
test: add API BNs
pierugo-dfinity Mar 26, 2026
63af301
fix: fix mainnet variant
pierugo-dfinity Mar 26, 2026
ae27903
Create IcBoundaryTlsCert config object and update generate_ic_config …
andrewbattat Mar 26, 2026
a67c01e
Assign real domains to API BNs
andrewbattat Mar 26, 2026
dffb8ce
Minor touch-ups
andrewbattat Mar 26, 2026
837f40d
refactor: allow overwriting
pierugo-dfinity Mar 27, 2026
62a3858
docs: typo
pierugo-dfinity Mar 27, 2026
06bd053
fix: clippy
pierugo-dfinity Mar 27, 2026
41bf948
feat: disable DNS and TLS hacks (thank you Andrew!)
pierugo-dfinity Mar 27, 2026
ae3d4e8
feat: disable test driver changes (done in separate PR)
pierugo-dfinity Mar 27, 2026
f9397ef
Merge branch 'pierugo/system-tests/enforce-cloud-engine-properties' i…
pierugo-dfinity Mar 27, 2026
b02fbb0
Merge branch 'andrew/support-api-bn-farm-domain-name' into pierugo/de…
pierugo-dfinity Mar 27, 2026
c3121df
feat: use Andrew's DNS + TLS impl
pierugo-dfinity Mar 27, 2026
b7a5dcc
fix: temporarily disable mainnet version on cloud engines
pierugo-dfinity Mar 27, 2026
3bad8db
fix: clippy
pierugo-dfinity Mar 27, 2026
3d3383a
fix: temporarily disable mainnet version on cloud engines (continued)
pierugo-dfinity Mar 30, 2026
8be0cf5
style: subnet_type as argument
pierugo-dfinity Mar 30, 2026
24eeaf4
Revert "feat: use Andrew's DNS + TLS impl"
pierugo-dfinity Mar 30, 2026
54dd02a
Revert "Minor touch-ups"
pierugo-dfinity Mar 30, 2026
04409be
Revert "fix: clippy"
pierugo-dfinity Mar 30, 2026
9317ca8
style
pierugo-dfinity Mar 30, 2026
6a4c209
style: consistency
pierugo-dfinity Mar 30, 2026
78a19c3
style: use const
pierugo-dfinity Mar 30, 2026
0eef91d
refactor: deduplicate code
pierugo-dfinity Mar 30, 2026
5613700
fix
pierugo-dfinity Mar 30, 2026
e8c1f21
style: revert unrelated changes
pierugo-dfinity Mar 30, 2026
b3c8609
re-trigger CI
pierugo-dfinity Mar 30, 2026
f094abb
style
pierugo-dfinity Mar 30, 2026
f7abb64
refactor: reuse canister_installer
pierugo-dfinity Mar 31, 2026
afd4641
refactor: test VerifiedApplication and use const
pierugo-dfinity Mar 31, 2026
508e5af
refactor: take ownership of logger
pierugo-dfinity Mar 31, 2026
19dd0d9
refactor: extract common logic to function
pierugo-dfinity Mar 31, 2026
8347a25
style: remove type suffix
pierugo-dfinity Mar 31, 2026
7d76486
style: assert_eq/assert_ne
pierugo-dfinity Mar 31, 2026
70efb94
refactor: use subnet_type_as_string
pierugo-dfinity Mar 31, 2026
68f6f94
Merge branch 'master' into pierugo/delegations/type4-adjustments
pierugo-dfinity Mar 31, 2026
9cb58a6
feat: log connecting to an NNS node directly
pierugo-dfinity Mar 31, 2026
0cdc46c
refactor: simplify CanisterInstaller
pierugo-dfinity Mar 31, 2026
3f7a1cd
feat: use IP as server name for regular nodes
pierugo-dfinity Mar 31, 2026
48c60bc
feat: resolve to IPv6
pierugo-dfinity Mar 31, 2026
c5ada4c
style: clippy
pierugo-dfinity Mar 31, 2026
9adf1ed
feat: use hickory-resolver
pierugo-dfinity Mar 31, 2026
6276863
Automatically fixing code for linting and formatting issues
Mar 31, 2026
4501d32
fix: reduce timeout and attempts in tests
pierugo-dfinity Mar 31, 2026
c9ad435
style: match -> map_err
pierugo-dfinity Apr 1, 2026
d919185
perf: upgrade subnets in parallel
pierugo-dfinity Apr 1, 2026
1e3efdb
chore: tighten test timeout by 5 minutes
pierugo-dfinity Apr 1, 2026
6a7e2e0
perf: sequential cases but parallel across different subnets
pierugo-dfinity Apr 1, 2026
acf5a93
Revert "perf: sequential cases but parallel across different subnets"
pierugo-dfinity Apr 1, 2026
bf20059
perf: all cases in parallel
pierugo-dfinity Apr 1, 2026
23893f0
Merge branch 'master' into pierugo/delegations/type4-adjustments
pierugo-dfinity Apr 1, 2026
6ae2dba
feat: use API BN with valid DNS and TLS
pierugo-dfinity Apr 1, 2026
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
34 changes: 22 additions & 12 deletions Cargo.Bazel.json.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"checksum": "1fefbde32ed3b3779e766927393403bb1c21b915c373908eacc9793962c43fa7",
"checksum": "1d88faead9fe3d4ca18cc2287397ac1457604de13e94aded554c8104ad506e69",
"crates": {
"abnf 0.12.0": {
"name": "abnf",
Expand Down Expand Up @@ -21686,6 +21686,10 @@
"id": "hex-literal 0.4.1",
"target": "hex_literal"
},
{
"id": "hickory-resolver 0.25.2",
"target": "hickory_resolver"
},
{
"id": "hkdf 0.12.4",
"target": "hkdf"
Expand Down Expand Up @@ -22736,6 +22740,10 @@
"id": "wat 1.244.0",
"target": "wat"
},
{
"id": "webpki-roots 1.0.6",
"target": "webpki_roots"
},
{
"id": "which 4.4.0",
"target": "which"
Expand Down Expand Up @@ -34021,7 +34029,7 @@
"target": "tower_service"
},
{
"id": "webpki-roots 1.0.2",
"id": "webpki-roots 1.0.6",
"target": "webpki_roots"
}
],
Expand Down Expand Up @@ -66327,7 +66335,7 @@
"target": "tokio_util"
},
{
"id": "webpki-roots 1.0.2",
"id": "webpki-roots 1.0.6",
"target": "webpki_roots"
}
],
Expand Down Expand Up @@ -66377,7 +66385,7 @@
"target": "tokio_util"
},
{
"id": "webpki-roots 1.0.2",
"id": "webpki-roots 1.0.6",
"target": "webpki_roots"
}
],
Expand Down Expand Up @@ -66497,7 +66505,7 @@
"target": "tokio_util"
},
{
"id": "webpki-roots 1.0.2",
"id": "webpki-roots 1.0.6",
"target": "webpki_roots"
}
],
Expand Down Expand Up @@ -66547,7 +66555,7 @@
"target": "tokio_util"
},
{
"id": "webpki-roots 1.0.2",
"id": "webpki-roots 1.0.6",
"target": "webpki_roots"
}
]
Expand Down Expand Up @@ -69500,7 +69508,7 @@
"target": "thiserror"
},
{
"id": "webpki-roots 1.0.2",
"id": "webpki-roots 1.0.6",
"target": "webpki_roots"
},
{
Expand Down Expand Up @@ -91790,14 +91798,14 @@
],
"license_file": "LICENSE"
},
"webpki-roots 1.0.2": {
"webpki-roots 1.0.6": {
"name": "webpki-roots",
"version": "1.0.2",
"version": "1.0.6",
"package_url": "https://github.com/rustls/webpki-roots",
"repository": {
"Http": {
"url": "https://static.crates.io/crates/webpki-roots/1.0.2/download",
"sha256": "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
"url": "https://static.crates.io/crates/webpki-roots/1.0.6/download",
"sha256": "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed"
}
},
"targets": [
Expand Down Expand Up @@ -91830,7 +91838,7 @@
"selects": {}
},
"edition": "2021",
"version": "1.0.2"
"version": "1.0.6"
},
"license": "CDLA-Permissive-2.0",
"license_ids": [
Expand Down Expand Up @@ -98642,6 +98650,7 @@
"hashlink 0.8.3",
"hex 0.4.3",
"hex-literal 0.4.1",
"hickory-resolver 0.25.2",
"hkdf 0.12.4",
"hmac 0.12.1",
"hpke 0.12.0",
Expand Down Expand Up @@ -98912,6 +98921,7 @@
"wasmtime 42.0.1",
"wast 244.0.0",
"wat 1.244.0",
"webpki-roots 1.0.6",
"which 4.4.0",
"wirm 2.1.0",
"wsl 0.1.0",
Expand Down
12 changes: 7 additions & 5 deletions Cargo.Bazel.toml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -3713,6 +3713,7 @@ dependencies = [
"hashlink 0.8.3",
"hex",
"hex-literal 0.4.1",
"hickory-resolver",
"hkdf",
"hmac",
"hpke",
Expand Down Expand Up @@ -3983,6 +3984,7 @@ dependencies = [
"wasmtime",
"wast",
"wat",
"webpki-roots 1.0.6",
"which",
"wirm",
"wsl",
Expand Down Expand Up @@ -5870,7 +5872,7 @@ dependencies = [
"tokio",
"tokio-rustls 0.26.0",
"tower-service",
"webpki-roots 1.0.2",
"webpki-roots 1.0.6",
]

[[package]]
Expand Down Expand Up @@ -11264,7 +11266,7 @@ dependencies = [
"wasm-bindgen-futures",
"wasm-streams",
"web-sys",
"webpki-roots 1.0.2",
"webpki-roots 1.0.6",
]

[[package]]
Expand Down Expand Up @@ -11713,7 +11715,7 @@ dependencies = [
"serde",
"serde_json",
"thiserror 2.0.18",
"webpki-roots 1.0.2",
"webpki-roots 1.0.6",
"x509-parser 0.16.0",
]

Expand Down Expand Up @@ -15425,9 +15427,9 @@ dependencies = [

[[package]]
name = "webpki-roots"
version = "1.0.2"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
checksum = "22cfaf3c063993ff62e73cb4311efde4db1efb31ab78a3e5c457939ad5cc0bed"
dependencies = [
"rustls-pki-types",
]
Expand Down
5 changes: 5 additions & 0 deletions Cargo.lock

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

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ getrandom = { version = "0.2", features = ["custom"] }
goldenfile = "1.8.0"
gpt = "4.1"
hex = { version = "0.4.3", features = ["serde"] }
hickory-resolver = "0.25.2"
hkdf = "^0.12"
http = "1.3.1"
http-body = "1.0.1"
Expand Down Expand Up @@ -918,6 +919,7 @@ wasmparser = "0.244.0"
wasmprinter = "0.244.0"
wast = "244.0.0"
wat = "~1.244.0"
webpki-roots = "1.0.6"
which = "6.0.3"
wirm = { version = "2.1.0", features = ["parallel"] }
wsl = "0.1.0"
Expand Down
8 changes: 8 additions & 0 deletions bazel/rust.MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -537,6 +537,10 @@ crate.spec(
package = "hex-literal",
version = "^0.4.1",
)
crate.spec(
package = "hickory-resolver",
version = "0.25.2",
)
crate.spec(
package = "hkdf",
version = "^0.12",
Expand Down Expand Up @@ -1899,6 +1903,10 @@ crate.spec(
package = "wat",
version = "~1.244.0",
)
crate.spec(
package = "webpki-roots",
version = "1.0.6",
)
crate.spec(
package = "which",
version = "^4.2.2",
Expand Down
2 changes: 1 addition & 1 deletion rs/canonical_state/src/lazy_tree_conversion.rs
Original file line number Diff line number Diff line change
Expand Up @@ -978,7 +978,7 @@ fn canister_metadata_as_tree(
/// Helper function to turn a subnet type into a string.
/// This is intentionally explicitly implemented here, so that the state tree representation cannot be changed outside this crate, as opposed
/// to calling something like `subnet_type.to_string()`.
fn subnet_type_as_string(subnet_type: SubnetType) -> &'static str {
pub fn subnet_type_as_string(subnet_type: SubnetType) -> &'static str {
match subnet_type {
SubnetType::Application => "application",
SubnetType::System => "system",
Expand Down
6 changes: 5 additions & 1 deletion rs/http_endpoints/nns_delegation_manager/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,26 @@ rust_library(
"//rs/interfaces/registry",
"//rs/monitoring/logger",
"//rs/monitoring/metrics",
"//rs/protobuf",
"//rs/registry/helpers",
"//rs/types/types",
"@crate_index//:axum",
"@crate_index//:futures",
"@crate_index//:hickory-resolver",
"@crate_index//:http-body-util",
"@crate_index//:hyper",
"@crate_index//:hyper-util",
"@crate_index//:prometheus",
"@crate_index//:rand",
"@crate_index//:rustls",
"@crate_index//:serde",
"@crate_index//:serde_cbor",
"@crate_index//:slog",
"@crate_index//:tokio",
"@crate_index//:tokio-rustls",
"@crate_index//:tokio-util",
"@crate_index//:tower",
"@crate_index//:webpki-roots",
],
)

Expand All @@ -56,6 +60,7 @@ rust_test(
"//rs/registry/fake",
"//rs/registry/keys",
"//rs/registry/proto_data_provider",
"//rs/registry/subnet_type",
"//rs/test_utilities/registry",
"//rs/test_utilities/types",
"@crate_index//:assert_matches",
Expand All @@ -64,7 +69,6 @@ rust_test(
"@crate_index//:hyper",
"@crate_index//:rand",
"@crate_index//:rcgen",
"@crate_index//:rustls",
"@crate_index//:tokio",
],
)
Expand Down
6 changes: 5 additions & 1 deletion rs/http_endpoints/nns_delegation_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ harness = false
[dependencies]
axum = { workspace = true }
futures = { workspace = true }
hickory-resolver = { workspace = true }
http-body-util = { workspace = true }
hyper = { workspace = true }
hyper-util = { workspace = true }
Expand All @@ -24,17 +25,20 @@ ic-crypto-utils-threshold-sig-der = { path = "../../crypto/utils/threshold_sig_d
ic-interfaces-registry = { path = "../../interfaces/registry" }
ic-logger = { path = "../../monitoring/logger" }
ic-metrics = { path = "../../monitoring/metrics" }
ic-protobuf = { path = "../../protobuf" }
ic-registry-client-helpers = { path = "../../registry/helpers" }
ic-types = { path = "../../types/types" }
prometheus = { workspace = true }
rand = { workspace = true }
rustls = { workspace = true }
serde = { workspace = true }
serde_cbor = { workspace = true }
slog = { workspace = true }
tokio = { workspace = true }
tokio-rustls = { workspace = true }
tokio-util = { workspace = true }
tower = { workspace = true }
webpki-roots = { workspace = true }

[dev-dependencies]
assert_matches = { workspace = true }
Expand All @@ -46,8 +50,8 @@ ic-nns-delegation-manager-test-utils = { path = "test_utils" }
ic-registry-client-fake = { path = "../../registry/fake" }
ic-registry-keys = { path = "../../registry/keys" }
ic-registry-proto-data-provider = { path = "../../registry/proto_data_provider" }
ic-registry-subnet-type = { path = "../../registry/subnet_type" }
ic-test-utilities-registry = { path = "../../test_utilities/registry" }
ic-test-utilities-types = { path = "../../test_utilities/types" }
pprof = { workspace = true }
rcgen = { workspace = true }
rustls = { workspace = true }
Loading
Loading