Merge branch 'gdemay/XC-131-evm-rpc-get-block' into 'master'

feat(ckerc20): Use EVM-RPC canister to call `eth_getBlockByNumber` (XC-131): Start the migration to using the EVM-RPC canister by first using it to retrieve the last finalized block via `eth_getBlockByNumber`. Other HTTPs outcalls done by the ckETH minter are not impacted by this change. To ensure that the ckETH minter remains fully functional with or without using the EVM-RPC canister, all integration tests are run with both settings. Implementation notes: 1. To easily run twice the integration tests, without having to refactor all existing tests, additional bazel test targets were defined such that the new targets will instantiate the ckETH minter to use the EVM-RPC canister, while already existing targets instantiate the ckETH minter without it. This also ensures that exactly the same test will be ran in both cases. 2. Currently the EVM-RPC canister does not yet support LlamaNodes as a provider, so the current implementation uses custom providers to re-use exactly the same RPC providers. See merge request dfinity-lab/public/ic!19972
dfinity · Jul 1, 2024 · 90984e6 · 90984e6
2 parents 2c6d649 + 1978a07
commit 90984e6
Show file tree

Hide file tree

Showing 20 changed files with 886 additions and 187 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
@@ -653,6 +653,16 @@ http_file(
     url = "https://download.dfinity.systems/ic/300dc603a92b5f70dae79229793c902f346af3cc/canisters/ic-icrc1-ledger-u256.wasm.gz",
 )
 
