Update ic-agent to 0.24

Cargo.toml

@@ -18,12 +18,12 @@ license = "Apache-2.0"
 
 [workspace.dependencies]
 candid = "0.8.4"
-ic-agent = "0.23.1"
+ic-agent = "0.24.1"
 ic-asset = { path = "src/canisters/frontend/ic-asset" }
 ic-cdk = "0.8.0"
 ic-cdk-macros = "0.6.7"
-ic-identity-hsm = "0.23.1"
-ic-utils = "0.23.1"
+ic-identity-hsm = "0.24.1"
+ic-utils = "0.24.1"
 
 aes-gcm = "0.9.4"
 anyhow = "1.0.56"
@@ -68,19 +68,19 @@ url = "2.1.0"
 walkdir = "2.3.2"
 
 [patch.crates-io.ic-agent]
-version = "0.23.2"
+version = "0.24.1"
 git = "https://github.com/dfinity/agent-rs.git"
-rev = "862ddb2871db426d0e42e816a2f792d224d7bdf5"
+rev = "b9c57f8bab23cc9936dca4560293ffe485471c6d"
 
 [patch.crates-io.ic-identity-hsm]
-version = "0.23.2"
+version = "0.24.1"
 git = "https://github.com/dfinity/agent-rs.git"
-rev = "862ddb2871db426d0e42e816a2f792d224d7bdf5"
+rev = "b9c57f8bab23cc9936dca4560293ffe485471c6d"
 
 [patch.crates-io.ic-utils]
-version = "0.23.2"
+version = "0.24.1"
 git = "https://github.com/dfinity/agent-rs.git"
-rev = "862ddb2871db426d0e42e816a2f792d224d7bdf5"
+rev = "b9c57f8bab23cc9936dca4560293ffe485471c6d"
 
 [profile.release]
 panic = 'abort'

src/canisters/frontend/ic-asset/src/canister_api/methods/asset_properties.rs

@@ -1,6 +1,9 @@
 use std::collections::HashMap;
 
-use ic_agent::AgentError;
+use ic_agent::{
+    agent::{RejectCode, RejectResponse},
+    AgentError,
+};
 use ic_utils::call::SyncCall;
 use ic_utils::Canister;
 
@@ -23,10 +26,11 @@ pub(crate) async fn get_assets_properties(
             }
             // older canisters don't have get_assets_properties method
             // therefore we can break the loop
-            Err(AgentError::ReplicaError {
+            Err(AgentError::ReplicaError(RejectResponse {
                 reject_code,
                 reject_message,
-            }) if reject_code == 3
+                ..
+            })) if reject_code == RejectCode::DestinationInvalid
                 && (reject_message
                     .contains(&format!("has no query method '{GET_ASSET_PROPERTIES}'"))
                     || reject_message.contains("query method does not exist")) =>

src/dfx-core/src/identity/mod.rs

@@ -14,6 +14,7 @@ use crate::error::wallet_config::WalletConfigError::{
 };
 use crate::identity::identity_file_locations::IdentityFileLocations;
 use crate::json::{load_json_file, save_json_file};
