Problem (Fix #1069): blocks with multiple txs may fail light client a…

…pp hash check

Solution:
- Change BTreeMap to IndexMap

client-common/Cargo.toml

@@ -29,6 +29,7 @@ parity-scale-codec = { features = ["derive"], version = "1.1" }
 websocket = { version = "0.24", default-features = false, features = ["sync"], optional = true }
 tendermint = { git = "https://github.com/crypto-com/tendermint-rs.git", default-features = false, rev = "db982c2437fe72c7a03942fc2bddf490f2332364" }
 itertools = "0.8"
+indexmap = "1.3"
 
 [dev-dependencies]
 quickcheck = "0.9"

client-common/src/tendermint/types/block_results.rs

@@ -1,9 +1,9 @@
 #![allow(missing_docs)]
-use std::collections::BTreeMap;
 use std::convert::TryFrom;
 use std::str::{from_utf8, FromStr};
 
 use base64;
+use indexmap::IndexMap;
 use serde::Deserialize;
 
 use chain_core::common::{TendermintEventKey, TendermintEventType};
@@ -56,11 +56,11 @@ pub struct Attribute {
 
 impl BlockResults {
     /// Returns transaction ids and the corresponding fees in block results
-    pub fn fees(&self) -> Result<BTreeMap<TxId, Fee>> {
+    pub fn fees(&self) -> Result<IndexMap<TxId, Fee>> {
         match &self.results.deliver_tx {
-            None => Ok(BTreeMap::default()),
+            None => Ok(IndexMap::default()),
             Some(deliver_tx) => {
-                let mut fees: BTreeMap<TxId, Fee> = BTreeMap::new();
+                let mut fees: IndexMap<TxId, Fee> = IndexMap::new();
 
                 for transaction in deliver_tx.iter() {
                     for event in transaction.events.iter() {

client-core/src/wallet/syncer.rs

@@ -1,4 +1,5 @@
 #![allow(missing_docs)]
+use indexmap::IndexMap;
 use itertools::{izip, Itertools};
 use non_empty_vec::NonEmpty;
 use std::sync::mpsc::Sender;
@@ -18,7 +19,6 @@ use super::syncer_logic::handle_blocks;
 use crate::service;
 use crate::service::{KeyService, SyncState, Wallet, WalletState, WalletStateMemento};
 use crate::TransactionObfuscation;
-use std::collections::BTreeMap;
 
 /// Transaction decryptor interface for wallet synchronizer
 pub trait TxDecryptor: Clone + Send + Sync {
@@ -484,7 +484,7 @@ pub(crate) struct FilteredBlock {
     /// Block time
     pub block_time: Time,
     /// List of successfully committed transaction ids in this block and their fees
-    pub valid_transaction_fees: BTreeMap<TxId, Fee>,
+    pub valid_transaction_fees: IndexMap<TxId, Fee>,
     /// Bloom filter for view keys and staking addresses
     pub block_filter: BlockFilter,
     /// List of successfully committed transaction of transactions that may need to be queried against

client-core/src/wallet/syncer_logic.rs

@@ -228,6 +228,7 @@ fn calculate_balance_change<'a>(
 
 #[cfg(test)]
 mod tests {
+    use indexmap::IndexMap;
     use secstr::SecUtf8;
     use std::str::FromStr;
 
@@ -243,7 +244,6 @@ mod tests {
     use crate::service::load_wallet;
     use crate::types::WalletKind;
     use crate::wallet::{DefaultWalletClient, WalletClient};
-    use std::collections::BTreeMap;
 
     fn create_test_wallet(n: usize) -> Result<Vec<Wallet>> {
         let storage = MemoryStorage::default();
@@ -302,7 +302,7 @@ mod tests {
             .map(|tx| tx.id())
             .chain(other_txs.iter().map(|tx| tx.id()))
             .collect();
-        let mut valid_transaction_fees = BTreeMap::new();
+        let mut valid_transaction_fees = IndexMap::new();
         for txid in valid_transaction_ids.iter() {
             valid_transaction_fees.insert(*txid, Fee::new(Coin::one()));
         }