build: update ic-cdk to v0.18.7

Cargo.toml

@@ -30,7 +30,6 @@ ic-http-types = { workspace = true }
 ic-metrics-encoder = { workspace = true }
 ic-stable-structures = { workspace = true }
 ic-cdk = { workspace = true }
-ic-cdk-macros = { workspace = true }
 ic-management-canister-types = { workspace = true }
 maplit = { workspace = true }
 minicbor = { workspace = true }
@@ -75,7 +74,7 @@ alloy-rpc-types = "1.0.23"
 assert_matches = "1.5.0"
 async-trait = "0.1.88"
 candid = { version = "0.10.13" }
-canhttp = { version = "0.2.0", features = ["json", "multi"] }
+canhttp = { version = "0.3.0", features = ["json", "multi"] }
 canlog = { version = "0.2.0", features = ["derive"] }
 candid_parser = { version = "0.1.4" }
 derive_more = { version = "2.0.1", features = ["from", "into"] }
@@ -84,7 +83,7 @@ ethnum = { version = "1.5.0", features = ["serde"] }
 getrandom = { version = "0.2", features = ["custom"] }
 hex = "0.4.3"
 http = "1.3.1"
-ic-cdk = "0.17.2"
+ic-cdk = "0.18.7"
 ic-cdk-bindgen = "0.1"
 ic-cdk-macros = "0.17.2"
 ic-certified-map = "0.4"

e2e/motoko/main.mo

