Qortal/piratewallet-light-cli
1
0
Fork 1
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-11-02 21:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:adityapk00/zecwallet-light-cli

Browse Source
This commit is contained in:
Aditya Kulkarni
2020-07-29 09:59:25 -07:00
parent 5a885adc15 22bde5a404
commit 6cfbdaf60d
4 changed files with 55 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/src/lightwallet.rs
View File

@@ -2074,22 +2074,12 @@ impl LightWallet {
Some(s) => {
// If the string starts with an "0x", and contains only hex chars ([a-f0-9]+) then
// interpret it as a hex
let s_bytes = if s.to_lowercase().starts_with("0x") {
match hex::decode(&s[2..s.len()]) {
Ok(data) => data,
Err(_) => Vec::from(s.as_bytes())
}
} else {
Vec::from(s.as_bytes())
};
match Memo::from_bytes(&s_bytes) {
None => {
let e = format!("Error creating output. Memo {:?} is too long", s);
match utils::interpret_memo_string(&s) {
Ok(m) => Some(m),
Err(e) => {
error!("{}", e);
return Err(e);
},
Some(m) => Some(m)
}
}
}
};
@@ -2162,10 +2152,16 @@ impl LightWallet {
None => Memo::default(),
Some(s) => {
// If the address is not a z-address, then drop the memo
if LightWallet::is_shielded_address(&addr.to_string(), &self.config) {
Memo::from_bytes(s.as_bytes()).unwrap()
} else {
if !LightWallet::is_shielded_address(&addr.to_string(), &self.config) {
Memo::default()
} else {
match utils::interpret_memo_string(s) {
Ok(m) => m,
Err(e) => {
error!("{}", e);
Memo::default()
}
}
}
}
},