Skip to content

Commit

Permalink
chore: Update dependencies (#950)
Browse files Browse the repository at this point in the history
Co-authored-by: NikolaMilosa <[email protected]>
Co-authored-by: Saša Tomić <[email protected]>
  • Loading branch information
3 people authored Nov 11, 2024
1 parent 047abde commit 26513fe
Show file tree
Hide file tree
Showing 21 changed files with 2,874 additions and 2,958 deletions.
4,391 changes: 2,163 additions & 2,228 deletions Cargo.Bazel.lock

Large diffs are not rendered by default.

1,213 changes: 590 additions & 623 deletions Cargo.lock

Large diffs are not rendered by default.

125 changes: 62 additions & 63 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,12 @@ actix-web = { version = "4.9.0", default-features = false, features = [
] }
actix-rt = "2.10.0"
ahash = "0.8.11"
anyhow = "1.0.89"
anyhow = "1.0.93"
async-recursion = "1.1.1"
axum-otel-metrics = "0.8.1"
axum = "0.7.5"
axum = "0.7.7"
backoff = { version = "0.4.0", features = ["tokio"] }
backon = "0.4.4"
backon = "1.2.0"
candid = "0.10.10"
chrono = { version = "0.4.38", features = ["serde"] }
clap-num = "1.1"
Expand All @@ -62,7 +62,7 @@ clap = { version = "4.5", features = [
"string",
"cargo",
] }
clap_complete = "4.5.26"
clap_complete = "4.5.37"
clio = { version = "0.3.5", features = ["clap", "clap-parse"] }
colored = "2.1.0"
comfy-table = "7.1.1"
Expand All @@ -79,70 +79,70 @@ base64 = "0.22.1"
edit = "0.1.5"
env_logger = "0.11.5"
erased-serde = "0.4.5"
flate2 = "1.0.33"
fs-err = "2.11.0"
flate2 = "1.0.34"
fs-err = "3.0.0"
fs2 = "0.4.3"
futures = "0.3.30"
futures = "0.3.31"
futures-util = "0.3.31"
hex = "0.4.3"
humantime = "2.1.0"
humantime-serde = "1.1.1"
ic-agent = "0.37.1"
octocrab = "0.39.0"
ic-agent = "0.39.1"
octocrab = "0.41.2"
self_update = { version = "0.41.0", default-features = false, features = [
"archive-tar",
"rustls",
] }
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-async-utils = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-base-types = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-canister-client = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-canister-client-sender = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-canisters = { path = "rs/ic-canisters" }
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-nervous-system-common-test-keys = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-cdk = { git = "https://github.com/dfinity/cdk-rs.git", rev = "8f57d6d26b1d142b5be4b39ea8ade59d7c848cde" }
ic-config = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-crypto-utils-threshold-sig-der = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-http-endpoints-metrics = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-interfaces-registry = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-management-backend = { path = "rs/ic-management-backend" }
ic-management-canister-types = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-management-canister-types = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-management-types = { path = "rs/ic-management-types" }
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" }
icrc-ledger-types = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
ic-transport-types = "0.37.1"
ic-utils = "0.37.0"
ic-metrics = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-nns-common = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-nns-constants = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-nns-governance = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-nns-governance-api = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-protobuf = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-client = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-client-fake = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-client-helpers = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-common-proto = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-keys = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-local-registry = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-local-store = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-local-store-artifacts = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-nns-data-provider = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-subnet-type = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-registry-transport = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-sys = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-types = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-nervous-system-root = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-nervous-system-clients = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-sns-wasm = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
cycles-minting-canister = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-icrc1-test-utils = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
rosetta-core = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
icrc-ledger-types = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
ic-transport-types = "0.39.1"
ic-utils = "0.39.0"
itertools = "0.13.0"
keyring = { version = "3.2.1", features = [
keyring = { version = "3.6.1", features = [
"apple-native",
"sync-secret-service",
] }
lazy_static = "1.5.0"
log = "0.4.22"
lru = "0.12.4"
lru = "0.12.5"
num-traits = "0.2"
opentelemetry = { version = "0.22.0", features = ["metrics"] }
pkcs11 = "0.5.0"
Expand All @@ -155,19 +155,18 @@ prometheus = { version = "0.13.4", features = ["process"] }
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 = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
regex = "1.11.1"
registry-canister = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }
reqwest = { version = "0.12", default-features = false, features = [
"rustls-tls-webpki-roots",
"blocking",
] }
retry = "2.0.0"
rstest = { version = "0.22.0", default-features = false }
rstest = { version = "0.23.0", default-features = false }
rust_decimal = "1.36.0"
rust_decimal_macros = "1.36.0"
secrecy = { version = "0.8.0" }
serde = { version = "1.0", features = ["derive"] }
serde_json = { version = "1.0.128", default-features = false, features = [
serde_json = { version = "1.0.132", default-features = false, features = [
"preserve_order",
] }
serde_yaml = "0.9.34"
Expand All @@ -187,23 +186,23 @@ strum = { version = "0.26.3", features = ["derive"] }
strum_macros = "0.26.4"
tabled = "0.16.0"
tabular = "0.2"
tempfile = "3.12.0"
thiserror = "1.0.63"
tokio = { version = "1.40.0", features = ["full"] }
tempfile = "3.14.0"
thiserror = "2.0.3"
tokio = { version = "1.41.1", features = ["full"] }
tokio-util = "0.7.12"
url = "2.5.2"
url = "2.5.3"
wiremock = "0.6.2"
human_bytes = "0.4"
mockall = "0.13.0"

# dre-canisters dependencies
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-cdk-timers = { git = "https://github.com/dfinity/cdk-rs.git", rev = "8f57d6d26b1d142b5be4b39ea8ade59d7c848cde" }
ic-cdk-macros = { git = "https://github.com/dfinity/cdk-rs.git", rev = "8f57d6d26b1d142b5be4b39ea8ade59d7c848cde" }
ic-stable-structures = "0.6.5"
dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "ca80a219757f00a5dd234f8d8c58316c902f2f2f" }
dfn_core = { git = "https://github.com/dfinity/ic.git", rev = "3c3d9cd3600c744a44405749eff7cf187ef8d75d" }

# dre-airflow deps, should be replaced with dre-airflow once
indexmap = { version = "2.5.0", features = ["serde"] }
indexmap = { version = "2.6.0", features = ["serde"] }

[profile.release]
# Add debug information to the release build (does NOT reduce the level of optimization!)
Expand Down
2 changes: 1 addition & 1 deletion WORKSPACE.bazel
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 = "ca80a219757f00a5dd234f8d8c58316c902f2f2f"
IC_REPO_VERSION = "3c3d9cd3600c744a44405749eff7cf187ef8d75d"

http_archive(
name = "ic_repo",
Expand Down
21 changes: 19 additions & 2 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ ignore = [
{ id = "RUSTSEC-2022-0034", reason = "our use of pkcs11 does not involve pointer magic" },
{ id = "RUSTSEC-2021-0127", reason = "migration to ciborium / minicbor pending" },
{ id = "RUSTSEC-2021-0141", reason = "migration away from dotenv pending" },
{ id = "RUSTSEC-2021-0145", reason = "the potential security issue only affects Windows, which we do not target" },
{ id = "RUSTSEC-2024-0370", reason = "alternative not yet available" },
{ id = "RUSTSEC-2024-0375", reason = "migration away from atty pending" },
{ id = "RUSTSEC-2024-0384", reason = "instant is a transitive dependency" },
#"[email protected]", # you can also ignore yanked crate versions if you wish
#{ crate = "[email protected]", reason = "you can specify why you are ignoring the yanked crate" },
Expand Down Expand Up @@ -775,6 +773,16 @@ crate = "ic-nervous-system-common-validation"
expression = "LicenseRef-IC-1.0"
license-files = [{ path = "../../../../LICENSE", hash = 0xbd0eed23 }]

[[licenses.clarify]]
crate = "ic-crypto-internal-threshold-sig-canister-threshold-sig"
expression = "LicenseRef-IC-1.0"
license-files = [{ path = "../../../../../../LICENSE", hash = 0xbd0eed23 }]

[[licenses.clarify]]
crate = "ic-nervous-system-linear-map"
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 Expand Up @@ -877,6 +885,7 @@ skip-tree = [
{ crate = "erased-serde", reason = "ic-protobuf and others pull in an old version of erased-serde" },
{ crate = "fastrand", reason = "self_update pulls in self-replace which pulls old version of fastrand" },
{ crate = "half", reason = "unmaintained serde_cbor which should be replaced (search in this file) pulls in old half" },
{ crate = "ic-agent", reason = "transitive dependency" },
{ crate = "ic-cdk", reason = "various IC packages require an older ic-cdk which pulls in these macros" },
{ crate = "ic-cdk-macros", reason = "various IC packages require an older ic-cdk which pulls in these macros" },
{ crate = "ic-cdk-timers", reason = "various IC packages require an older ic-cdk which pulls in these macros" },
Expand All @@ -885,6 +894,14 @@ skip-tree = [
{ crate = "libloading", reason = "the workspace pulls in old version of pkcs11 (v0.5.0) which pulls in an old libloading" },
{ crate = "pem", reason = "ic-crypto-ed25519 v0.9.0 depended by a lot of packages pulls in an old pem" },
{ crate = "procfs", reason = "ic-metrics crate pulls in an old version of procfs" },
{ crate = "ic-transport-types", reason = "version in the ic repo not yet updated" },
{ crate = "secrecy", reason = "transitive dependency" },
{ crate = "windows-sys", reason = "transitive dependency" },
{ crate = "windows_i686_msvc", reason = "transitive dependency" },
{ crate = "windows_i686_gnu", reason = "transitive dependency" },
{ crate = "windows_x86_64_msvc", reason = "transitive dependency" },
{ crate = "windows_x86_64_gnullvm", reason = "transitive dependency" },
{ crate = "windows_x86_64_gnu", reason = "transitive dependency" },
]

# This section is considered when running `cargo deny check sources`.
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
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=ca80a219757f00a5dd234f8d8c58316c902f2f2f
ARG ic_git_revision=3c3d9cd3600c744a44405749eff7cf187ef8d75d
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
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"https://github.com/dfinity/ic.git": {
"commit": "ca80a219757f00a5dd234f8d8c58316c902f2f2f",
"commit": "3c3d9cd3600c744a44405749eff7cf187ef8d75d",
"ref": "refs/heads/master"
},
"https://github.com/dfinity/cdk-rs.git": {
"commit": "882fa28116c84887be626a44ce031b739e45e3d5",
"commit": "8f57d6d26b1d142b5be4b39ea8ade59d7c848cde",
"ref": "refs/heads/main"
}
}
2 changes: 1 addition & 1 deletion pylib/ic_admin.py
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="ca80a219757f00a5dd234f8d8c58316c902f2f2f")
ic_admin = IcAdmin("https://ic0.app", git_revision="3c3d9cd3600c744a44405749eff7cf187ef8d75d")

print(ic_admin.get_subnet_replica_versions())
1 change: 0 additions & 1 deletion rs/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ regex = { workspace = true }
registry-canister = { workspace = true }
reqwest = { workspace = true }
self_update = { workspace = true }
secrecy = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
sha2 = { workspace = true }
Expand Down
Loading

0 comments on commit 26513fe

Please sign in to comment.