feat(evm_icp_bridge): EVM API

Author: zensh

Cargo.lock

@@ -38,6 +38,7 @@ base64 = "0.22"
 candid = "0.10"
 ciborium = "0.2"
 log = "0.4"
+futures = "0.3"
 serde = "1"
 serde_bytes = "0.11"
 serde_json = { version = "1", features = ["preserve_order"] }

Cargo.toml

@@ -15,10 +15,11 @@ license.workspace = true
 crate-type = ["cdylib"]
 
 [dependencies]
-alloy = { workspace = true }
+alloy = { workspace = true, features = ["rpc"] }
 base64 = { workspace = true }
 candid = { workspace = true }
 ciborium = { workspace = true }
+futures = { workspace = true }
 ic-cdk = { workspace = true }
 ic-cdk-timers = { workspace = true }
 ic-stable-structures = { workspace = true }

src/evm_icp_bridge/Cargo.toml

@@ -5,16 +5,49 @@ use url::Url;
 use crate::store;
 
 #[ic_cdk::update(guard = "is_controller")]
-fn admin_add_evm_contract(
+async fn admin_add_evm_contract(
     chain_name: String,
     chain_id: u64,
     address: String,
     decimals: u8,
 ) -> Result<(), String> {
-    let address = check_admin_add_evm_contract(&chain_name, chain_id, &address)?;
+    let address = check_admin_add_evm_contract(&chain_name, chain_id, &address, decimals)?;
+    let cli = store::state::evm_client(&chain_name);
+    let now_ms = ic_cdk::api::time() / 1_000_000;
+    let (cid, gas_price, block_number, symbol, dec) = futures::future::try_join5(
+        cli.chain_id(now_ms),
+        cli.gas_price(now_ms),
+        cli.finalized_block_number(now_ms),
+        cli.erc20_symbol(now_ms, &address),
+        cli.erc20_decimals(now_ms, &address),
+    )
+    .await?;
+
+    if chain_id != cid {
+        return Err(format!(
+            "chain_id mismatch, got {}, expected {}",
+            cid, chain_id
+        ));
+    }
+    if decimals != dec {
+        return Err(format!(
+            "decimals mismatch, got {}, expected {}",
+            dec, decimals
+        ));
+    }
+
     store::state::with_mut(|s| {
+        if s.token_symbol != symbol {
+            return Err(format!(
+                "token_symbol mismatch, got {}, expected {}",
+                symbol, s.token_symbol
+            ));
+        }
+
         s.evm_token_contracts
-            .insert(chain_name, (address, decimals, chain_id));
+            .insert(chain_name.clone(), (address, decimals, chain_id));
+        s.evm_finalized_block
+            .insert(chain_name, (block_number, gas_price));
         Ok(())
     })
 }
@@ -26,14 +59,15 @@ fn validate_admin_add_evm_contract(
     address: String,
     decimals: u8,
 ) -> Result<String, String> {
-    check_admin_add_evm_contract(&chain_name, chain_id, &address)?;
+    check_admin_add_evm_contract(&chain_name, chain_id, &address, decimals)?;
     pretty_format(&(chain_name, chain_id, address, decimals))
 }
 
 fn check_admin_add_evm_contract(
     chain_name: &str,
     chain_id: u64,
     address: &str,
+    decimals: u8,
 ) -> Result<Address, String> {
     if chain_name.trim().to_ascii_uppercase() != chain_name
         || chain_name.is_empty()
@@ -44,10 +78,19 @@ fn check_admin_add_evm_contract(
 
     let addr = Address::parse_checksummed(address, Some(chain_id))
         .map_err(|err| format!("invalid address: {err:?}"))?;
+
     store::state::with(|s| {
+        if decimals < s.token_decimals {
+            return Err(format!(
+                "decimals must be >= {}, got {}",
+                s.token_decimals, decimals
+            ));
+        }
+
         if s.evm_token_contracts.contains_key(chain_name) {
             return Err("chain_id already exists".to_string());
         }
+
         if s.evm_token_contracts
             .values()
             .any(|(_, _, cid)| *cid == chain_id)

src/evm_icp_bridge/src/api_admin.rs

@@ -15,6 +15,7 @@ pub struct InitArgs {
     pub key_name: String,
     pub token_name: String,
     pub token_symbol: String,
+    pub token_decimals: u8,
     pub token_logo: String,
     pub token_ledger: Principal,
     pub governance_canister: Option<Principal>,
@@ -36,6 +37,7 @@ fn init(args: Option<CanisterArgs>) {
             s.key_name = args.key_name;
             s.token_name = args.token_name;
             s.token_symbol = args.token_symbol;
+            s.token_decimals = args.token_decimals;
             s.token_logo = args.token_logo;
             s.token_ledger = args.token_ledger;
             s.governance_canister = args.governance_canister;