Fixed Rust dependencies + BIP39 support #232
Conversation
rust/signer/Cargo.toml
Outdated
|
|
||
| [dependencies] | ||
| base64 = "0.10.1" | ||
| blockies = "0.2" | ||
| ethsign = { git = "https://github.com/tomusdrw/ethsign.git", default-features = false, features = ["pure-rust"] } |
There was a problem hiding this comment.
Let's release it and use the crates.io version.
| Box::into_raw(Box::new(crypto.into())) | ||
| let password = Protected::new((*password).as_str().as_bytes().to_vec()); | ||
| let crypto = Crypto::encrypt(data.as_bytes(), &password, CRYPTO_ITERATIONS).unwrap(); | ||
| Box::into_raw(Box::new(serde_json::to_string(&crypto).unwrap())) |
There was a problem hiding this comment.
Might be good to have expects instead of unwraps
There was a problem hiding this comment.
Unfortunately they aren't very useful here since you never see the message when the mobile app crashes.
I want to abstract out the bridge glue code so type conversions are automatic and have some way of propagating errors up to JS without panicing, then get rid of all unwraps. Another thing is the duplicated logic between iOS and Android that I want to get rid off as well. That said, that will be a separate PR (likely part of #223).
rust/signer/src/lib.rs
Outdated
| @@ -199,13 +184,12 @@ pub unsafe extern fn decrypt_data(encrypted_data: *mut StringPtr, password: *mut | |||
| #[cfg(feature = "jni")] | |||
| #[allow(non_snake_case)] | |||
| pub mod android { | |||
| extern crate jni; | |||
| // extern crate jni; | |||
rust/signer/src/lib.rs
Outdated
| } | ||
| } | ||
| } | ||
| // #[cfg(test)] |
rust/signer/src/lib.rs
Outdated
| let result = env.new_string("").expect("second result to be created").into_inner(); | ||
| env.throw(new_exception(&env)).expect("second throw failed"); | ||
| let result = env.new_string("").expect("Could not create java string").into_inner(); | ||
| env.throw(new_exception(&env)).expect("second trhow failed"); |
rust/signer/src/util.rs
Outdated
| } | ||
|
|
||
| impl Keccak256<[u8; 32]> for [u8] { | ||
| fn keccak256(&self) -> [u8; 32] { |
There was a problem hiding this comment.
I think such function is already part of tiny_keccak: https://docs.rs/tiny-keccak/1.4.2/tiny_keccak/fn.keccak256.html
| } | ||
| if (set.size < 11) { | ||
|
|
||
| if (words.length < 11) { |
There was a problem hiding this comment.
What happened with the previous validation? It seemed quite nice
There was a problem hiding this comment.
It broke for BIP39 since it uses a different dictionary. This is pretty MVP, we want to add the double-dictionary hinting mechanism that figures out which phrase type you are entering after 1-n words, right now the checks are done in the "backend". I did reintroduce checking for extra whitespace just now though, as that is useful for both.
This is squashed #223 to date with fixed Rust dependencies that should hopefully forever solve all of our build issues (no linked C code).
It includes the BIP39 for Ethereum (new phrases are BIP39, recovery attempts BIP39 recovery and falls back to Parity phrases) along with minor UI changes (phrase validation and making the boxes bigger as 24 word BIP39 phrases are just longer).
#223 will be rebased after this is merged.