Migrates Barz and Eth Address APIs to Rust

.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,

rust/tw_coin_entry/src/error/address_error.rs

@@ -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
+    }
+}

rust/tw_encoding/src/hex.rs

@@ -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/tw_evm/Cargo.toml

@@ -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_evm/fuzz/Cargo.toml

@@ -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_evm/fuzz/fuzz_targets/diamond_cut_code.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);
+});

rust/tw_evm/src/abi/param.rs

@@ -18,8 +18,6 @@ pub struct Param {
 }
 
 impl Param {
-    /// Should be used in tests only.
-    #[cfg(test)]
     pub(crate) fn with_type(kind: ParamType) -> Param {
         Param {
             name: None,

rust/tw_evm/src/abi/prebuild/erc1967.rs

@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub const EIP_1967_PROXY_BYTE_CODE_HEX: &str = "0x608060405260405162000c5138038062000c51833981810160405281019062000029919062000580565b6200003d828260006200004560201b60201c565b5050620007d7565b62000056836200008860201b60201c565b600082511180620000645750805b156200008357620000818383620000df60201b620000371760201c565b505b505050565b62000099816200011560201b60201c565b8073ffffffffffffffffffffffffffffffffffffffff167fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b60405160405180910390a250565b60606200010d838360405180606001604052806027815260200162000c2a60279139620001eb60201b60201c565b905092915050565b6200012b816200027d60201b620000641760201c565b6200016d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000164906200066d565b60405180910390fd5b80620001a77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b620002a060201b620000871760201c565b60000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60606000808573ffffffffffffffffffffffffffffffffffffffff1685604051620002179190620006dc565b600060405180830381855af49150503d806000811462000254576040519150601f19603f3d011682016040523d82523d6000602084013e62000259565b606091505b50915091506200027286838387620002aa60201b60201c565b925050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b606083156200031a5760008351036200031157620002ce856200027d60201b60201c565b62000310576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620003079062000745565b60405180910390fd5b5b8290506200032d565b6200032c83836200033560201b60201c565b5b949350505050565b600082511115620003495781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200037f9190620007b3565b60405180910390fd5b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003c9826200039c565b9050919050565b620003db81620003bc565b8114620003e757600080fd5b50565b600081519050620003fb81620003d0565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b62000456826200040b565b810181811067ffffffffffffffff821117156200047857620004776200041c565b5b80604052505050565b60006200048d62000388565b90506200049b82826200044b565b919050565b600067ffffffffffffffff821115620004be57620004bd6200041c565b5b620004c9826200040b565b9050602081019050919050565b60005b83811015620004f6578082015181840152602081019050620004d9565b60008484015250505050565b6000620005196200051384620004a0565b62000481565b90508281526020810184848401111562000538576200053762000406565b5b62000545848285620004d6565b509392505050565b600082601f83011262000565576200056462000401565b5b81516200057784826020860162000502565b91505092915050565b600080604083850312156200059a576200059962000392565b5b6000620005aa85828601620003ea565b925050602083015167ffffffffffffffff811115620005ce57620005cd62000397565b5b620005dc858286016200054d565b9150509250929050565b600082825260208201905092915050565b7f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60008201527f6f74206120636f6e747261637400000000000000000000000000000000000000602082015250565b600062000655602d83620005e6565b91506200066282620005f7565b604082019050919050565b60006020820190508181036000830152620006888162000646565b9050919050565b600081519050919050565b600081905092915050565b6000620006b2826200068f565b620006be81856200069a565b9350620006d0818560208601620004d6565b80840191505092915050565b6000620006ea8284620006a5565b915081905092915050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b60006200072d601d83620005e6565b91506200073a82620006f5565b602082019050919050565b6000602082019050818103600083015262000760816200071e565b9050919050565b600081519050919050565b60006200077f8262000767565b6200078b8185620005e6565b93506200079d818560208601620004d6565b620007a8816200040b565b840191505092915050565b60006020820190508181036000830152620007cf818462000772565b905092915050565b61044380620007e76000396000f3fe6080604052366100135761001161001d565b005b61001b61001d565b005b610025610091565b610035610030610093565b6100a2565b565b606061005c83836040518060600160405280602781526020016103e7602791396100c8565b905092915050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b565b600061009d61014e565b905090565b3660008037600080366000845af43d6000803e80600081146100c3573d6000f35b3d6000fd5b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516100f291906102db565b600060405180830381855af49150503d806000811461012d576040519150601f19603f3d011682016040523d82523d6000602084013e610132565b606091505b5091509150610143868383876101a5565b925050509392505050565b600061017c7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b610087565b60000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b606083156102075760008351036101ff576101bf85610064565b6101fe576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f59061034f565b60405180910390fd5b5b829050610212565b610211838361021a565b5b949350505050565b60008251111561022d5781518083602001fd5b806040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161026191906103c4565b60405180910390fd5b600081519050919050565b600081905092915050565b60005b8381101561029e578082015181840152602081019050610283565b60008484015250505050565b60006102b58261026a565b6102bf8185610275565b93506102cf818560208601610280565b80840191505092915050565b60006102e782846102aa565b915081905092915050565b600082825260208201905092915050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b6000610339601d836102f2565b915061034482610303565b602082019050919050565b600060208201905081810360008301526103688161032c565b9050919050565b600081519050919050565b6000601f19601f8301169050919050565b60006103968261036f565b6103a081856102f2565b93506103b0818560208601610280565b6103b98161037a565b840191505092915050565b600060208201905081810360008301526103de818461038b565b90509291505056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e57dd3eafc9985be746025b6d82d4f011b9a7bb3db56f9a1eb7eadfddd376b6064736f6c63430008110033416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564";

rust/tw_evm/src/abi/prebuild/mod.rs

@@ -8,6 +8,7 @@ use tw_number::U256;
 
 pub mod biz;
 pub mod erc1155;
+pub mod erc1967;
 pub mod erc20;
 pub mod erc4337;
 pub mod erc721;