Qortal/piratewallet-light-cli
1
0
Fork 1
mirror of https://github.com/Qortal/piratewallet-light-cli.git synced 2025-07-31 04:11:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update serialization versions

Browse Source
This commit is contained in:
Aditya Kulkarni
2019-10-01 18:08:41 -07:00
parent ba706ab7ce
commit e3f9725086
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lightwallet/data.rs
View File

@@ -390,7 +390,7 @@ pub struct WalletTx {
impl WalletTx { impl WalletTx {
pub fn serialized_version() -> u64 { pub fn serialized_version() -> u64 {
return 2; return 3;
} }
pub fn new(height: i32, txid: &TxId) -> Self { pub fn new(height: i32, txid: &TxId) -> Self {
@@ -424,15 +424,9 @@ impl WalletTx {
let total_transparent_value_spent = reader.read_u64::<LittleEndian>()?; let total_transparent_value_spent = reader.read_u64::<LittleEndian>()?;
// Outgoing metadata was only added in version 2 // Outgoing metadata was only added in version 2
let outgoing_metadata = match version { let outgoing_metadata = Vector::read(&mut reader, |r| OutgoingTxMetadata::read(r))?;
1 => vec![],
_ => Vector::read(&mut reader, |r| OutgoingTxMetadata::read(r))?
};
let full_tx_scanned = match version { let full_tx_scanned = reader.read_u8()? > 0;
1 => false,
_ => reader.read_u8()? > 0,
};
Ok(WalletTx{ Ok(WalletTx{
block, block,

19
src/lightwallet/mod.rs
View File

@@ -130,7 +130,7 @@ pub struct LightWallet {
impl LightWallet { impl LightWallet {
pub fn serialized_version() -> u64 { pub fn serialized_version() -> u64 {
return 2; return 3;
} }
fn get_pk_from_bip39seed(config: LightClientConfig, bip39seed: &[u8]) -> fn get_pk_from_bip39seed(config: LightClientConfig, bip39seed: &[u8]) ->
@@ -232,21 +232,14 @@ impl LightWallet {
})?; })?;
let txs = txs_tuples.into_iter().collect::<HashMap<TxId, WalletTx>>(); let txs = txs_tuples.into_iter().collect::<HashMap<TxId, WalletTx>>();
// chain_name was added in v2 let chain_name = utils::read_string(&mut reader)?;
if version >= 2 {
let chain_name = utils::read_string(&mut reader)?;
if chain_name != config.chain_name { if chain_name != config.chain_name {
return Err(Error::new(ErrorKind::InvalidData, return Err(Error::new(ErrorKind::InvalidData,
format!("Wallet chain name {} doesn't match expected {}", chain_name, config.chain_name))); format!("Wallet chain name {} doesn't match expected {}", chain_name, config.chain_name)));
}
} }
let birthday = if version >= 2 { let birthday = reader.read_u64::<LittleEndian>()?;
reader.read_u64::<LittleEndian>()?
} else {
0
};
Ok(LightWallet{ Ok(LightWallet{
seed: seed_bytes, seed: seed_bytes,