diff --git a/Cargo.lock b/Cargo.lock index 1d1773b457..34892e4d01 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -344,6 +344,20 @@ dependencies = [ "generic-array", ] +[[package]] +name = "bls12_381" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62250ece575fa9b22068b3a8d59586f01d426dd7785522efd97632959e71c986" +dependencies = [ + "digest 0.9.0", + "ff", + "group", + "pairing", + "rand_core", + "subtle", +] + [[package]] name = "bs58" version = "0.4.0" @@ -392,9 +406,9 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db" [[package]] name = "candid" -version = "0.7.16" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e4287605536419ac6ce9d76d3aa5733677ca8c7c2891079b2c71a345cc17a3" +checksum = "00748d2466ccd456787852ce1c3bd8d47f946639b46fd0fd2e728c3bb23d307f" dependencies = [ "anyhow", "arbitrary", @@ -402,9 +416,10 @@ dependencies = [ "byteorder", "candid_derive", "codespan-reporting", + "crc32fast", + "data-encoding", "fake", "hex", - "ic-types", "lalrpop", "lalrpop-util", "leb128", @@ -418,14 +433,15 @@ dependencies = [ "serde", "serde_bytes", "serde_dhall", + "sha2 0.10.6", "thiserror", ] [[package]] name = "candid_derive" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e02c03c4d547674a3f3f3109538fb49871fbe636216daa019f06a62faca9061" +checksum = "58f1f4db7c7d04b87b70b3a35c5dc5c2c9dd73cef8bdf6760e2f18a0d45350dd" dependencies = [ "lazy_static", "proc-macro2", @@ -806,14 +822,15 @@ dependencies = [ [[package]] name = "dhall" -version = "0.10.1" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a7d7b648a24d2edd4ba9f31fe42c831080522d1cf35bca3522887ba0d802745" +checksum = "9093ee48621ca9db16cd4948c7acf24a8ecc9af41cc9e226e39ea719df06d8b5" dependencies = [ "abnf_to_pest", "annotate-snippets", "elsa", "hex", + "home", "itertools 0.9.0", "lazy_static", "once_cell", @@ -830,9 +847,9 @@ dependencies = [ [[package]] name = "dhall_proc_macros" -version = "0.5.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f64ba6f41d9b223e2e1d7c97a1145a1aa03e57d65e1c9c2baa29f194caf322c9" +checksum = "df7c81d16870879ef530b07cef32bc6088f98937ab4168106cc8e382a05146bf" dependencies = [ "proc-macro2", "quote", @@ -1261,6 +1278,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7391856def869c1c81063a03457c676fbcd419709c3dfb33d8d319de484b154d" dependencies = [ + "byteorder", "ff", "rand_core", "subtle", @@ -1353,6 +1371,15 @@ dependencies = [ "digest 0.10.5", ] +[[package]] +name = "home" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" +dependencies = [ + "winapi", +] + [[package]] name = "http" version = "0.2.8" @@ -1458,20 +1485,21 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.20.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=2da883fc92eab3422c9b89bcec3966d06ddf0ae7#2da883fc92eab3422c9b89bcec3966d06ddf0ae7" +version = "0.21.0" +source = "git+https://github.com/dfinity/agent-rs.git?rev=0edc96addbc65d422de71fc119a3de3154eac5c3#0edc96addbc65d422de71fc119a3de3154eac5c3" dependencies = [ "async-trait", "base32", "base64", "byteorder", + "candid", "futures-util", "garcon", "hex", "http", "http-body", "hyper-rustls", - "ic-types", + "ic-verify-bls-signature", "k256", "leb128", "mime", @@ -1521,9 +1549,9 @@ dependencies = [ [[package]] name = "ic-cdk" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ebabbd2e082472e93928ec9725a5aeec4572284e07bf399f3e1eb6a358a4ba6" +checksum = "6c9fa78e0f867e55fc149197a9b816d506314c705ea56240f72ae22da1bfdfd6" dependencies = [ "candid", "cfg-if 1.0.0", @@ -1532,9 +1560,9 @@ dependencies = [ [[package]] name = "ic-cdk-macros" -version = "0.5.6" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d453dcbe269b19ebd9b3a377819c9f32b3c5c99c3dd42bfd6789600aa77b510c" +checksum = "d8892fce3ea7890f91a118496070bf501defcb730f98079b50fe137ebdd7a939" dependencies = [ "candid", "ic-cdk", @@ -1584,8 +1612,8 @@ dependencies = [ [[package]] name = "ic-identity-hsm" -version = "0.20.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=2da883fc92eab3422c9b89bcec3966d06ddf0ae7#2da883fc92eab3422c9b89bcec3966d06ddf0ae7" +version = "0.21.0" +source = "git+https://github.com/dfinity/agent-rs.git?rev=0edc96addbc65d422de71fc119a3de3154eac5c3#0edc96addbc65d422de71fc119a3de3154eac5c3" dependencies = [ "hex", "ic-agent", @@ -1596,25 +1624,10 @@ dependencies = [ "thiserror", ] -[[package]] -name = "ic-types" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a7d9569a4c91d5c9c202c1666f799a9761bab70a2b59464ee78c45b005e47b8" -dependencies = [ - "crc32fast", - "data-encoding", - "hex", - "serde", - "serde_bytes", - "sha2 0.10.6", - "thiserror", -] - [[package]] name = "ic-utils" -version = "0.20.0" -source = "git+https://github.com/dfinity/agent-rs.git?rev=2da883fc92eab3422c9b89bcec3966d06ddf0ae7#2da883fc92eab3422c9b89bcec3966d06ddf0ae7" +version = "0.21.0" +source = "git+https://github.com/dfinity/agent-rs.git?rev=0edc96addbc65d422de71fc119a3de3154eac5c3#0edc96addbc65d422de71fc119a3de3154eac5c3" dependencies = [ "async-trait", "candid", @@ -1632,16 +1645,27 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ic-verify-bls-signature" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "583b1c03380cf86059160cc6c91dcbf56c7b5f141bf3a4f06bc79762d775fac4" +dependencies = [ + "bls12_381", + "lazy_static", + "pairing", + "sha2 0.9.9", +] + [[package]] name = "ic-wasm" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6bcb4b8c4455f08fe0c2671fa815affbec6b3eee631f61bd9adcd287bfbc4a2" +checksum = "29aa8bc21f2af958b5d96ee49eaf5c432636724556e1fdf103e01917f04b667f" dependencies = [ "anyhow", "candid", "clap", - "ic-types", "thiserror", "walrus", ] @@ -2219,6 +2243,15 @@ version = "6.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ff7415e9ae3fff1225851df9e0d9e4e5479f947619774677a63572e55e80eff" +[[package]] +name = "pairing" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "135590d8bdba2b31346f9cd1fb2a912329f5135e832a4f422942eb6ead8b6b3b" +dependencies = [ + "group", +] + [[package]] name = "parking_lot" version = "0.11.2" @@ -2998,9 +3031,9 @@ dependencies = [ [[package]] name = "serde_dhall" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1393976875f3080d8cd1ff54083129e2e6a30d7a62582b67c3eb5924789e8e75" +checksum = "77c01a6b1d6f9f33bb1ad5652249e938297e43a1f43418236f7b72e64837e347" dependencies = [ "dhall", "dhall_proc_macros", diff --git a/Cargo.toml b/Cargo.toml index d98e0fd95b..18c2f830bc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,23 +9,19 @@ members = [ default-members = ["src/dfx"] [patch.crates-io.ic-agent] -version = "0.20.0" +version = "0.21.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "2da883fc92eab3422c9b89bcec3966d06ddf0ae7" - -[patch.crates-io.ic-asset] -version = "0.20.0" -path = "src/canisters/frontend/ic-asset" +rev = "0edc96addbc65d422de71fc119a3de3154eac5c3" [patch.crates-io.ic-identity-hsm] -version = "0.20.0" +version = "0.21.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "2da883fc92eab3422c9b89bcec3966d06ddf0ae7" +rev = "0edc96addbc65d422de71fc119a3de3154eac5c3" [patch.crates-io.ic-utils] -version = "0.20.0" +version = "0.21.0" git = "https://github.com/dfinity/agent-rs.git" -rev = "2da883fc92eab3422c9b89bcec3966d06ddf0ae7" +rev = "0edc96addbc65d422de71fc119a3de3154eac5c3" [profile.release] panic = 'abort' diff --git a/src/canisters/frontend/ic-asset/Cargo.toml b/src/canisters/frontend/ic-asset/Cargo.toml index 4a9df9a6ba..e286d49682 100644 --- a/src/canisters/frontend/ic-asset/Cargo.toml +++ b/src/canisters/frontend/ic-asset/Cargo.toml @@ -12,15 +12,15 @@ keywords = ["internet-computer", "assets", "icp", "dfinity"] [dependencies] anyhow = "1.0" -candid = "0.7.15" +candid = "0.8.2" flate2 = "1.0.22" futures = "0.3.21" futures-intrusive = "0.4.0" garcon = { version = "0.2", features = ["async"] } globset = "0.4.9" hex = { version = "0.4.2", features = ["serde"] } -ic-agent = { version = "0.20", features = [ "pem" ] } -ic-utils = "0.20" +ic-agent = { version = "0.21.0", features = [ "pem" ] } +ic-utils = "0.21.0" mime = "0.3.16" mime_guess = "2.0.4" serde = "1.0" diff --git a/src/canisters/frontend/ic-certified-assets/Cargo.toml b/src/canisters/frontend/ic-certified-assets/Cargo.toml index a7278e8172..194b491c30 100644 --- a/src/canisters/frontend/ic-certified-assets/Cargo.toml +++ b/src/canisters/frontend/ic-certified-assets/Cargo.toml @@ -12,10 +12,10 @@ keywords = ["internet-computer", "dfinity"] [dependencies] base64 = "0.13" -candid = "0.7.15" +candid = "0.8.2" hex = "0.4.3" -ic-cdk = "0.5" -ic-cdk-macros = "0.5" +ic-cdk = "0.6.0" +ic-cdk-macros = "0.6.0" ic-certified-map = "0.3" num-traits = "0.2.14" serde = "1" diff --git a/src/canisters/frontend/ic-frontend-canister/Cargo.toml b/src/canisters/frontend/ic-frontend-canister/Cargo.toml index 1570ee93cf..710222008d 100644 --- a/src/canisters/frontend/ic-frontend-canister/Cargo.toml +++ b/src/canisters/frontend/ic-frontend-canister/Cargo.toml @@ -15,5 +15,5 @@ crate-type = ["cdylib"] [dependencies] ic-certified-assets = { path = "../ic-certified-assets" } -ic-cdk = "0.5" -ic-cdk-macros = "0.5" +ic-cdk = "0.6.0" +ic-cdk-macros = "0.6.0" diff --git a/src/canisters/frontend/icx-asset/Cargo.toml b/src/canisters/frontend/icx-asset/Cargo.toml index a3fb600cc0..c8ccc262a6 100644 --- a/src/canisters/frontend/icx-asset/Cargo.toml +++ b/src/canisters/frontend/icx-asset/Cargo.toml @@ -12,14 +12,14 @@ keywords = ["internet-computer", "agent", "icp", "dfinity", "asset"] [dependencies] anyhow = "1.0.34" -candid = "0.7.15" +candid = "0.8.2" clap = { version = "3.0.14", features = ["derive", "cargo"] } delay = "0.3.1" garcon = "0.2.2" humantime = "2.0.1" -ic-agent = "0.20" -ic-asset = "0.20" -ic-utils = "0.20" +ic-agent = "0.21.0" +ic-asset = { path = "../ic-asset" } +ic-utils = "0.21.0" libflate = "1.2.0" num-traits = "0.2" pem = "1.0.1" diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 7f9ddb324b..837f3815a1 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -26,7 +26,7 @@ base64 = "0.13.0" bip32 = "0.4.0" byte-unit = { version = "4.0.14", features = ["serde"] } bytes = "1.2.1" -candid = { version = "0.7.15", features = [ "random" ] } +candid = { version = "0.8.2", features = [ "random" ] } clap = { version = "3.1.6", features = [ "derive" ] } console = "0.15.0" crc32fast = "1.3.2" @@ -44,8 +44,11 @@ hex = {version = "0.4.2", features = ["serde"] } humantime = "2.1.0" humantime-serde = "1.1.1" hyper-rustls = { version = "0.23.0", features = [ "webpki-roots", "http2" ] } +ic-agent = { version = "0.21.0", features = ["reqwest"] } ic-asset = { version = "0.20.0", path = "../canisters/frontend/ic-asset" } -ic-wasm = "0.2.0" +ic-identity-hsm = "0.21.0" +ic-utils = "0.21.0" +ic-wasm = "0.2.1" indicatif = "0.16.0" itertools = "0.10.3" k256 = { version = "0.11.4", features = ["pem"] } @@ -86,22 +89,6 @@ walkdir = "2.2.9" wasmparser = "0.87.0" which = "4.2.5" -[dependencies.ic-agent] -version = "0.20.0" -git = "https://github.com/dfinity/agent-rs.git" -rev = "2da883fc92eab3422c9b89bcec3966d06ddf0ae7" -features = ["reqwest"] - -[dependencies.ic-identity-hsm] -version = "0.20.0" -git = "https://github.com/dfinity/agent-rs.git" -rev = "2da883fc92eab3422c9b89bcec3966d06ddf0ae7" - -[dependencies.ic-utils] -version = "0.20.0" -git = "https://github.com/dfinity/agent-rs.git" -rev = "2da883fc92eab3422c9b89bcec3966d06ddf0ae7" - [dev-dependencies] env_logger = "0.9" proptest = "1.0" diff --git a/src/dfx/assets/new_project_rust_files/src/__project_name___backend/Cargo.toml b/src/dfx/assets/new_project_rust_files/src/__project_name___backend/Cargo.toml index 786fc8bcec..da4b003de9 100644 --- a/src/dfx/assets/new_project_rust_files/src/__project_name___backend/Cargo.toml +++ b/src/dfx/assets/new_project_rust_files/src/__project_name___backend/Cargo.toml @@ -9,6 +9,6 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -candid = "0.7.14" -ic-cdk = "0.5.2" -ic-cdk-macros = "0.5.2" +candid = "0.8.2" +ic-cdk = "0.6.0" +ic-cdk-macros = "0.6.0" diff --git a/src/dfx/src/lib/operations/ledger.rs b/src/dfx/src/lib/operations/ledger.rs index 1f5568ccab..27a932ed8f 100644 --- a/src/dfx/src/lib/operations/ledger.rs +++ b/src/dfx/src/lib/operations/ledger.rs @@ -1,6 +1,9 @@ use anyhow::{bail, ensure, Context}; use candid::{Encode, Principal}; -use ic_agent::{hash_tree::LookupResult, ic_types::HashTree, lookup_value, Agent}; +use ic_agent::{ + hash_tree::{HashTree, LookupResult}, + lookup_value, Agent, +}; use ic_utils::{call::SyncCall, Canister}; use crate::lib::{ diff --git a/src/distributed/assetstorage.wasm.gz b/src/distributed/assetstorage.wasm.gz index 6d4309489d..54aedf8705 100755 Binary files a/src/distributed/assetstorage.wasm.gz and b/src/distributed/assetstorage.wasm.gz differ