Migrates Barz and Eth Address APIs to Rust (trustwallet#4422)

* Migrates Barz and Eth Address APIs to rust

* Adds FFI tests and migrate C++ tests

* FMT

* Fixes memory leak

* Fixes invalid ptr issue

* Another try

* Addresses review comments

* Addresses review comments

* Addresses review comment

---------

Co-authored-by: Sergei Boiko <[email protected]>

Author: gupnik

.gitignore

@@ -51,6 +51,8 @@ include/TrustWalletCore/TWWalletConnectRequest.h
 include/TrustWalletCore/TWSolanaTransaction.h
 include/TrustWalletCore/TWCryptoBoxPublicKey.h
 include/TrustWalletCore/TWCryptoBoxSecretKey.h
+include/TrustWalletCore/TWEthereum.h
+include/TrustWalletCore/TWBarz.h
 
 # Wasm
 emsdk/

codegen-v2/src/codegen/cpp/code_gen.rs

@@ -235,7 +235,15 @@ fn generate_return_type(func: &TWFunction, converted_args: &Vec<String>) -> Resu
                 .map_err(|e| BadFormat(e.to_string()))?;
             }
             (TWPointerType::NonnullMut, "TWString") | (TWPointerType::Nonnull, "TWString") => {
-                panic!("Nonnull TWString is not supported");
+                write!(
+                    &mut return_string,
+                    "\tconst Rust::TWStringWrapper result = Rust::{}{}\n\
+                    \tconst auto resultString = result.toStringOrDefault();\n\
+                    \treturn TWStringCreateWithUTF8Bytes(resultString.c_str());\n",
+                    func.rust_name,
+                    generate_function_call(&converted_args)?.as_str()
+                )
+                .map_err(|e| BadFormat(e.to_string()))?;
             }
             (TWPointerType::NullableMut, "TWData") | (TWPointerType::Nullable, "TWData") => {
                 write!(
@@ -390,7 +398,7 @@ fn generate_conversion_code_with_var_name(tw_type: TWType, name: &str) -> Result
                 .map_err(|e| BadFormat(e.to_string()))?;
                 Ok((conversion_code, format!("{}RustData.get()", name)))
             }
-            (TWPointerType::Nonnull, "TWPrivateKey") => {
+            (TWPointerType::Nonnull, "TWPrivateKey") | (TWPointerType::NonnullMut, "TWPrivateKey") => {
                 let mut conversion_code = String::new();
                 writeln!(
                     &mut conversion_code,
@@ -401,7 +409,7 @@ fn generate_conversion_code_with_var_name(tw_type: TWType, name: &str) -> Result
                 .map_err(|e| BadFormat(e.to_string()))?;
                 Ok((conversion_code, format!("{}RustPrivateKey.get()", name)))
             }
-            (TWPointerType::Nullable, "TWPrivateKey") => {
+            (TWPointerType::Nullable, "TWPrivateKey") | (TWPointerType::NullableMut, "TWPrivateKey") => {
                 let mut conversion_code = String::new();
                 writeln!(
                     &mut conversion_code,
@@ -415,7 +423,7 @@ fn generate_conversion_code_with_var_name(tw_type: TWType, name: &str) -> Result
                 .map_err(|e| BadFormat(e.to_string()))?;
                 Ok((conversion_code, format!("{}RustPrivateKey.get()", name)))
             }
-            (TWPointerType::Nonnull, "TWPublicKey") => {
+            (TWPointerType::Nonnull, "TWPublicKey") | (TWPointerType::NonnullMut, "TWPublicKey") => {
                 let mut conversion_code = String::new();
                 writeln!(
                     &mut conversion_code,
@@ -427,7 +435,7 @@ fn generate_conversion_code_with_var_name(tw_type: TWType, name: &str) -> Result
                 .map_err(|e| BadFormat(e.to_string()))?;
                 Ok((conversion_code, format!("{}RustPublicKey.get()", name)))
             }
-            (TWPointerType::Nullable, "TWPublicKey") => {
+            (TWPointerType::Nullable, "TWPublicKey") | (TWPointerType::NullableMut, "TWPublicKey") => {
                 let mut conversion_code = String::new();
                 writeln!(
                     &mut conversion_code,

include/TrustWalletCore/TWBarz.h

@@ -3,6 +3,7 @@
 // Copyright © 2017 Trust Wallet.
 
 use strum_macros::Display;
+use tw_encoding::hex::FromHexError;
 
 pub type AddressResult<T> = Result<T, AddressError>;
 
@@ -25,3 +26,9 @@ pub enum AddressError {
     InvalidWitnessProgram,
     Internal,
 }
+
+impl From<FromHexError> for AddressError {
+    fn from(_: FromHexError) -> Self {
+        AddressError::FromHexError
+    }
+}

include/TrustWalletCore/TWEthereum.h

@@ -67,6 +67,28 @@ pub fn encode<T: AsRef<[u8]>>(data: T, prefixed: bool) -> String {
     encoded
 }
 
+pub fn hex_to_bits(str: &str) -> FromHexResult<String> {
+    let hex_str = str.trim_start_matches("0x");
+    let mut bits = String::new();
+    for (index, c) in hex_str.chars().enumerate() {
+        let val = c
+            .to_digit(16)
+            .ok_or(FromHexError::InvalidHexCharacter { c, index })?;
+        bits.push_str(&format!("{:04b}", val));
+    }
+    Ok(bits)
+}
+
+pub fn data_to_bits(data: &[u8]) -> FromHexResult<String> {
+    let hex_str = encode(data, false);
+    hex_to_bits(&hex_str)
+}
+
+pub fn bits_to_u32(bits: &str, from: usize, to: usize) -> FromHexResult<u32> {
+    u32::from_str_radix(&bits[from..to], 2)
+        .map_err(|_| FromHexError::InvalidHexCharacter { c: '0', index: 0 })
+}
+
 pub mod as_hex {
     use super::*;
     use serde::de::Error;
@@ -160,6 +182,31 @@ pub mod as_hex_prefixed {
     }
 }
 
+pub mod u8_as_hex {
+    use super::*;
+    use serde::{Deserialize, Deserializer, Serializer};
+
+    pub fn serialize<S>(value: &u8, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let hex_str = encode([*value], true);
+        serializer.serialize_str(&hex_str)
+    }
+
+    pub fn deserialize<'de, D>(deserializer: D) -> Result<u8, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let hex_str = String::deserialize(deserializer)?;
+        let bytes = decode(&hex_str).map_err(serde::de::Error::custom)?;
+        bytes
+            .first()
+            .copied()
+            .ok_or_else(|| serde::de::Error::custom("Expected single byte but got empty bytes"))
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
@@ -187,4 +234,12 @@ mod tests {
             Ok(expected)
         );
     }
+
+    #[test]
+    fn test_encode_bits() {
+        assert_eq!(
+            hex_to_bits("0x2db500ac919cdde351ac36e3711d832c6db97669").unwrap(), 
+            "0010110110110101000000001010110010010001100111001101110111100011010100011010110000110110111000110111000100011101100000110010110001101101101110010111011001101001"
+        );
+    }
 }

rust/Cargo.lock

@@ -13,10 +13,13 @@ tw_coin_entry = { path = "../tw_coin_entry" }
 tw_encoding = { path = "../tw_encoding" }
 tw_hash = { path = "../tw_hash" }
 tw_keypair = { path = "../tw_keypair" }
+tw_macros = { path = "../tw_macros" }
 tw_memory = { path = "../tw_memory" }
 tw_misc = { path = "../tw_misc" }
 tw_number = { path = "../tw_number", features = ["serde"] }
 tw_proto = { path = "../tw_proto" }
 
 [dev-dependencies]
 tw_coin_entry = { path = "../tw_coin_entry", features = ["test-utils"] }
+tw_memory = { path = "../tw_memory", features = ["test-utils"] }
+tw_keypair = { path = "../tw_keypair", features = ["test-utils"]  }

rust/tw_coin_entry/src/error/address_error.rs

@@ -52,3 +52,9 @@ name = "sign"
 path = "fuzz_targets/sign.rs"
 test = false
 doc = false
+
+[[bin]]
+name = "diamond_cut_code"
+path = "fuzz_targets/diamond_cut_code.rs"
+test = false
+doc = false

rust/tw_encoding/src/hex.rs

@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_evm::modules::barz::core;
+use tw_proto::Barz::Proto;
+
+fuzz_target!(|input: Proto::DiamondCutInput<'_>| {
+    let _ = core::get_diamond_cut_code(&input);
+});