From 8076ee1426aa5f0f95100a85404ad6f507a764fd Mon Sep 17 00:00:00 2001 From: lucretius Date: Sat, 20 Jan 2024 15:43:43 +0100 Subject: [PATCH] add check for wallet version --- lib/src/lightwallet/data.rs | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/src/lightwallet/data.rs b/lib/src/lightwallet/data.rs index eb57b13..696c5f4 100644 --- a/lib/src/lightwallet/data.rs +++ b/lib/src/lightwallet/data.rs @@ -484,11 +484,11 @@ impl WalletTx { // Outgoing metadata was only added in version 2 let outgoing_metadata = Vector::read(&mut reader, |r| OutgoingTxMetadata::read(r))?; - let incoming_metadata = Vector::read(&mut reader, |r| IncomingTxMetadata::read(r))?; + //let incoming_metadata = Vector::read(&mut reader, |r| IncomingTxMetadata::read(r))?; let full_tx_scanned = reader.read_u8()? > 0; - Ok(WalletTx{ + let mut wallet_tx = WalletTx { block, datetime, txid, @@ -497,9 +497,15 @@ impl WalletTx { total_shielded_value_spent, total_transparent_value_spent, outgoing_metadata, - incoming_metadata, + incoming_metadata: vec![], full_tx_scanned - }) + }; + if version >= 5 { + wallet_tx.incoming_metadata = Vector::read(&mut reader, |r| IncomingTxMetadata::read(r))?; + } + + Ok(wallet_tx) + } pub fn write(&self, mut writer: W) -> io::Result<()> {