From 0683b5440c318723a2f1fc5931074313d52c922b Mon Sep 17 00:00:00 2001 From: Hamish Peebles Date: Sun, 17 Sep 2023 23:16:23 +0100 Subject: [PATCH] Bump ic-utils + ic-agent --- Cargo.lock | 63 +++++++++++++++++--------------- Cargo.toml | 21 ++--------- src/dfx-core/src/identity/mod.rs | 4 ++ 3 files changed, 41 insertions(+), 47 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de67973bdc..4714d2a61c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -729,16 +729,17 @@ dependencies = [ [[package]] name = "candid" -version = "0.9.1" +version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4df671c37a9c6168db0334f2b289dd4e02dea1bbefe1fb22c5d43b12d865aacd" +checksum = "88f6eec0ae850e006ef0fe306f362884d370624094ec55a6a26de18b251774be" dependencies = [ "anyhow", "arbitrary", "binread", "byteorder", - "candid_derive 0.6.2", + "candid_derive 0.6.3", "codespan-reporting", + "convert_case 0.6.0", "crc32fast", "data-encoding", "fake", @@ -775,9 +776,9 @@ dependencies = [ [[package]] name = "candid_derive" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810b3bd60244f282090652ffc7c30a9d23892e72dfe443e46ee55569044f7dd5" +checksum = "158403ea38fab5904ae47a5d67eb7047650a91681407f5ccbcbcabc4f4ffb489" dependencies = [ "lazy_static", "proc-macro2", @@ -1315,7 +1316,7 @@ dependencies = [ "base64 0.13.1", "byte-unit", "bytes", - "candid 0.9.1", + "candid 0.9.6", "clap", "console", "crc32fast", @@ -1336,7 +1337,7 @@ dependencies = [ "ic-agent", "ic-asset", "ic-identity-hsm", - "ic-utils 0.25.0", + "ic-utils 0.27.0", "ic-wasm", "indicatif", "itertools 0.10.5", @@ -1394,7 +1395,7 @@ dependencies = [ "bip32", "byte-unit", "bytes", - "candid 0.9.1", + "candid 0.9.6", "clap", "dialoguer", "directories-next", @@ -1403,7 +1404,7 @@ dependencies = [ "humantime-serde", "ic-agent", "ic-identity-hsm", - "ic-utils 0.25.0", + "ic-utils 0.27.0", "k256 0.11.6", "keyring", "lazy_static", @@ -2345,16 +2346,17 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.25.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=6d923cbc918852ef5bfaeb08e63c86580aa80ffe#6d923cbc918852ef5bfaeb08e63c86580aa80ffe" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65c513a595191149b26e562c580616118216b66d8183fe15d87b00794893d2a9" dependencies = [ "backoff", - "candid 0.9.1", + "candid 0.9.6", "futures-util", "hex", "http", "http-body", - "ic-certification 0.25.0", + "ic-certification 0.27.0", "ic-verify-bls-signature", "k256 0.13.1", "leb128", @@ -2363,7 +2365,7 @@ dependencies = [ "rand", "reqwest", "ring", - "rustls 0.20.8", + "rustls-webpki", "sec1 0.7.2", "serde", "serde_bytes", @@ -2382,7 +2384,7 @@ name = "ic-asset" version = "0.20.0" dependencies = [ "backoff", - "candid 0.9.1", + "candid 0.9.6", "derivative", "dfx-core", "flate2", @@ -2391,7 +2393,7 @@ dependencies = [ "globset", "hex", "ic-agent", - "ic-utils 0.25.0", + "ic-utils 0.27.0", "itertools 0.10.5", "json5", "mime", @@ -2457,7 +2459,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "08d4c0b932bf454d5d60e61e13c3c944972fcfd74dc82b9ed5c8b0a75979cf50" dependencies = [ - "candid 0.9.1", + "candid 0.9.6", "ic-cdk-macros", "ic0", "serde", @@ -2470,7 +2472,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4587624e64b8db56224033ee74e5c246d39be15375d03d3df7c117d49d18487" dependencies = [ - "candid 0.9.1", + "candid 0.9.6", "proc-macro2", "quote", "serde", @@ -2490,8 +2492,9 @@ dependencies = [ [[package]] name = "ic-certification" -version = "0.25.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=6d923cbc918852ef5bfaeb08e63c86580aa80ffe#6d923cbc918852ef5bfaeb08e63c86580aa80ffe" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1120544357d4d2f7540dd5290b952c6305afe24c9620d423e2239560adca2535" dependencies = [ "hex", "serde", @@ -2504,7 +2507,7 @@ name = "ic-certified-assets" version = "0.2.5" dependencies = [ "base64 0.13.1", - "candid 0.9.1", + "candid 0.9.6", "hex", "ic-cdk", "ic-certified-map", @@ -2709,8 +2712,9 @@ dependencies = [ [[package]] name = "ic-identity-hsm" -version = "0.25.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=6d923cbc918852ef5bfaeb08e63c86580aa80ffe#6d923cbc918852ef5bfaeb08e63c86580aa80ffe" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c4ca27717106f1b38a330b36e512ee2ec111a5c5117d4c86ecf7573f185c1dd" dependencies = [ "hex", "ic-agent", @@ -2864,11 +2868,12 @@ dependencies = [ [[package]] name = "ic-utils" -version = "0.25.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=6d923cbc918852ef5bfaeb08e63c86580aa80ffe#6d923cbc918852ef5bfaeb08e63c86580aa80ffe" +version = "0.27.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a66f0ad5758eca6dec21171f77d2164339316d23cef64afb747afcffddb22c0" dependencies = [ "async-trait", - "candid 0.9.1", + "candid 0.9.6", "ic-agent", "once_cell", "semver", @@ -2899,7 +2904,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e360e45c2bf406a867c35ec5daee433f2c3bbbaf013469e6a386a322a9713885" dependencies = [ "anyhow", - "candid 0.9.1", + "candid 0.9.6", "clap", "rustc-demangle", "tempfile", @@ -2935,13 +2940,13 @@ version = "0.20.0" dependencies = [ "anstyle", "anyhow", - "candid 0.9.1", + "candid 0.9.6", "clap", "delay", "humantime", "ic-agent", "ic-asset", - "ic-utils 0.25.0", + "ic-utils 0.27.0", "libflate", "num-traits", "pem 1.1.1", diff --git a/Cargo.toml b/Cargo.toml index 67102858d3..b0ae1d04ff 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,11 +18,11 @@ license = "Apache-2.0" [workspace.dependencies] candid = "0.9.0" -ic-agent = "0.25.0" +ic-agent = "0.27.0" ic-asset = { path = "src/canisters/frontend/ic-asset" } ic-cdk = "0.10.0" -ic-identity-hsm = "0.25.0" -ic-utils = "0.25.0" +ic-identity-hsm = "0.27.0" +ic-utils = "0.27.0" aes-gcm = "0.9.4" anyhow = "1.0.56" @@ -67,21 +67,6 @@ tokio = "1.24.2" url = "2.1.0" walkdir = "2.3.2" -[patch.crates-io.ic-agent] -version = "0.25.0" -git = "https://github.com/dfinity/agent-rs.git" -rev = "6d923cbc918852ef5bfaeb08e63c86580aa80ffe" - -[patch.crates-io.ic-identity-hsm] -version = "0.25.0" -git = "https://github.com/dfinity/agent-rs.git" -rev = "6d923cbc918852ef5bfaeb08e63c86580aa80ffe" - -[patch.crates-io.ic-utils] -version = "0.25.0" -git = "https://github.com/dfinity/agent-rs.git" -rev = "6d923cbc918852ef5bfaeb08e63c86580aa80ffe" - [profile.release] panic = 'abort' lto = true diff --git a/src/dfx-core/src/identity/mod.rs b/src/dfx-core/src/identity/mod.rs index 44cb4b7fe2..a888f42464 100644 --- a/src/dfx-core/src/identity/mod.rs +++ b/src/dfx-core/src/identity/mod.rs @@ -249,6 +249,10 @@ impl ic_agent::Identity for Identity { self.inner.sender() } + fn public_key(&self) -> Option> { + self.inner.public_key() + } + fn sign(&self, content: &EnvelopeContent) -> Result { self.inner.sign(content) }