+# XC artifacts for testing
+
+# EVM RPC canister
+
+http_file(
+    name = "evm_rpc.wasm.gz",
+    sha256 = "ccce0d8e3210db42ff12b03360c20246855ad8529da0f844faa343bf8b393529",
+    url = "https://github.com/internet-computer-protocol/evm-rpc-canister/releases/download/release-2024-05-23/evm_rpc.wasm.gz",
+)
+
 # Haskell toolchain for spec_compliance tests
 
 http_archive(

diff --git a/rs/ethereum/cketh/minter/BUILD.bazel b/rs/ethereum/cketh/minter/BUILD.bazel
@@ -43,6 +43,7 @@ rust_library(
         "//packages/icrc-ledger-types:icrc_ledger_types",
         "//rs/crypto/ecdsa_secp256k1",
         "//rs/crypto/sha3",
+        "//rs/ethereum/evm-rpc-client",
         "//rs/ethereum/types",
         "//rs/phantom_newtype",
         "//rs/types/management_canister_types",
@@ -173,44 +174,54 @@ rust_binary(
     ],
 )
 
-rust_ic_test_suite(
-    name = "integration_tests",
-    srcs = glob(["tests/**/*.rs"]),
-    data = [
-        ":cketh_minter_debug.wasm",
-        "//rs/ethereum/ledger-suite-orchestrator:ledger_suite_orchestrator_canister.wasm",
-        "//rs/rosetta-api/icrc1/archive:archive_canister_u256.wasm.gz",
-        "//rs/rosetta-api/icrc1/index-ng:index_ng_canister_u256.wasm.gz",
-        "//rs/rosetta-api/icrc1/ledger:ledger_canister_u256.wasm.gz",
-    ],
-    env = {
-        "CARGO_MANIFEST_DIR": "rs/ethereum/cketh/minter",
-        "CKETH_MINTER_WASM_PATH": "$(rootpath :cketh_minter_debug.wasm)",
-        "LEDGER_SUITE_ORCHESTRATOR_WASM_PATH": "$(rootpath //rs/ethereum/ledger-suite-orchestrator:ledger_suite_orchestrator_canister.wasm)",
-        "LEDGER_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/ledger:ledger_canister_u256.wasm.gz)",
-        "INDEX_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/index-ng:index_ng_canister_u256.wasm.gz)",
-        "LEDGER_ARCHIVE_NODE_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/archive:archive_canister_u256.wasm.gz)",
-    },
-    proc_macro_deps = [],
-    deps = [
-        ":minter",
-        "//packages/icrc-ledger-types:icrc_ledger_types",
-        "//rs/ethereum/cketh/test_utils",
-        "//rs/ethereum/ledger-suite-orchestrator/test_utils",
-        "//rs/ethereum/types",
-        "//rs/state_machine_tests",
-        "//rs/types/base_types",
-        "@crate_index//:assert_matches",
-        "@crate_index//:candid",
-        "@crate_index//:ethers-core",
-        "@crate_index//:hex",
-        "@crate_index//:num-bigint",
-        "@crate_index//:num-traits",
-        "@crate_index//:serde",
-        "@crate_index//:serde_bytes",
-        "@crate_index//:serde_json",
-    ],
-)
+[
+    rust_ic_test_suite(
+        name = "integration_tests" + name_suffix,
+        srcs = glob(["tests/**/*.rs"]),
+        data = [
+            ":cketh_minter_debug.wasm",
+            "//rs/ethereum/ledger-suite-orchestrator:ledger_suite_orchestrator_canister.wasm",
+            "//rs/rosetta-api/icrc1/archive:archive_canister_u256.wasm.gz",
+            "//rs/rosetta-api/icrc1/index-ng:index_ng_canister_u256.wasm.gz",
+            "//rs/rosetta-api/icrc1/ledger:ledger_canister_u256.wasm.gz",
+        ] + extra_data,
+        env = {
+            "CARGO_MANIFEST_DIR": "rs/ethereum/cketh/minter",
+            "CKETH_MINTER_WASM_PATH": "$(rootpath :cketh_minter_debug.wasm)",
+            "LEDGER_SUITE_ORCHESTRATOR_WASM_PATH": "$(rootpath //rs/ethereum/ledger-suite-orchestrator:ledger_suite_orchestrator_canister.wasm)",
+            "LEDGER_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/ledger:ledger_canister_u256.wasm.gz)",
+            "INDEX_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/index-ng:index_ng_canister_u256.wasm.gz)",
+            "LEDGER_ARCHIVE_NODE_CANISTER_WASM_PATH": "$(rootpath //rs/rosetta-api/icrc1/archive:archive_canister_u256.wasm.gz)",
+        } | extra_env,
+        proc_macro_deps = [],
+        deps = [
+            ":minter",
+            "//packages/icrc-ledger-types:icrc_ledger_types",
+            "//rs/ethereum/cketh/test_utils",
+            "//rs/ethereum/ledger-suite-orchestrator/test_utils",
+            "//rs/ethereum/types",
+            "//rs/state_machine_tests",
+            "//rs/types/base_types",
+            "@crate_index//:assert_matches",
+            "@crate_index//:candid",
+            "@crate_index//:ethers-core",
+            "@crate_index//:hex",
+            "@crate_index//:num-bigint",
+            "@crate_index//:num-traits",
+            "@crate_index//:serde",
+            "@crate_index//:serde_bytes",
+            "@crate_index//:serde_json",
+        ],
+    )
+    for (name_suffix, extra_data, extra_env) in [
+        ("", [], {}),
+        (
+            "_evm_rpc",
+            ["@evm_rpc.wasm.gz//file"],
+            {"EVM_RPC_CANISTER_WASM_PATH": "$(rootpath @evm_rpc.wasm.gz//file)"},
+        ),
+    ]
+]
 
 closure_js_library(
     name = "principal_to_bytes",

diff --git a/rs/ethereum/cketh/minter/Cargo.toml b/rs/ethereum/cketh/minter/Cargo.toml
@@ -15,6 +15,7 @@ path = "bin/principal_to_hex.rs"
 askama = { workspace = true }
 candid = { workspace = true }
 ethnum = { workspace = true }
+evm-rpc-client = { path = "../../evm-rpc-client" }
 futures = { workspace = true }
 hex = { workspace = true }
 hex-literal = "0.4.1"

diff --git a/rs/ethereum/cketh/minter/src/eth_rpc.rs b/rs/ethereum/cketh/minter/src/eth_rpc.rs
@@ -9,6 +9,7 @@ use crate::numeric::{BlockNumber, LogIndex, TransactionCount, Wei, WeiPerGas};
 use crate::state::{mutate_state, State};
 use candid::{candid_method, CandidType, Principal};
 use ethnum;
+use evm_rpc_client::types::candid::HttpOutcallError as EvmHttpOutcallError;
 use ic_canister_log::log;
 use ic_cdk::api::call::{call_with_payment128, RejectionCode};
 use ic_cdk::api::management_canister::http_request::{
@@ -558,6 +559,23 @@ pub enum HttpOutcallError {
     },
 }
 
+impl From<EvmHttpOutcallError> for HttpOutcallError {
+    fn from(value: EvmHttpOutcallError) -> Self {
+        match value {
+            EvmHttpOutcallError::IcError { code, message } => Self::IcError { code, message },
+            EvmHttpOutcallError::InvalidHttpJsonRpcResponse {
+                status,
+                body,
+                parsing_error,
+            } => Self::InvalidHttpJsonRpcResponse {
+                status,
+                body,
+                parsing_error,
+            },
+        }
+    }
+}
+
 impl HttpOutcallError {
     pub fn is_response_too_large(&self) -> bool {
         match self {