Qortal/piratewallet-light-cli
3
0
Fork 0
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-01-30 18:42:15 +00:00
Code Issues Projects Releases Wiki Activity

Undo the gzip encoding

Browse Source
This commit is contained in:
Aditya Kulkarni 2020-05-09 16:51:04 -07:00
parent 664e9512bb
commit cbffd69c66
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/src/lightclient.rs
View File

@ -429,8 +429,8 @@ impl LightClient {
let version = inp.read_u64::<LittleEndian>().unwrap(); let version = inp.read_u64::<LittleEndian>().unwrap();
println!("Reading wallet version {}", version); println!("Reading wallet version {}", version);
// After version 5, we're writing the rest of the file as a compressed stream (gzip) // At version 5, we're writing the rest of the file as a compressed stream (gzip)
let mut reader: Box<dyn Read> = if version <= 4 { let mut reader: Box<dyn Read> = if version != 5 {
Box::new(inp) Box::new(inp)
} else { } else {
Box::new(Decoder::new(inp).unwrap()) Box::new(Decoder::new(inp).unwrap())

15
lib/src/lightwallet.rs
View File

@ -11,7 +11,7 @@ use log::{info, warn, error};
use protobuf::parse_from_bytes; use protobuf::parse_from_bytes;
use libflate::{gzip::{Decoder, Encoder}, finish::AutoFinishUnchecked}; use libflate::gzip::{Decoder};
use secp256k1::SecretKey; use secp256k1::SecretKey;
use bip39::{Mnemonic, Language}; use bip39::{Mnemonic, Language};
@ -133,7 +133,7 @@ pub struct LightWallet {
impl LightWallet { impl LightWallet {
pub fn serialized_version() -> u64 { pub fn serialized_version() -> u64 {
return 5; return 6;
} }
fn get_taddr_from_bip39seed(config: &LightClientConfig, bip39_seed: &[u8], pos: u32) -> SecretKey { fn get_taddr_from_bip39seed(config: &LightClientConfig, bip39_seed: &[u8], pos: u32) -> SecretKey {
@ -242,8 +242,8 @@ impl LightWallet {
println!("Reading wallet version {}", version); println!("Reading wallet version {}", version);
info!("Reading wallet version {}", version); info!("Reading wallet version {}", version);
// After version 5, we're writing the rest of the file as a compressed stream (gzip) // At version 5, we're writing the rest of the file as a compressed stream (gzip)
let mut reader: Box<dyn Read> = if version <= 4 { let mut reader: Box<dyn Read> = if version != 5 {
info!("Reading direct"); info!("Reading direct");
Box::new(inp) Box::new(inp)
} else { } else {
@ -341,17 +341,14 @@ impl LightWallet {
}) })
} }
pub fn write<W: Write>(&self, mut out: W) -> io::Result<()> { pub fn write<W: Write>(&self, mut writer: W) -> io::Result<()> {
if self.encrypted && self.unlocked { if self.encrypted && self.unlocked {
return Err(Error::new(ErrorKind::InvalidInput, return Err(Error::new(ErrorKind::InvalidInput,
format!("Cannot write while wallet is unlocked while encrypted."))); format!("Cannot write while wallet is unlocked while encrypted.")));
} }
// Write the version // Write the version
out.write_u64::<LittleEndian>(LightWallet::serialized_version())?; writer.write_u64::<LittleEndian>(LightWallet::serialized_version())?;
// Gzip encoder
let mut writer = AutoFinishUnchecked::new(Encoder::new(out).unwrap());
// Write if it is locked // Write if it is locked
writer.write_u8(if self.encrypted {1} else {0})?; writer.write_u8(if self.encrypted {1} else {0})?;