Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: autoupgrade deps #1004

Merged
merged 3 commits into from
Oct 14, 2024
Merged

fix: autoupgrade deps #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8f4e6cf
manually running cargo upgrade
NikolaMilosa Oct 14, 2024
3d44f06
removing unneeded file
NikolaMilosa Oct 14, 2024
f273e84
clippy
NikolaMilosa Oct 14, 2024
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
1,985 changes: 858 additions & 1,127 deletions Cargo.Bazel.lock
View file
Open in desktop

Large diffs are not rendered by default.

744 changes: 364 additions & 380 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

84 changes: 42 additions & 42 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ flate2 = "1.0.33"
fs-err = "2.11.0"
fs2 = "0.4.3"
futures = "0.3.30"
futures-util = "0.3.30"
futures-util = "0.3.31"
hex = "0.4.3"
humantime = "2.1.0"
humantime-serde = "1.1.1"
Expand All @@ -92,45 +92,45 @@ self_update = { version = "0.41.0", default-features = false, features = [
"archive-tar",
"rustls",
] }
ic-async-utils = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-async-utils = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-canisters = { path = "rs/ic-canisters" }
ic-nervous-system-common-test-keys = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "97c4e19c76b7f072ce8507cb7e7a527582111272" }
ic-config = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-nervous-system-common-test-keys = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "882fa28116c84887be626a44ce031b739e45e3d5" }
ic-config = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-management-backend = { path = "rs/ic-management-backend" }
ic-management-canister-types = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-management-canister-types = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-management-types = { path = "rs/ic-management-types" }
ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-nns-governance-api = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-types = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-icrc1-test-utils = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
rosetta-core = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-nns-governance-api = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-types = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-icrc1-test-utils = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
rosetta-core = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-transport-types = "0.37.1"
ic-utils = "0.37.0"
itertools = "0.13.0"
Expand All @@ -150,11 +150,11 @@ prometheus-http-query = { version = "0.8.3", default-features = false, features
"rustls-tls-webpki-roots",
] }
prometheus = { version = "0.13.4", features = ["process"] }
prost = "0.12"
prost = "0.13"
rand = { version = "0.8.5", features = ["std_rng"] }
rand_seeder = "0.3.0"
regex = "1.10.6"
registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls-webpki-roots",
"blocking",
Expand Down Expand Up @@ -195,10 +195,10 @@ human_bytes = "0.4"
mockall = "0.13.0"

# dre-canisters dependencies
ic-cdk-timers = { git = "https://github.com/dfinity/cdk-rs.git", rev = "97c4e19c76b7f072ce8507cb7e7a527582111272" }
ic-cdk-macros = { git = "https://github.com/dfinity/cdk-rs.git", rev = "97c4e19c76b7f072ce8507cb7e7a527582111272" }
ic-cdk-timers = { git = "https://github.com/dfinity/cdk-rs.git", rev = "882fa28116c84887be626a44ce031b739e45e3d5" }
ic-cdk-macros = { git = "https://github.com/dfinity/cdk-rs.git", rev = "882fa28116c84887be626a44ce031b739e45e3d5" }
ic-stable-structures = "0.6.5"
dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31" }
dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }

# dre-airflow deps, should be replaced with dre-airflow once
indexmap = { version = "2.5.0", features = ["serde"] }
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ aspect_bazel_lib_dependencies()

aspect_bazel_lib_register_toolchains()

IC_REPO_VERSION = "d4ee25b0865e89d3eaac13a60f0016d5e3296b31"
IC_REPO_VERSION = "ca80a219757f00a5dd234f8d8c58316c902f2f2f"

http_archive(
name = "ic_repo",
Expand Down
16 changes: 13 additions & 3 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,12 +412,12 @@ license-files = [{ path = "../../../LICENSE", hash = 0xbd0eed23 }]
[[licenses.clarify]]
crate = "ic-ledger-canister-core"
expression = "LicenseRef-IC-1.0"
license-files = [{ path = "../../../LICENSE", hash = 0xbd0eed23 }]
license-files = [{ path = "../../../../LICENSE", hash = 0xbd0eed23 }]

[[licenses.clarify]]
crate = "ic-ledger-core"
expression = "LicenseRef-IC-1.0"
license-files = [{ path = "../../../LICENSE", hash = 0xbd0eed23 }]
license-files = [{ path = "../../../../LICENSE", hash = 0xbd0eed23 }]

[[licenses.clarify]]
crate = "ic-logger"
Expand Down Expand Up @@ -747,7 +747,7 @@ license-files = [{ path = "../../LICENSE", hash = 0xbd0eed23 }]
[[licenses.clarify]]
crate = "rosetta-core"
expression = "LicenseRef-IC-1.0"
license-files = [{ path = "../../../LICENSE", hash = 0xbd0eed23 }]
license-files = [{ path = "../../../../LICENSE", hash = 0xbd0eed23 }]

[[licenses.clarify]]
crate = "ic-icrc1-test-utils"
Expand All @@ -764,6 +764,16 @@ crate = "ic-crypto-internal-basic-sig-ecdsa-secp256k1"
expression = "LicenseRef-IC-1.0"
license-files = [{ path = "../../../../../../LICENSE", hash = 0xbd0eed23 }]

[[licenses.clarify]]
crate = "ic-nervous-system-initial-supply"
expression = "LicenseRef-IC-1.0"
license-files = [{ path = "../../../LICENSE", hash = 0xbd0eed23 }]

[[licenses.clarify]]
crate = "ic-nervous-system-common-validation"
expression = "LicenseRef-IC-1.0"
license-files = [{ path = "../../../../LICENSE", hash = 0xbd0eed23 }]


[licenses.private]
# If true, ignores workspace crates that aren't published, or are only
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ ENV CARGO_HOME=/cargo
COPY docker /docker

# Download ic-admin
ARG ic_git_revision=d4ee25b0865e89d3eaac13a60f0016d5e3296b31
ARG ic_git_revision=ca80a219757f00a5dd234f8d8c58316c902f2f2f
RUN curl --fail https://download.dfinity.systems/ic/${ic_git_revision}/release/ic-admin.gz -o - | gunzip -c >| /usr/bin/ic-admin && \
chmod +x /usr/bin/ic-admin

Expand Down
4 changes: 2 additions & 2 deletions ic-revisions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"https://github.com/dfinity/ic.git": {
"commit": "d4ee25b0865e89d3eaac13a60f0016d5e3296b31",
"commit": "ca80a219757f00a5dd234f8d8c58316c902f2f2f",
"ref": "refs/heads/master"
},
"https://github.com/dfinity/cdk-rs.git": {
"commit": "97c4e19c76b7f072ce8507cb7e7a527582111272",
"commit": "882fa28116c84887be626a44ce031b739e45e3d5",
"ref": "refs/heads/main"
}
}
2 changes: 1 addition & 1 deletion pylib/ic_admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,6 @@ def canister_version(agent: Agent, canister_principal: str) -> str:

