From c4f1ef3844dc48bcf305cdba33e5c656a06dae6c Mon Sep 17 00:00:00 2001 From: Eric Swanson <64809312+ericswanson-dfinity@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:50:28 -0800 Subject: [PATCH 1/4] chore: promote dfx 0.24.3 (#4024) * chore: update Motoko version to 0.13.4 (#4022) --------- Signed-off-by: Eric Swanson Co-authored-by: DFINITY bot <58022693+dfinity-bot@users.noreply.github.com> --- CHANGELOG.md | 2 +- Cargo.lock | 2 +- nix/sources.json | 18 +++++++++--------- public/manifest.json | 5 +++-- src/dfx/Cargo.toml | 2 +- src/dfx/assets/dfx-asset-sources.toml | 16 ++++++++-------- 6 files changed, 23 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3145adec2c..08f5ab11d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -101,7 +101,7 @@ You must open a new terminal to continue developing. If you'd prefer to stop, qu ### Motoko -Updated Motoko to [0.13.3](https://github.com/dfinity/motoko/releases/tag/0.13.3) +Updated Motoko to [0.13.4](https://github.com/dfinity/motoko/releases/tag/0.13.4) ### Replica diff --git a/Cargo.lock b/Cargo.lock index 8acb851d04..9aad469300 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1514,7 +1514,7 @@ checksum = "322ef0094744e63628e6f0eb2295517f79276a5b342a4c2ff3042566ca181d4e" [[package]] name = "dfx" -version = "0.24.2" +version = "0.24.3" dependencies = [ "actix", "aes-gcm", diff --git a/nix/sources.json b/nix/sources.json index 79f8cf4d8b..4ebf7df966 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -130,27 +130,27 @@ "builtin": false, "description": "The Motoko base library", "owner": "dfinity", - "sha256": "0i2jrys9qj6w776f3nrifhvs7s4rrhwlnqmd7dlawd0qk8ns4zk9", + "sha256": "0z3w3yv0kbnkcyqbasbcvi0505vnh5d94jmnv0pw6wy5f75gjq86", "type": "tarball", - "url": "https://github.com/dfinity/motoko/releases/download/0.13.3/motoko-base-library.tar.gz", + "url": "https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-base-library.tar.gz", "url_template": "https://github.com/dfinity/motoko/releases/download//motoko-base-library.tar.gz", - "version": "0.13.3" + "version": "0.13.4" }, "motoko-x86_64-darwin": { "builtin": false, - "sha256": "0c4njswid1z3aw298y2vd7sx618ijb8ixgjsh99vlazm9yai5wi1", + "sha256": "1i3yx0yxr1v1i2r8g4sskvn34bsiq0jjsa8i8qhmlyp8cc9pnkk7", "type": "file", - "url": "https://github.com/dfinity/motoko/releases/download/0.13.3/motoko-Darwin-x86_64-0.13.3.tar.gz", + "url": "https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-Darwin-x86_64-0.13.4.tar.gz", "url_template": "https://github.com/dfinity/motoko/releases/download//motoko-Darwin-x86_64-.tar.gz", - "version": "0.13.3" + "version": "0.13.4" }, "motoko-x86_64-linux": { "builtin": false, - "sha256": "110hx0da5bspv4ida3xwf2mpiwmn6axq8cnnq0vinzfrajb5r2qm", + "sha256": "0ks7h8q1js2li07k3p8aj7j9nyizys9dyzf1ks7wsbz4i7gwpbbz", "type": "file", - "url": "https://github.com/dfinity/motoko/releases/download/0.13.3/motoko-Linux-x86_64-0.13.3.tar.gz", + "url": "https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-Linux-x86_64-0.13.4.tar.gz", "url_template": "https://github.com/dfinity/motoko/releases/download//motoko-Linux-x86_64-.tar.gz", - "version": "0.13.3" + "version": "0.13.4" }, "pocket-ic-x86_64-darwin": { "rev": "a62848817cec7ae50618a87a526c85d020283fd9", diff --git a/public/manifest.json b/public/manifest.json index eb8d44fcfb..624dd84a90 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,6 +1,6 @@ { "tags": { - "latest": "0.24.2" + "latest": "0.24.3" }, "versions": [ "0.5.0", @@ -74,6 +74,7 @@ "0.23.0", "0.24.0", "0.24.1", - "0.24.2" + "0.24.2", + "0.24.3" ] } diff --git a/src/dfx/Cargo.toml b/src/dfx/Cargo.toml index 34a0f5480b..2f147c6542 100644 --- a/src/dfx/Cargo.toml +++ b/src/dfx/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dfx" -version = "0.24.2" +version = "0.24.3" authors.workspace = true edition.workspace = true repository.workspace = true diff --git a/src/dfx/assets/dfx-asset-sources.toml b/src/dfx/assets/dfx-asset-sources.toml index 1940059a57..754bac79a0 100644 --- a/src/dfx/assets/dfx-asset-sources.toml +++ b/src/dfx/assets/dfx-asset-sources.toml @@ -22,8 +22,8 @@ url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283 sha256 = 'f999d8a7e582bee1dce787d36224f749cf17d52c0623e0752cdbffba47879f4c' [x86_64-darwin.motoko] -url = 'https://github.com/dfinity/motoko/releases/download/0.13.3/motoko-Darwin-x86_64-0.13.3.tar.gz' -sha256 = '21f212954ff52bba53825abe1ed1921105d3f5695b78940457e38716b9969630' +url = 'https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-Darwin-x86_64-0.13.4.tar.gz' +sha256 = '674e7b1363e87a5a214611292d25c0512f32ec9e5a9387b2886187dc3de87ec4' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-darwin.replica] @@ -53,8 +53,8 @@ url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283 sha256 = 'fd47abe1876c3bf08246f97908c6badb3cf84ca402d8f4015759883d69689af6' [x86_64-darwin.motoko-base] -url = 'https://github.com/dfinity/motoko/releases/download/0.13.3/motoko-base-library.tar.gz' -sha256 = 'e48cb7ea6685f5afcfc189f7f3292ca015dda5e1b4c19fb30c7f1211f8733adc' +url = 'https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-base-library.tar.gz' +sha256 = '1dfac29c1422f5426dc0cb35df4562dd750f3ad9b3859fbf066a5972457f9146' [x86_64-darwin.ic-btc-canister] url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz' @@ -81,8 +81,8 @@ url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283 sha256 = 'a13497bf7d255b3a235b14967934ec766a93dca1b410ce953880d86fb4b5c422' [x86_64-linux.motoko] -url = 'https://github.com/dfinity/motoko/releases/download/0.13.3/motoko-Linux-x86_64-0.13.3.tar.gz' -sha256 = '158b5c9654d97d1b37c0d63284bb32b6f278ab70bc0fd522d957afa21ae81084' +url = 'https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-Linux-x86_64-0.13.4.tar.gz' +sha256 = '7fadcbdf89e42fcd8f9ec17ddf92f63f7a9be4910add310f885468193082474f' # The replica, canister_sandbox and compiler_sandbox binaries must have the same revision. [x86_64-linux.replica] @@ -112,8 +112,8 @@ url = 'https://download.dfinity.systems/ic/a62848817cec7ae50618a87a526c85d020283 sha256 = '7b14e2a196dd24ab171990ea755746f4b8c0776eaca64951be4150f83c019099' [x86_64-linux.motoko-base] -url = 'https://github.com/dfinity/motoko/releases/download/0.13.3/motoko-base-library.tar.gz' -sha256 = 'e48cb7ea6685f5afcfc189f7f3292ca015dda5e1b4c19fb30c7f1211f8733adc' +url = 'https://github.com/dfinity/motoko/releases/download/0.13.4/motoko-base-library.tar.gz' +sha256 = '1dfac29c1422f5426dc0cb35df4562dd750f3ad9b3859fbf066a5972457f9146' [x86_64-linux.ic-btc-canister] url = 'https://github.com/dfinity/bitcoin-canister/releases/download/release%2F2023-10-13/ic-btc-canister.wasm.gz' From e73ffdb20543b9e702969b9e701c7d0d210f513e Mon Sep 17 00:00:00 2001 From: Eric Swanson <64809312+ericswanson-dfinity@users.noreply.github.com> Date: Tue, 3 Dec 2024 11:50:46 -0800 Subject: [PATCH 2/4] chore: promote dfx 0.24.3 (#4024) * chore: update Motoko version to 0.13.4 (#4022) --------- Signed-off-by: Eric Swanson Co-authored-by: DFINITY bot <58022693+dfinity-bot@users.noreply.github.com> From 2ec6162d94dd312e1343c7bff5d88bb8fdd19c60 Mon Sep 17 00:00:00 2001 From: Andre Popovitch Date: Tue, 3 Dec 2024 14:57:26 -0600 Subject: [PATCH 3/4] chore: update ic-agent to 0.39 (#4025) --- Cargo.lock | 40 ++++++++++--------- Cargo.toml | 6 +-- src/dfx/src/commands/canister/call.rs | 3 +- .../src/commands/canister/request_status.rs | 6 +-- src/dfx/src/commands/canister/send.rs | 2 +- src/dfx/src/lib/environment.rs | 2 +- 6 files changed, 32 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9aad469300..56e3888b1e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1552,7 +1552,7 @@ dependencies = [ "ic-asset", "ic-cdk", "ic-identity-hsm", - "ic-utils 0.38.0", + "ic-utils 0.39.0", "ic-wasm", "icrc-ledger-types", "idl2json", @@ -1627,7 +1627,7 @@ dependencies = [ "humantime-serde", "ic-agent", "ic-identity-hsm", - "ic-utils 0.38.0", + "ic-utils 0.39.0", "itertools 0.10.5", "k256 0.11.6", "keyring", @@ -2674,23 +2674,27 @@ dependencies = [ [[package]] name = "ic-agent" -version = "0.38.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def8c34690d68caa452486af1fff4782d2f5a9d4c5b4e0e1afca648c616fa380" +checksum = "158138fcb769fe6288e63d5db221c904e472cfb7d376aba13a38c060f2984e63" dependencies = [ "async-lock 3.3.0", + "async-trait", "backoff", "cached 0.52.0", "candid", + "der 0.7.9", + "ecdsa 0.16.9", "ed25519-consensus", + "elliptic-curve 0.13.8", "futures-util", "hex", "http 1.1.0", "http-body 1.0.0", "ic-certification 2.6.0", - "ic-transport-types 0.38.0", + "ic-transport-types 0.39.1", "ic-verify-bls-signature", - "k256 0.13.3", + "k256 0.13.4", "leb128", "p256", "pem 3.0.4", @@ -2698,8 +2702,6 @@ dependencies = [ "rand", "rangemap", "reqwest", - "ring 0.17.8", - "rustls-webpki 0.102.3", "sec1 0.7.3", "serde", "serde_bytes", @@ -2710,6 +2712,7 @@ dependencies = [ "thiserror", "time", "tokio", + "tower-service", "url", ] @@ -2728,7 +2731,7 @@ dependencies = [ "globset", "hex", "ic-agent", - "ic-utils 0.38.0", + "ic-utils 0.39.0", "itertools 0.10.5", "json5", "mime", @@ -3115,9 +3118,9 @@ dependencies = [ [[package]] name = "ic-identity-hsm" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9975ba49e50ccf10d8268b168b9a35da165904f56725a333e8294d7e5f1d92" +checksum = "8722411845f0a4b2c526b906049d45f87c62c78ddf1c38ecdc03ecbd34ffc1d6" dependencies = [ "hex", "ic-agent", @@ -3233,9 +3236,9 @@ dependencies = [ [[package]] name = "ic-transport-types" -version = "0.38.0" +version = "0.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1834f2f91324b7263e0a05b95d385fd109b51efec991f053112d8cd2503d6e" +checksum = "2d8789a5c176bb1b925fa58ca97c651a3995d504e76101e93d2a17f558bdcf66" dependencies = [ "candid", "hex", @@ -3243,6 +3246,7 @@ dependencies = [ "leb128", "serde", "serde_bytes", + "serde_cbor", "serde_repr", "sha2 0.10.8", "thiserror", @@ -3303,9 +3307,9 @@ dependencies = [ [[package]] name = "ic-utils" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75135bc8838398f2b4a512b900ee1d58fbf34bdedb74aedc0ae772e785535814" +checksum = "bb1da4a68c45146018b8496c157ad94126b9c202ab4400c6c0a9030c1ef0f0ba" dependencies = [ "async-trait", "candid", @@ -3434,7 +3438,7 @@ dependencies = [ "humantime", "ic-agent", "ic-asset", - "ic-utils 0.38.0", + "ic-utils 0.39.0", "libflate 1.4.0", "num-traits", "pem 1.1.1", @@ -3682,9 +3686,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", "ecdsa 0.16.9", diff --git a/Cargo.toml b/Cargo.toml index 44f79885b3..64208950bf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,11 +22,11 @@ license = "Apache-2.0" candid = "0.10.4" candid_parser = "0.1.4" dfx-core = { path = "src/dfx-core", version = "0.1.0" } -ic-agent = "0.38" +ic-agent = "0.39" ic-asset = { path = "src/canisters/frontend/ic-asset", version = "0.21.0" } ic-cdk = "0.13.1" -ic-identity-hsm = "0.38" -ic-utils = "0.38" +ic-identity-hsm = "0.39" +ic-utils = "0.39" aes-gcm = "0.10.3" anyhow = "1.0.56" diff --git a/src/dfx/src/commands/canister/call.rs b/src/dfx/src/commands/canister/call.rs index 4157f5c2bc..1a740f7307 100644 --- a/src/dfx/src/commands/canister/call.rs +++ b/src/dfx/src/commands/canister/call.rs @@ -358,7 +358,8 @@ To figure out the id of your wallet, run 'dfx identity get-wallet (--network ic) .with_arg(arg_value) .call() .await - .context("Failed update call.")?, + .context("Failed update call.")? + .map(|(res, _)| res), CallSender::Wallet(wallet_id) => { let wallet = build_wallet_canister(*wallet_id, agent).await?; let mut args = Argument::default(); diff --git a/src/dfx/src/commands/canister/request_status.rs b/src/dfx/src/commands/canister/request_status.rs index c481bcf798..bcc81b75e6 100644 --- a/src/dfx/src/commands/canister/request_status.rs +++ b/src/dfx/src/commands/canister/request_status.rs @@ -50,11 +50,11 @@ pub async fn exec(env: &dyn Environment, opts: RequestStatusOpts) -> DfxResult { let blob = async { let mut request_accepted = false; loop { - match agent + let (response, _cert) = agent .request_status_raw(&request_id, canister_id) .await - .context("Failed to fetch request status.")? - { + .context("Failed to fetch request status.")?; + match response { RequestStatusResponse::Replied(reply) => return Ok(reply.arg), RequestStatusResponse::Rejected(response) => { return Err(DfxError::new(AgentError::CertifiedReject(response))) diff --git a/src/dfx/src/commands/canister/send.rs b/src/dfx/src/commands/canister/send.rs index 94111dd58a..93bf612560 100644 --- a/src/dfx/src/commands/canister/send.rs +++ b/src/dfx/src/commands/canister/send.rs @@ -57,7 +57,7 @@ pub async fn exec( let request_id = request_id .parse::() .context("Failed to decode request ID.")?; - let response = agent + let (response, _cert) = agent .request_status_signed(&request_id, canister_id, envelope) .await .with_context(|| format!("Failed to read canister state of {}.", canister_id))?; diff --git a/src/dfx/src/lib/environment.rs b/src/dfx/src/lib/environment.rs index 6962f5d975..f1535949af 100644 --- a/src/dfx/src/lib/environment.rs +++ b/src/dfx/src/lib/environment.rs @@ -418,7 +418,7 @@ pub fn create_agent( .with_url(url) .with_boxed_identity(identity) .with_verify_query_signatures(!disable_query_verification) - .with_ingress_expiry(Some(timeout)) + .with_ingress_expiry(timeout) .build()?; Ok(agent) } From 065a8e99a5daea1df0bcd56cc80f53fbe9675bbc Mon Sep 17 00:00:00 2001 From: Eric Swanson <64809312+ericswanson-dfinity@users.noreply.github.com> Date: Tue, 3 Dec 2024 15:21:57 -0800 Subject: [PATCH 4/4] chore: dfx-core 0.1.2 (#4026) * chore: dfx-core 0.1.2 * cargo update * Revert "cargo update" This reverts commit 6d6b32f26f2c775718ce3c629f1d81c45f9124c6. * cargo update --- Cargo.lock | 2 +- src/dfx-core/CHANGELOG.md | 4 ++++ src/dfx-core/Cargo.toml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 56e3888b1e..f0e70fcfc6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1607,7 +1607,7 @@ dependencies = [ [[package]] name = "dfx-core" -version = "0.1.1" +version = "0.1.2" dependencies = [ "aes-gcm", "argon2", diff --git a/src/dfx-core/CHANGELOG.md b/src/dfx-core/CHANGELOG.md index 8caf055ffc..6fa84f7213 100644 --- a/src/dfx-core/CHANGELOG.md +++ b/src/dfx-core/CHANGELOG.md @@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + + - updated ic-agent dependency to 0.39 + ## [0.1.1] - 2024-11-08 ### Added diff --git a/src/dfx-core/Cargo.toml b/src/dfx-core/Cargo.toml index 577b717fbf..3138270f51 100644 --- a/src/dfx-core/Cargo.toml +++ b/src/dfx-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dfx-core" -version = "0.1.1" +version = "0.1.2" authors.workspace = true edition.workspace = true repository.workspace = true