@@ -14,7 +14,7 @@ shared ({ caller = installer }) persistent actor class Main() {
 
     // (`subnet name`, `nodes in subnet`, `expected cycles for JSON-RPC call`)
     type SubnetTarget = (Text, Nat32, Nat);
-    transient let fiduciarySubnet : SubnetTarget = ("fiduciary", 34, 540_545_600);
+    transient let fiduciarySubnet : SubnetTarget = ("fiduciary", 34, 400_299_200);
 
     transient let testTargets = [
         // (`canister module`, `canister type`, `subnet`)

e2e/rust/src/main.rs

@@ -1,12 +1,10 @@
-use std::str::FromStr;
-
 use candid::{candid_method, Principal};
-use ic_cdk_macros::update;
-
 use evm_rpc_types::{
     Block, BlockTag, ConsensusStrategy, EthMainnetService, Hex32, MultiRpcResult, ProviderError,
     RpcConfig, RpcError, RpcResult, RpcService, RpcServices,
 };
+use ic_cdk::{call::Call, update};
+use std::str::FromStr;
 
 fn main() {}
 
@@ -21,7 +19,7 @@ const CANISTER_ID: Option<&str> = None;
 #[update]
 #[candid_method(update)]
 pub async fn test() {
-    assert!(ic_cdk::api::is_controller(&ic_cdk::caller()));
+    assert!(ic_cdk::api::is_controller(&ic_cdk::api::msg_caller()));
 
     let canister_id = Principal::from_str(CANISTER_ID.unwrap())
         .expect("Error parsing canister ID environment variable");
@@ -34,18 +32,22 @@ pub async fn test() {
     );
 
     // Get cycles cost
-    let (cycles_result,): (Result<u128, RpcError>,) =
-        ic_cdk::api::call::call(canister_id, "requestCost", params.clone())
-            .await
-            .unwrap();
+    let cycles_result = Call::unbounded_wait(canister_id, "requestCost")
+        .with_args(&params)
+        .await
+        .unwrap()
+        .candid::<Result<u128, RpcError>>()
+        .unwrap();
     let cycles = cycles_result
         .unwrap_or_else(|e| ic_cdk::trap(&format!("error in `request_cost`: {:?}", e)));
 
     // Call without sending cycles
-    let (result_without_cycles,): (Result<String, RpcError>,) =
-        ic_cdk::api::call::call(canister_id, "request", params.clone())
-            .await
-            .unwrap();
+    let result_without_cycles = Call::unbounded_wait(canister_id, "request")
+        .with_args(&params)
+        .await
+        .unwrap()
+        .candid::<Result<String, RpcError>>()
+        .unwrap();
     match result_without_cycles {
         Ok(s) => ic_cdk::trap(&format!("response from `request` without cycles: {:?}", s)),
         Err(RpcError::ProviderError(ProviderError::TooFewCycles { expected, .. })) => {
@@ -55,10 +57,13 @@ pub async fn test() {
     }
 
     // Call with expected number of cycles
-    let (result,): (Result<String, RpcError>,) =
-        ic_cdk::api::call::call_with_payment128(canister_id, "request", params, cycles)
-            .await
-            .unwrap();
+    let result: Result<String, RpcError> = Call::unbounded_wait(canister_id, "request")
+        .with_args(&params)
+        .with_cycles(cycles)
+        .await
+        .unwrap()
+        .candid::<Result<String, RpcError>>()
+        .unwrap();
     match result {
         Ok(response) => {
             // Check response structure around gas price
@@ -72,10 +77,8 @@ pub async fn test() {
     }
 
     // Call a Candid-RPC method
-    let (results,): (MultiRpcResult<Block>,) = ic_cdk::api::call::call_with_payment128(
-        canister_id,
-        "eth_getBlockByNumber",
-        (
+    let results = Call::unbounded_wait(canister_id, "eth_getBlockByNumber")
+        .with_args(&(
             RpcServices::EthMainnet(Some(vec![
                 // EthMainnetService::Ankr, // Need API key
                 EthMainnetService::BlockPi,
@@ -90,11 +93,12 @@ pub async fn test() {
                 ..Default::default()
             }),
             BlockTag::Number(19709434_u32.into()),
-        ),
-        10000000000,
-    )
-    .await
-    .unwrap();
+        ))
+        .with_cycles(10000000000)
+        .await
+        .unwrap()
+        .candid::<MultiRpcResult<Block>>()
+        .unwrap();
     match results {
         MultiRpcResult::Consistent(result) => match result {
             Ok(block) => {

evm_rpc_client/Cargo.toml

@@ -21,6 +21,7 @@ ic-error-types = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 strum = { workspace = true }
+thiserror = { workspace = true }
 
 [dev-dependencies]
 alloy-dyn-abi = { workspace = true }

evm_rpc_client/src/fixtures/mod.rs

@@ -2,10 +2,9 @@
 //!
 //! Types and methods for this module are only available for non-canister architecture (non `wasm32`).
 
-use crate::{ClientBuilder, Runtime};
+use crate::{ClientBuilder, IcError, Runtime};
 use async_trait::async_trait;
 use candid::{utils::ArgumentEncoder, CandidType, Decode, Encode, Principal};
-use ic_error_types::RejectCode;
 use serde::de::DeserializeOwned;
 use std::collections::BTreeMap;
 
@@ -82,7 +81,7 @@ impl StubRuntime {
         self
     }
 
-    fn call<Out>(&self, method: &str) -> Result<Out, (RejectCode, String)>
+    fn call<Out>(&self, method: &str) -> Result<Out, IcError>
     where
         Out: CandidType + DeserializeOwned,
     {
@@ -109,7 +108,7 @@ impl Runtime for StubRuntime {
         method: &str,
         _args: In,
         _cycles: u128,
-    ) -> Result<Out, (RejectCode, String)>
+    ) -> Result<Out, IcError>
     where
         In: ArgumentEncoder + Send,
         Out: CandidType + DeserializeOwned,
@@ -122,7 +121,7 @@ impl Runtime for StubRuntime {
         _id: Principal,
         method: &str,
         _args: In,
-    ) -> Result<Out, (RejectCode, String)>
+    ) -> Result<Out, IcError>
     where
         In: ArgumentEncoder + Send,
         Out: CandidType + DeserializeOwned,

evm_rpc_client/src/lib.rs

@@ -127,7 +127,6 @@ use evm_rpc_types::{
     BlockTag, CallArgs, ConsensusStrategy, FeeHistoryArgs, GetLogsArgs, GetTransactionCountArgs,
     Hex, Hex32, RpcConfig, RpcServices,
 };
-use ic_error_types::RejectCode;
 #[cfg(feature = "alloy")]
 pub use request::alloy::AlloyResponseConverter;
 use request::{
@@ -139,7 +138,7 @@ use request::{
     SendRawTransactionRequest, SendRawTransactionRequestBuilder,
 };
 pub use request::{CandidResponseConverter, EvmRpcConfig};
-pub use runtime::{IcRuntime, Runtime};
+pub use runtime::{IcError, IcRuntime, Runtime};
 use serde::de::DeserializeOwned;
 use std::sync::Arc;
 
@@ -783,7 +782,7 @@ impl<R: Runtime, C> EvmRpcClient<R, C> {
     async fn try_execute_request<Config, Params, CandidOutput, Output>(
         &self,
         request: Request<Config, Params, CandidOutput, Output>,
-    ) -> Result<Output, (RejectCode, String)>
+    ) -> Result<Output, IcError>
     where
         Config: CandidType + Send,
         Params: CandidType + Send,

evm_rpc_client/src/request/mod.rs

@@ -1,13 +1,13 @@
 #[cfg(feature = "alloy")]
 pub(crate) mod alloy;
 
+use crate::runtime::IcError;
 use crate::{EvmRpcClient, Runtime};
 use candid::CandidType;
 use evm_rpc_types::{
     BlockTag, CallArgs, ConsensusStrategy, FeeHistoryArgs, GetLogsArgs, GetLogsRpcConfig,
     GetTransactionCountArgs, Hex, Hex20, Hex32, MultiRpcResult, Nat256, RpcConfig, RpcServices,
 };
-use ic_error_types::RejectCode;
 use serde::de::DeserializeOwned;
 use std::fmt::{Debug, Formatter};
 use strum::EnumIter;
@@ -508,7 +508,7 @@ impl<R: Runtime, Converter, Config, Params, CandidOutput, Output>
 
     /// Constructs the [`Request`] and sends it using the [`EvmRpcClient`]. This method returns
     /// either the request response or any error that occurs while sending the request.
-    pub async fn try_send(self) -> Result<Output, (RejectCode, String)>
+    pub async fn try_send(self) -> Result<Output, IcError>
     where
         Config: CandidType + Send,
         Params: CandidType + Send,