XC-502: Update ic-cdk

Author: lpahlavi

Cargo.lock

@@ -31,9 +31,8 @@ ic-metrics-encoder = { workspace = true }
 ic-stable-structures = { workspace = true }
 ic-canister-log = { workspace = true }
 ic-cdk = { workspace = true }
-ic-cdk-macros = { workspace = true }
 ic-management-canister-types = { workspace = true }
-maplit = "1.0"
+maplit = { workspace = true }
 minicbor = { workspace = true }
 serde = { workspace = true }
 serde_bytes = { workspace = true }
@@ -62,11 +61,11 @@ ic-error-types = { workspace = true }
 ic-management-canister-types = { workspace = true }
 ic-metrics-assert = { workspace = true }
 ic-test-utilities-load-wasm = { git = "https://github.com/dfinity/ic", rev = "release-2024-09-26_01-31-base" }
-maplit = "1"
+maplit = { workspace = true }
 pocket-ic = { workspace = true }
 proptest = { workspace = true }
 rand = "0.8"
-tokio = "1.44.1"
+tokio = { workspace = true }
 
 [workspace.dependencies]
 alloy-consensus = "1.0.26"
@@ -76,20 +75,16 @@ 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 = { git = "https://github.com/dfinity/canhttp/", features = ["json", "multi"], rev = "0b935a2ba6defb0265bb94bbfb5c5675975531a3" }
 canlog = { version = "0.2.0", features = ["derive"] }
 candid_parser = { version = "0.1.4" }
-ciborium = "0.2.2"
 derive_more = { version = "2.0.1", features = ["from", "into"] }
 ethnum = { version = "1.5.0", features = ["serde"] }
-futures = "0.3.31"
-futures-channel = "0.3.31"
-futures-util = "0.3.31"
 getrandom = { version = "0.2", features = ["custom"] }
 hex = "0.4.3"
 http = "1.3.1"
 ic-canister-log = "0.2.0"
-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"
@@ -98,12 +93,9 @@ ic-management-canister-types = "0.3"
 ic-metrics-assert = { version = "0.1.1", features = ["pocket_ic"] }
 ic-metrics-encoder = "1.1"
 ic-stable-structures = "0.6.8"
-itertools = "0.14.0"
 maplit = "1.0.2"
 minicbor = { version = "1.0.0", features = ["alloc", "derive"] }
 num-bigint = "0.4.6"
-num-traits = "0.2.19"
-pin-project = "1.1.10"
 pocket-ic = "9.0.0"
 proptest = "1.6.0"
 serde = "1.0"
@@ -113,7 +105,6 @@ sha2 = "0.10.8"
 strum = { version = "0.27.1", features = ["derive"] }
 tokio = "1.44.1"
 tower = "0.5.2"
-tower-layer = "0.3.3"
 tower-http = "0.6.2"
 thiserror = "2.0.12"
 url = "2.5"

Cargo.toml

@@ -1,5 +1,4 @@
 {
-  "dfx": "0.23.0",
   "canisters": {
     "evm_rpc": {
       "candid": "candid/evm_rpc.did",

dfx.json

@@ -9,21 +9,21 @@ import Principal "mo:base/Principal";
 import Text "mo:base/Text";
 import Evm "mo:evm";
 
-shared ({ caller = installer }) actor class Main() {
+shared ({ caller = installer }) persistent actor class Main() {
     type TestCategory = { #staging; #production };
 
     // (`subnet name`, `nodes in subnet`, `expected cycles for JSON-RPC call`)
     type SubnetTarget = (Text, Nat32, Nat);
-    let fiduciarySubnet : SubnetTarget = ("fiduciary", 34, 540_545_600);
+    transient let fiduciarySubnet : SubnetTarget = ("fiduciary", 34, 400_299_200);
 
-    let testTargets = [
+    transient let testTargets = [
         // (`canister module`, `canister type`, `subnet`)
         (EvmRpc, #production, fiduciarySubnet),
         (EvmRpcStaging, #staging, fiduciarySubnet),
     ];
 
     // (`RPC service`, `method`)
-    let ignoredTests = [
+    transient let ignoredTests = [
         (#EthMainnet(#BlockPi), ?"eth_sendRawTransaction"), // "Private transaction replacement (same nonce) with gas price change lower than 10% is not allowed within 30 sec from the previous transaction."
         (#EthMainnet(#Llama), ?"eth_sendRawTransaction"), // Non-standard error message
         (#ArbitrumOne(#Ankr), null), // Need API key

e2e/motoko/main.mo

@@ -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) => {

e2e/rust/src/main.rs

@@ -5,7 +5,7 @@
 use crate::{ClientBuilder, Runtime};
 use async_trait::async_trait;
 use candid::{utils::ArgumentEncoder, CandidType, Decode, Encode, Principal};
-use ic_error_types::RejectCode;
+use ic_cdk::call::Error;
 use serde::de::DeserializeOwned;
 use std::collections::BTreeMap;
 
@@ -82,7 +82,7 @@ impl StubRuntime {
         self
     }
 
-    fn call<Out>(&self, method: &str) -> Result<Out, (RejectCode, String)>
+    fn call<Out>(&self, method: &str) -> Result<Out, Error>
     where
         Out: CandidType + DeserializeOwned,
     {
@@ -109,7 +109,7 @@ impl Runtime for StubRuntime {
         method: &str,
         _args: In,
         _cycles: u128,
-    ) -> Result<Out, (RejectCode, String)>
+    ) -> Result<Out, Error>
     where
         In: ArgumentEncoder + Send,
         Out: CandidType + DeserializeOwned,
@@ -122,7 +122,7 @@ impl Runtime for StubRuntime {
         _id: Principal,
         method: &str,
         _args: In,
-    ) -> Result<Out, (RejectCode, String)>
+    ) -> Result<Out, Error>
     where
         In: ArgumentEncoder + Send,
         Out: CandidType + DeserializeOwned,

evm_rpc_client/src/fixtures/mod.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;
 pub use request::CandidResponseConverter;
@@ -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, ic_cdk::call::Error>
     where
         Config: CandidType + Send,
         Params: CandidType + Send,