Add CyclesWalletRuntime

Author: lpahlavi

Cargo.lock

@@ -28,7 +28,9 @@ num-traits = "0.2.19"
 pin-project = "1.1.10"
 pocket-ic = "9.0.2"
 proptest = "1.6.0"
+regex-lite = "0.1.8"
 serde = "1.0"
+serde_bytes = "0.11.19"
 serde_json = "1.0"
 sha2 = "0.10.8"
 strum = { version = "0.27.1", features = ["derive"] }

Cargo.toml

@@ -5,54 +5,4 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [0.3.0] - 2025-10-08
-
-### Added
-- **Breaking:** A new method `charge_cycles` that does the actual charging was added to `CyclesChargingPolicy` ([#7](https://github.com/dfinity/canhttp/pull/7))
-- Example of canister using the library to make HTTP requests ([#6](https://github.com/dfinity/canhttp/pull/6))
-
-### Changed
-- **Breaking:** Update `ic-cdk` to `v0.18.7` including several changes to align with the new HTTP outcall API ([#21](https://github.com/dfinity/canhttp/pull/21)). Notably:
-  - `IcError` is refactored into an enum
-  - Use of the new `HttpRequestArgs` and `HttpRequestResult` types in `CyclesChargingPolicy` and `Client` trait impls
-  - Removal of `IcHttpRequestWithCycles`, `CyclesCostEstimator`, `CyclesAccountingError` and `CyclesAccounting` due to the `ic-cdk` method for making HTTP outcalls now taking care of charging cycles
-
-[0.3.0]: https://github.com/dfinity/canhttp/compare/canhttp-v0.2.1..canhttp-v0.3.0
-
-## [0.2.1] - 2025-07-11
-
-### Added
-
-- An `iter` method to `canhttp::multi::MultiResults` returning a borrowing iterator.
-
-### Changed
-- The `canhttp` crate has been moved from the [`evm-rpc-canister`](https://github.com/dfinity/evm-rpc-canister) repository to the new [`canhttp`](https://github.com/dfinity/canhttp) repository.
-
-[0.2.1]: https://github.com/dfinity/canhttp/compare/canhttp-v0.2.0..canhttp-v0.2.1
-
-## [0.2.0] - 2025-07-08
-
-### Added
-- Data structures `TimedSizedVec<T>` and `TimedSizedMap<K, V>` to store a limited number of expiring elements ([#434](https://github.com/dfinity/evm-rpc-canister/pull/434))
-- Method to list `Ok` results in a `MultiResults` ([#435](https://github.com/dfinity/evm-rpc-canister/pull/435))
-
-### Changed
-
-- **Breaking:** change the `code` field in the `IcError` type to use `ic_error_types::RejectCode` instead of `ic_cdk::api::call::RejectionCode` ([#428](https://github.com/dfinity/evm-rpc-canister/pull/428))
-
-[0.2.0]: https://github.com/dfinity/canhttp/compare/canhttp-v0.1.0..canhttp-v0.2.0
-
-## [0.1.0] - 2025-06-04
-
-### Added
-
-- JSON-RPC request ID with constant binary size ([#397](https://github.com/dfinity/evm-rpc-canister/pull/397))
-- Use `canhttp` to make parallel calls ([#391](https://github.com/dfinity/evm-rpc-canister/pull/391))
-- Improve validation of JSON-RPC requests and responses to adhere to the JSON-RPC specification ([#386](https://github.com/dfinity/evm-rpc-canister/pull/386) and [#387](https://github.com/dfinity/evm-rpc-canister/pull/387))
-- Retry layer ([#378](https://github.com/dfinity/evm-rpc-canister/pull/378))
-- JSON RPC conversion layer ([#375](https://github.com/dfinity/evm-rpc-canister/pull/375))
-- HTTP conversion layer ([#374](https://github.com/dfinity/evm-rpc-canister/pull/374))
-- Observability layer ([#370](https://github.com/dfinity/evm-rpc-canister/pull/370))
-- Library `canhttp` ([#364](https://github.com/dfinity/evm-rpc-canister/pull/364))
-
-[0.1.0]: https://github.com/dfinity/canhttp/releases/tag/canhttp-v0.1.0
+## Unreleased

ic-canister-runtime/CHANGELOG.md

@@ -11,12 +11,17 @@ include = ["src", "Cargo.toml", "CHANGELOG.md", "LICENSE", "README.md"]
 repository.workspace = true
 documentation = "https://docs.rs/canruntime"
 
+[features]
+wallet = ["dep:regex-lite", "dep:serde_bytes"]
+
 [dependencies]
 async-trait = { workspace = true }
 candid = { workspace = true }
 ic-cdk = { workspace = true }
 ic-error-types = { workspace = true }
+regex-lite = { workspace = true, optional = true }
 serde = { workspace = true }
+serde_bytes = { workspace = true, optional = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]

ic-canister-runtime/Cargo.toml

@@ -12,6 +12,11 @@ use ic_cdk::call::{Call, CallFailed, CandidDecodeFailed};
 use ic_error_types::RejectCode;
 use serde::de::DeserializeOwned;
 use thiserror::Error;
+#[cfg(feature = "wallet")]
+pub use wallet::CyclesWalletRuntime;
+
+#[cfg(feature = "wallet")]
+mod wallet;
 
 /// Abstract the canister runtime so that code making requests to canisters can be reused:
 /// * in production using [`ic_cdk`],
@@ -43,49 +48,6 @@ pub trait Runtime {
         Out: CandidType + DeserializeOwned;
 }
 
-/// Runtime when interacting with a canister running on the Internet Computer.
-#[derive(Copy, Clone, Eq, PartialEq, Debug)]
-pub struct IcRuntime;
-
-#[async_trait]
-impl Runtime for IcRuntime {
-    async fn update_call<In, Out>(
-        &self,
-        id: Principal,
-        method: &str,
-        args: In,
-        cycles: u128,
-    ) -> Result<Out, IcError>
-    where
-        In: ArgumentEncoder + Send,
-        Out: CandidType + DeserializeOwned,
-    {
-        Call::unbounded_wait(id, method)
-            .with_args(&args)
-            .with_cycles(cycles)
-            .await
-            .map_err(IcError::from)
-            .and_then(|response| response.candid::<Out>().map_err(IcError::from))
-    }
-
-    async fn query_call<In, Out>(
-        &self,
-        id: Principal,
-        method: &str,
-        args: In,
-    ) -> Result<Out, IcError>
-    where
-        In: ArgumentEncoder + Send,
-        Out: CandidType + DeserializeOwned,
-    {
-        Call::unbounded_wait(id, method)
-            .with_args(&args)
-            .await
-            .map_err(IcError::from)
-            .and_then(|response| response.candid::<Out>().map_err(IcError::from))
-    }
-}
-
 /// Error returned by the Internet Computer when making an inter-canister call.
 #[derive(Error, Clone, Debug, PartialEq, Eq)]
 pub enum IcError {
@@ -151,3 +113,46 @@ impl From<CandidDecodeFailed> for IcError {
         }
     }
 }
+
+/// Runtime when interacting with a canister running on the Internet Computer.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+pub struct IcRuntime;
+
+#[async_trait]
+impl Runtime for IcRuntime {
+    async fn update_call<In, Out>(
+        &self,
+        id: Principal,
+        method: &str,
+        args: In,
+        cycles: u128,
+    ) -> Result<Out, IcError>
+    where
+        In: ArgumentEncoder + Send,
+        Out: CandidType + DeserializeOwned,
+    {
+        Call::unbounded_wait(id, method)
+            .with_args(&args)
+            .with_cycles(cycles)
+            .await
+            .map_err(IcError::from)
+            .and_then(|response| response.candid::<Out>().map_err(IcError::from))
+    }
+
+    async fn query_call<In, Out>(
+        &self,
+        id: Principal,
+        method: &str,
+        args: In,
+    ) -> Result<Out, IcError>
+    where
+        In: ArgumentEncoder + Send,
+        Out: CandidType + DeserializeOwned,
+    {
+        Call::unbounded_wait(id, method)
+            .with_args(&args)
+            .await
+            .map_err(IcError::from)
+            .and_then(|response| response.candid::<Out>().map_err(IcError::from))
+    }
+}