Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 28 additions & 42 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ candid_parser = { workspace = true }
evm_rpc_client = { path = "evm_rpc_client", features = ["alloy"] }
ic-crypto-test-utils-reproducible-rng = { git = "https://github.com/dfinity/ic", rev = "release-2024-09-26_01-31-base" }
ic-error-types = { workspace = true }
ic-management-canister-types = { workspace = true }
ic-management-canister-types-pocket-ic = { package = "ic-management-canister-types", version = "0.3" }
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 = { workspace = true }
Expand All @@ -77,7 +77,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.3.0", features = ["json", "multi"] }
canhttp = { version = "0.4.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"] }
Expand All @@ -86,14 +86,13 @@ ethnum = { version = "1.5.0", features = ["serde"] }
getrandom = { version = "0.2", features = ["custom"] }
hex = "0.4.3"
http = "1.3.1"
ic-cdk = "0.18.7"
ic-cdk = "0.19.0"
ic-cdk-bindgen = "0.1"
ic-cdk-macros = "0.17.2"
ic-certified-map = "0.4"
ic-http-types = "0.1.0"
ic-error-types = "0.2"
ic-ethereum-types = "1.0.0"
ic-management-canister-types = "0.3"
ic-management-canister-types = "0.5.0"
ic-metrics-assert = { version = "0.1.1", features = ["pocket_ic"] }
ic-metrics-encoder = "1.1"
ic-stable-structures = "0.6.8"
Expand Down
1 change: 0 additions & 1 deletion e2e/rust/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ edition = "2021"
candid = { workspace = true }
ic-certified-map = { workspace = true }
ic-cdk = { workspace = true }
ic-cdk-macros = { workspace = true }
serde = { workspace = true }
serde_bytes = { workspace = true }
evm_rpc_types = { path = "../../evm_rpc_types" }
Expand Down
4 changes: 2 additions & 2 deletions src/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ use evm_rpc_types::{
ValidationError,
};
use http::{header::CONTENT_TYPE, HeaderValue};
use ic_error_types::RejectCode;
use ic_management_canister_types::{
use ic_cdk::management_canister::{
HttpRequestArgs as IcHttpRequest, HttpRequestResult as IcHttpResponse, TransformArgs,
TransformContext, TransformFunc,
};
use ic_error_types::RejectCode;
use serde::{de::DeserializeOwned, Serialize};
use std::fmt::Debug;
use thiserror::Error;
Expand Down
6 changes: 3 additions & 3 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ use evm_rpc::{
types::{OverrideProvider, Provider, ProviderId, RpcAccess, RpcAuth},
};
use evm_rpc_types::{Hex32, HttpOutcallError, MultiRpcResult, RpcConfig, RpcResult, RpcServices};
use ic_cdk::{api::is_controller, query, update};
use ic_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder};
use ic_management_canister_types::{
use ic_cdk::management_canister::{
HttpRequestArgs as IcHttpRequest, HttpRequestResult as IcHttpResponse, TransformArgs,
};
use ic_cdk::{api::is_controller, query, update};
use ic_http_types::{HttpRequest, HttpResponse, HttpResponseBuilder};
use ic_metrics_encoder::MetricsEncoder;
use std::str::FromStr;
use tower::Service;
Expand Down
2 changes: 1 addition & 1 deletion src/rpc_client/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ use evm_rpc_types::{
RpcService, RpcServices,
};
use http::{Request, Response};
use ic_management_canister_types::{
use ic_cdk::management_canister::{
HttpRequestArgs as IcHttpRequest, TransformContext, TransformFunc,
};
use json::{
Expand Down
4 changes: 2 additions & 2 deletions tests/setup/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ use evm_rpc::{
use evm_rpc_client::{AlloyResponseConverter, ClientBuilder, EvmRpcClient, NoRetry, Runtime};
use evm_rpc_types::{InstallArgs, Provider, RpcResult, RpcService};
use ic_http_types::{HttpRequest, HttpResponse};
use ic_management_canister_types::CanisterId;
use ic_management_canister_types::CanisterSettings;
use ic_management_canister_types_pocket_ic::CanisterId;
use ic_management_canister_types_pocket_ic::CanisterSettings;
use ic_metrics_assert::{MetricsAssert, PocketIcAsyncHttpQuery};
use ic_test_utilities_load_wasm::load_wasm;
use num_traits::ToPrimitive;
Expand Down