Cleanup in transaction types, added patricia_tree

Author: stopak

Cargo.lock

@@ -2,3 +2,8 @@
 members = [
     "src/evm_utils",
 ]
+
+[profile.release]
+opt-level="s"
+lto = true
+codegen-units = 1

Cargo.toml

@@ -13,26 +13,26 @@ Link [https://icdevs.org/bounties/2023/01/09/28-EVM-Utility-Canister-Rust.html]
 
 ## Transaction
 
-- [ ] `create_transaction` - Returns transaction hash and encoded bytes
-- [ ] `parse_transaction` - Returns parsed transaction
+- [x] `create_transaction` - Returns transaction hash and encoded bytes
+- [x] `parse_transaction` - Returns parsed transaction
 
 ## EVM Verification
 
-- [ ] `verify_patricia_tree` - Verifies if send hash is a part of a tree
+- [x] `verify_proof` - Verifies if send hash is a part of a tree
 
 ## Hashing
 
-- [ ] `keccak256(vec u8) -> vec u8` - Hashes incoming data using keccak and returns hash
+- [x] `keccak256(vec u8) -> vec u8` - Hashes incoming data using keccak and returns hash
 
 ## Utils
 For now I have decided to skip functions related to private keys processing. I do believe it is not secure to pass public keys.
 
 
 - [x] `recover_public_key(vec u8, vec u8)` - recovers public key from ethereum style recoverable signature (65 bytes), equivalent to ecrecover
 
-- [ ] `is_valid_public` - checks if public key is valid
+- [x] `is_valid_public` - checks if public key is valid
 
-- [ ] `is_valid_siganature` - validates ECDSA signature
+- [x] `is_valid_siganature` - validates ECDSA signature
 
 - [x] `pub_to_address` - converts public key to ethereum address
 

readme.MD

@@ -11,6 +11,7 @@ crate-type = ["cdylib"]
 [dependencies]
 bytes = "1.3.0"
 candid = "0.8.2"
+cita_trie = "4.0.0"
 hex = "0.4.3"
 ic-cdk = "0.6.0"
 ic-cdk-macros = "0.6.0"
@@ -19,5 +20,6 @@ secp256k1 = { version = "0.26.0", features = [
   "global-context",
   "recovery",
 ] }
+hasher = { version = "0.1", features = ["hash-keccak"] }
 serde = "1.0.152"
 sha3 = "0.10.6"

src/evm_utils/Cargo.toml

@@ -0,0 +1,8 @@
+use crate::{types::num::U256, utils};
+use ic_cdk::query;
+
+/// Returns hash of given data using keccak256
+#[query]
+fn keccak256(data: Vec<u8>) -> U256 {
+    utils::keccak256(&[&data[..]])
+}

src/evm_utils/src/hash.rs

@@ -1,4 +1,6 @@
+mod hash;
 mod rlp;
 mod transaction;
+mod tree;
 mod types;
 mod utils;

src/evm_utils/src/lib.rs

@@ -11,7 +11,7 @@ fn rlp_encode(data: List) -> Result<Vec<u8>, String> {
 
 #[query]
 fn rlp_decode(raw: Vec<u8>) -> Result<List, String> {
-    let item: List = rlp::decode(&raw).map_err(|x| format!("{}", x))?;
+    let item: List = rlp::decode(&raw).map_err(|x| format!("{x}"))?;
 
     Ok(item)
 }

src/evm_utils/src/rlp.rs

@@ -4,24 +4,19 @@ use crate::types::transaction::Transaction;
 
 /// Encodes transaction in rlp, ready to be signed
 #[query]
-fn get_transaction_for_signing(data: Transaction) -> Result<Vec<u8>, String> {
+fn create_transaction(data: Transaction) -> Result<Vec<u8>, String> {
     let raw = data
         .encode()
-        .map_err(|x| format!("Error while encoding transaction {}", x))?;
+        .map_err(|x| format!("Error while encoding transaction {x}"))?;
 
     Ok(raw)
 }
 
-/// Converts transaction to a RAW format, returns encoded transaction and its hash
-fn create_signed_transaction(data: Transaction) -> Result<Vec<u8>, String> {
-    Err("not implemented".to_string())
-}
-
 /// Parses raw transaction, supports Legacy, EIP1559, EIP2930
 #[query]
 fn parse_transaction(data: Vec<u8>) -> Result<Transaction, String> {
-    let item = Transaction::decode(&data)
-        .map_err(|x| format!("Error while decoding transaction {}", x))?;
+    let item =
+        Transaction::decode(&data).map_err(|x| format!("Error while decoding transaction {x}"))?;
 
     Ok(item)
 }

src/evm_utils/src/transaction.rs

@@ -0,0 +1,16 @@
+use hasher::HasherKeccak;
+use ic_cdk::query;
+
+#[query]
+fn verify_proof(
+    root: Vec<u8>,
+    key: Vec<u8>,
+    proof: Vec<Vec<u8>>,
+) -> Result<Option<Vec<u8>>, String> {
+    let hasher = HasherKeccak::new();
+
+    let data = cita_trie::verify_proof(&root, &key, proof, hasher)
+        .map_err(|x| format!("Error while verifying proof {x}"))?;
+
+    Ok(data)
+}

src/evm_utils/src/tree.rs

@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 use ic_cdk::export::candid::{CandidType, Deserialize};
-use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream};
+use rlp::{Decodable, DecoderError, Encodable, RlpStream};
 use secp256k1::PublicKey;
 
 use crate::utils::keccak256;
@@ -51,8 +51,8 @@ impl From<PublicKey> for Address {
 //todo: add tests for conversion from public key to address!
 #[cfg(test)]
 mod test {
-    use std::str::FromStr;
     use std::error::Error;
+    use std::str::FromStr;
 
     use secp256k1::PublicKey;
 
@@ -69,4 +69,4 @@ mod test {
 
         Ok(())
     }
-}
+}