From c619cc48b192361f0a4d62241ccab01662d5505a Mon Sep 17 00:00:00 2001 From: Daniel Bloom <82895745+Daniel-Bloom-dfinity@users.noreply.github.com> Date: Tue, 2 Aug 2022 22:42:51 -0700 Subject: [PATCH] chore: bump `agent-rs` and toolchain (#44) --- .github/workflows/fmt.yml | 2 +- .github/workflows/lint.yml | 2 +- .github/workflows/release.yml | 4 +- .github/workflows/test.yml | 2 +- Cargo.lock | 79 +++++++++++------------------------ Cargo.toml | 4 +- rust-toolchain | 2 +- 7 files changed, 32 insertions(+), 63 deletions(-) diff --git a/.github/workflows/fmt.yml b/.github/workflows/fmt.yml index 49c4f6a..8884543 100644 --- a/.github/workflows/fmt.yml +++ b/.github/workflows/fmt.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - rust: [ '1.58.1' ] + rust: [ '1.60.0' ] os: [ ubuntu-latest ] steps: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index dba293c..d97c1d0 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,7 +8,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - rust: [ '1.58.1' ] + rust: [ '1.60.0' ] os: [ ubuntu-latest ] steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 40ad1a1..817f4bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [ '1.58.1' ] + rust: [ '1.60.0' ] target: [ x86_64-apple-darwin, x86_64-unknown-linux-musl, x86_64-unknown-linux-gnu ] include: - os: macos-latest @@ -117,7 +117,7 @@ jobs: strategy: fail-fast: false matrix: - rust: [ '1.58.1' ] + rust: [ '1.60.0' ] target: [ x86_64-apple-darwin, x86_64-unknown-linux-musl, x86_64-unknown-linux-gnu ] include: - os: macos-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d438756..ebb7796 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - rust: [ '1.58.1' ] + rust: [ '1.60.0' ] os: [ ubuntu-latest, macos-latest, windows-latest ] steps: diff --git a/Cargo.lock b/Cargo.lock index ba018eb..26f349b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,15 +185,6 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.2" @@ -223,9 +214,9 @@ checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" [[package]] name = "candid" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba9e536514a3c655568e23e36e68cbef20ee6595f641719ade03a849a13ed0ac" +checksum = "a4f5cdd24185c6d6edba09bcfe06cf9c1e7fd579cbe5e4ae2dffba9c474a5a7f" dependencies = [ "anyhow", "binread", @@ -410,6 +401,12 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "data-encoding" +version = "2.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ee2393c4a91429dffb4bedf19f4d6abf27d8a732c8ce4980305d782e5426d57" + [[package]] name = "der" version = "0.6.0" @@ -427,22 +424,13 @@ version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e25ea47919b1560c4e3b7fe0aaab9becf5b84a10325ddf7db0f0ba5e1026499" -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2fb860ca6fafa5552fb6d0e816a69c8e49f0908bf524e30a90d97c85892d506" dependencies = [ - "block-buffer 0.10.2", + "block-buffer", "crypto-common", "subtle", ] @@ -495,7 +483,7 @@ dependencies = [ "base16ct", "crypto-bigint", "der", - "digest 0.10.3", + "digest", "ff", "generic-array", "group", @@ -781,7 +769,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.3", + "digest", ] [[package]] @@ -879,9 +867,9 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.17.1" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f084a526233000cc9c08ab1cb95e59a03d300fae638c185785d1daa1256cc9c8" +checksum = "665da6fb50b32661c306ddc538ee5aa6f6d68f3d54b1649c1595403acaa552cb" dependencies = [ "async-trait", "base32", @@ -907,7 +895,7 @@ dependencies = [ "serde", "serde_bytes", "serde_cbor", - "sha2 0.10.2", + "sha2", "simple_asn1", "thiserror", "url", @@ -915,24 +903,24 @@ dependencies = [ [[package]] name = "ic-types" -version = "0.3.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e78ec6f58886cdc252d6f912dc794211bd6bbc39ddc9dcda434b2dc16c335b3" +checksum = "82e9cac29df1f2906137c327ed24dfc398460eda054abaa6107273c11afe6384" dependencies = [ - "base32", "crc32fast", + "data-encoding", "hex", "serde", "serde_bytes", - "sha2 0.9.9", + "sha2", "thiserror", ] [[package]] name = "ic-utils" -version = "0.17.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f84ea6aad8345896eb336fe2757cbe14a8c476a0e586403b84a61a2106053cd" +checksum = "e2ff623519da2958ce6c4c8623ef5530db7878ef0082556b3c1cc1cfde7ba9d6" dependencies = [ "async-trait", "candid", @@ -979,7 +967,7 @@ dependencies = [ "serde", "serde_cbor", "serde_json", - "sha2 0.10.2", + "sha2", "slog", "slog-async", "slog-term", @@ -1057,7 +1045,7 @@ dependencies = [ "cfg-if", "ecdsa", "elliptic-curve", - "sha2 0.10.2", + "sha2", ] [[package]] @@ -1341,12 +1329,6 @@ version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl" version = "0.10.38" @@ -2013,19 +1995,6 @@ dependencies = [ "serde", ] -[[package]] -name = "sha2" -version = "0.9.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" -dependencies = [ - "block-buffer 0.9.0", - "cfg-if", - "cpufeatures", - "digest 0.9.0", - "opaque-debug", -] - [[package]] name = "sha2" version = "0.10.2" @@ -2034,7 +2003,7 @@ checksum = "55deaec60f81eefe3cce0dc50bda92d6d8e88f2a27df7c5033b42afeb1ed2676" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.3", + "digest", ] [[package]] @@ -2052,7 +2021,7 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f054c6c1a6e95179d6f23ed974060dcefb2d9388bb7256900badad682c499de4" dependencies = [ - "digest 0.10.3", + "digest", "rand_core", ] diff --git a/Cargo.toml b/Cargo.toml index a4c49b8..356b3e7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -30,8 +30,8 @@ http-body = "0.4.5" hyper = { version = "0.14", features = ["full"] } hyper-rustls = { version = "0.23", features = [ "webpki-roots" ] } hyper-tls = "0.5" -ic-agent = "0.17.1" -ic-utils = { version = "0.17", features = ["raw"] } +ic-agent = "0.20" +ic-utils = { version = "0.20", features = ["raw"] } lazy-regex = "2" opentelemetry = "0.17.0" opentelemetry-prometheus = "0.10.0" diff --git a/rust-toolchain b/rust-toolchain index 69478d1..4d5fde5 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.58.1 +1.60.0