Merge branch 'master' into vincent/SDK-1868

dfinity · Dec 3, 2024 · 6b5b2b1 · 6b5b2b1
2 parents 0c9b12f + 065a8e9
commit 6b5b2b1
Show file tree

Hide file tree

Showing 13 changed files with 61 additions and 51 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -117,7 +117,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
diff --git 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/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/<version>/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/<version>/motoko-Darwin-x86_64-<version>.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/<version>/motoko-Linux-x86_64-<version>.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
@@ -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-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
@@ -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

diff --git 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
@@ -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'

diff --git 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
@@ -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
@@ -57,7 +57,7 @@ pub async fn exec(
         let request_id = request_id
             .parse::<RequestId>()
             .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
@@ -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)
 }