if __name__ == "__main__":
# One can run some simple one-off tests here, e.g.:
ic_admin = IcAdmin("https://ic0.app", git_revision="d4ee25b0865e89d3eaac13a60f0016d5e3296b31")
ic_admin = IcAdmin("https://ic0.app", git_revision="ca80a219757f00a5dd234f8d8c58316c902f2f2f")

print(ic_admin.get_subnet_replica_versions())
2 changes: 1 addition & 1 deletion rs/cli/src/commands/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ async fn get_subnets_and_nodes(
dkg_interval_length: record.dkg_interval_length,
start_as_nns: record.start_as_nns,
subnet_type: record.subnet_type,
features: record.features.clone().unwrap_or_default(),
features: record.features.unwrap_or_default(),
max_number_of_canisters: record.max_number_of_canisters,
ssh_readonly_access: record.ssh_readonly_access.clone(),
ssh_backup_access: record.ssh_backup_access.clone(),
Expand Down
6 changes: 3 additions & 3 deletions rs/ic-management-backend/src/lazy_registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,8 +457,8 @@ impl LazyRegistry for LazyRegistryImpl {
country,
continent,
owner: DatacenterOwner { name: dc.owner.clone() },
latitude: dc.gps.clone().map(|l| l.latitude as f64),
longitude: dc.gps.clone().map(|l| l.longitude as f64),
latitude: dc.gps.map(|l| l.latitude as f64),
longitude: dc.gps.map(|l| l.longitude as f64),
}
}),
rewardable_nodes: or.rewardable_nodes.iter().map(|(k, v)| (k.clone(), *v)).collect(),
Expand Down Expand Up @@ -650,7 +650,7 @@ impl LazyRegistry for LazyRegistryImpl {
initial_notary_delay_millis: sr.initial_notary_delay_millis,
dkg_interval_length: sr.dkg_interval_length,
start_as_nns: sr.start_as_nns,
features: sr.features.clone(),
features: sr.features,
max_number_of_canisters: sr.max_number_of_canisters,
ssh_readonly_access: sr.ssh_readonly_access.clone(),
ssh_backup_access: sr.ssh_backup_access.clone(),
Expand Down
6 changes: 3 additions & 3 deletions rs/ic-management-backend/src/registry.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,8 +423,8 @@ impl RegistryState {
country,
continent,
owner: DatacenterOwner { name: dc.owner.clone() },
latitude: dc.gps.clone().map(|l| l.latitude as f64),
longitude: dc.gps.clone().map(|l| l.longitude as f64),
latitude: dc.gps.map(|l| l.latitude as f64),
longitude: dc.gps.map(|l| l.longitude as f64),
}
}),
rewardable_nodes: or.rewardable_nodes.iter().map(|(k, v)| (k.clone(), *v)).collect(),
Expand Down Expand Up @@ -585,7 +585,7 @@ impl RegistryState {
initial_notary_delay_millis: sr.initial_notary_delay_millis,
dkg_interval_length: sr.dkg_interval_length,
start_as_nns: sr.start_as_nns,
features: sr.features.clone(),
features: sr.features,
max_number_of_canisters: sr.max_number_of_canisters,
ssh_readonly_access: sr.ssh_readonly_access.clone(),
ssh_backup_access: sr.ssh_backup_access.clone(),
Expand Down
1 change: 1 addition & 0 deletions scripts/auto-update-revisions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"release-index.yaml",
"__pycache__/.*",
"release-controller/test_reconciler.py",
".venv/.*",
]

SKIP_REGEX = [re.compile(f".*/{pattern}") for pattern in SKIP]
Expand Down
Loading