+use ic_agent::agent::EnvelopeContent;
 pub use identity_manager::{
     HardwareIdentityConfiguration, IdentityConfiguration, IdentityCreationParameters,
     IdentityManager,
@@ -249,8 +250,8 @@ impl ic_agent::Identity for Identity {
         self.inner.sender()
     }
 
-    fn sign(&self, blob: &[u8]) -> Result<Signature, String> {
-        self.inner.sign(blob)
+    fn sign(&self, content: &EnvelopeContent) -> Result<Signature, String> {
+        self.inner.sign(content)
     }
 }
 

src/dfx/src/commands/canister/call.rs

@@ -291,7 +291,7 @@ pub async fn exec(
                 agent
                     .query(&canister_id, method_name)
                     .with_effective_canister_id(effective_canister_id)
-                    .with_arg(&arg_value)
+                    .with_arg(arg_value)
                     .call()
                     .await
                     .context("Failed query call.")?
@@ -324,7 +324,7 @@ pub async fn exec(
                 agent
                     .update(&canister_id, method_name)
                     .with_effective_canister_id(effective_canister_id)
-                    .with_arg(&arg_value)
+                    .with_arg(arg_value)
                     .call()
                     .await
                     .context("Failed update call.")?
@@ -353,7 +353,7 @@ pub async fn exec(
                 agent
                     .update(&canister_id, method_name)
                     .with_effective_canister_id(effective_canister_id)
-                    .with_arg(&arg_value)
+                    .with_arg(arg_value)
                     .call_and_wait()
                     .await
                     .context("Failed update call.")?

src/dfx/src/commands/canister/request_status.rs

@@ -59,14 +59,8 @@ pub async fn exec(env: &dyn Environment, opts: RequestStatusOpts) -> DfxResult {
                 .context("Failed to fetch request status.")?
             {
                 RequestStatusResponse::Replied { reply } => return Ok(reply),
-                RequestStatusResponse::Rejected {
-                    reject_code,
-                    reject_message,
-                } => {
-                    return Err(DfxError::new(AgentError::ReplicaError {
-                        reject_code,
-                        reject_message,
-                    }))
+                RequestStatusResponse::Rejected(response) => {
+                    return Err(DfxError::new(AgentError::ReplicaError(response)))
                 }
                 RequestStatusResponse::Unknown => (),
                 RequestStatusResponse::Received | RequestStatusResponse::Processing => {

src/dfx/src/commands/canister/send.rs

@@ -3,7 +3,7 @@ use crate::lib::error::DfxResult;
 use crate::lib::sign::signed_message::SignedMessageV1;
 use dfx_core::identity::CallSender;
 
-use ic_agent::agent::ReplicaV2Transport;
+use ic_agent::agent::Transport;
 use ic_agent::{agent::http_transport::ReqwestHttpReplicaV2Transport, RequestId};
 
 use anyhow::{anyhow, bail, Context};

src/dfx/src/commands/canister/sign.rs

@@ -2,7 +2,7 @@ use crate::commands::canister::call::get_effective_canister_id;
 use crate::lib::environment::Environment;
 use crate::lib::error::DfxResult;
 use crate::lib::operations::canister::get_local_cid_and_candid_path;
-use crate::lib::sign::sign_transport::SignReplicaV2Transport;
+use crate::lib::sign::sign_transport::SignTransport;
 use crate::lib::sign::signed_message::SignedMessageV1;
 use dfx_core::identity::CallSender;
 
@@ -174,10 +174,7 @@ pub async fn exec(
     }
 
     let mut sign_agent = agent.clone();
-    sign_agent.set_transport(SignReplicaV2Transport::new(
-        file_name.clone(),
-        message_template,
-    ));
+    sign_agent.set_transport(SignTransport::new(file_name.clone(), message_template));
 
     let is_management_canister = canister_id == Principal::management_canister();
     let effective_canister_id =
@@ -187,7 +184,7 @@ pub async fn exec(
         let res = sign_agent
             .query(&canister_id, method_name)
             .with_effective_canister_id(effective_canister_id)
-            .with_arg(&arg_value)
+            .with_arg(arg_value)
             .expire_at(expiration_system_time)
             .call()
             .await;
@@ -203,7 +200,7 @@ pub async fn exec(
         let res = sign_agent
             .update(&canister_id, method_name)
             .with_effective_canister_id(effective_canister_id)
-            .with_arg(&arg_value)
+            .with_arg(arg_value)
             .expire_at(expiration_system_time)
             .call()
             .await;

src/dfx/src/commands/ledger/mod.rs

@@ -17,6 +17,7 @@ use candid::Principal;
 use candid::{Decode, Encode};
 use clap::Parser;
 use fn_error_context::context;
+use ic_agent::agent::{RejectCode, RejectResponse};
 use ic_agent::agent_error::HttpErrorPayload;
 use ic_agent::{Agent, AgentError};
 use std::time::{SystemTime, UNIX_EPOCH};
@@ -238,10 +239,11 @@ pub async fn notify_top_up(
 
 fn retryable(agent_error: &AgentError) -> bool {
     match agent_error {
-        AgentError::ReplicaError {
-            reject_code,
+        AgentError::ReplicaError(RejectResponse {
+            reject_code: RejectCode::CanisterError,
             reject_message,
-        } if *reject_code == 5 && reject_message.contains("is out of cycles") => false,
+            ..
+        }) if reject_message.contains("is out of cycles") => false,
         AgentError::HttpError(HttpErrorPayload {
             status,
             content_type: _,