Add ibc_data state

majecty · majecty · commit ce2d935bb5ba · 2020-02-11T18:30:26.000+09:00
diff --git a/state/src/cache/global_cache.rs b/state/src/cache/global_cache.rs
@@ -16,7 +16,7 @@
 
 use super::lru_cache::LruCache;
 use super::{ShardCache, TopCache};
-use crate::{Account, ActionData, Metadata, RegularAccount, Shard, ShardText};
+use crate::{Account, ActionData, IBCData, Metadata, RegularAccount, Shard, ShardText};
 use ctypes::ShardId;
 use std::collections::{HashMap, HashSet};
 
@@ -26,18 +26,27 @@ pub struct GlobalCache {
     metadata: LruCache<Metadata>,
     shard: LruCache<Shard>,
     action_data: LruCache<ActionData>,
+    ibc_data: LruCache<IBCData>,
 
     shard_text: LruCache<ShardText>,
 }
 
 impl GlobalCache {
-    pub fn new(account: usize, regular_account: usize, shard: usize, action_data: usize, shard_text: usize) -> Self {
+    pub fn new(
+        account: usize,
+        regular_account: usize,
+        shard: usize,
+        action_data: usize,
+        ibc_data: usize,
+        shard_text: usize,
+    ) -> Self {
         Self {
             account: LruCache::new(account),
             regular_account: LruCache::new(regular_account),
             metadata: LruCache::new(1),
             shard: LruCache::new(shard),
             action_data: LruCache::new(action_data),
+            ibc_data: LruCache::new(ibc_data),
 
             shard_text: LruCache::new(shard_text),
         }
@@ -50,6 +59,7 @@ impl GlobalCache {
             self.metadata.iter().map(|(addr, item)| (*addr, item.clone())),
             self.shard.iter().map(|(addr, item)| (*addr, item.clone())),
             self.action_data.iter().map(|(addr, item)| (*addr, item.clone())),
+            self.ibc_data.iter().map(|(addr, item)| (*addr, item.clone())),
         )
     }
 
@@ -103,6 +113,12 @@ impl GlobalCache {
                 None => self.action_data.remove(&addr),
             };
         }
+        for (addr, item) in top_cache.cached_ibc_data().into_iter() {
+            match item {
+                Some(item) => self.ibc_data.insert(addr, item),
+                None => self.ibc_data.remove(&addr),
+            };
+        }
 
         let mut cached_shard_texts: Vec<_> =
             shard_caches.iter().flat_map(|(_, shard_cache)| shard_cache.cached_shard_text().into_iter()).collect();
@@ -121,6 +137,7 @@ impl GlobalCache {
         self.metadata.clear();
         self.shard.clear();
         self.action_data.clear();
+        self.ibc_data.clear();
         self.shard_text.clear();
     }
 }
@@ -132,8 +149,9 @@ impl Default for GlobalCache {
         const N_REGULAR_ACCOUNT: usize = 100;
         const N_SHARD: usize = 100;
         const N_ACTION_DATA: usize = 10;
+        const N_IBC_DATA: usize = 100;
         const N_SHARD_TEXT: usize = 1000;
-        Self::new(N_ACCOUNT, N_REGULAR_ACCOUNT, N_SHARD, N_ACTION_DATA, N_SHARD_TEXT)
+        Self::new(N_ACCOUNT, N_REGULAR_ACCOUNT, N_SHARD, N_ACTION_DATA, N_IBC_DATA, N_SHARD_TEXT)
     }
 }
 
@@ -145,6 +163,7 @@ impl Clone for GlobalCache {
             metadata: self.metadata.clone(),
             shard: self.shard.clone(),
             action_data: self.action_data.clone(),
+            ibc_data: self.ibc_data.clone(),
 
             shard_text: self.shard_text.clone(),
         }
diff --git a/state/src/cache/top_cache.rs b/state/src/cache/top_cache.rs
@@ -16,7 +16,7 @@
 
 use super::WriteBack;
 use crate::{
-    Account, ActionData, Metadata, MetadataAddress, RegularAccount, RegularAccountAddress, Shard, ShardAddress,
+    Account, ActionData, IBCData, Metadata, MetadataAddress, RegularAccount, RegularAccountAddress, Shard, ShardAddress,
 };
 use ckey::Address;
 use merkle_trie::{Result as TrieResult, Trie, TrieMut};
@@ -29,6 +29,7 @@ pub struct TopCache {
     metadata: WriteBack<Metadata>,
     shard: WriteBack<Shard>,
     action_data: WriteBack<ActionData>,
+    ibc_data: WriteBack<IBCData>,
 }
 
 impl TopCache {
@@ -38,13 +39,15 @@ impl TopCache {
         metadata: impl Iterator<Item = (MetadataAddress, Metadata)>,
         shards: impl Iterator<Item = (ShardAddress, Shard)>,
         action_data: impl Iterator<Item = (H256, ActionData)>,
+        ibc_data: impl Iterator<Item = (H256, IBCData)>,
     ) -> Self {
         Self {
             account: WriteBack::new_with_iter(accounts),
             regular_account: WriteBack::new_with_iter(regular_accounts),
             metadata: WriteBack::new_with_iter(metadata),
             shard: WriteBack::new_with_iter(shards),
             action_data: WriteBack::new_with_iter(action_data),
+            ibc_data: WriteBack::new_with_iter(ibc_data),
         }
     }
 
@@ -54,6 +57,7 @@ impl TopCache {
         self.metadata.checkpoint();
         self.shard.checkpoint();
         self.action_data.checkpoint();
+        self.ibc_data.checkpoint();
     }
 
     pub fn discard_checkpoint(&mut self) {
@@ -62,6 +66,7 @@ impl TopCache {
         self.metadata.discard_checkpoint();
         self.shard.discard_checkpoint();
         self.action_data.discard_checkpoint();
+        self.ibc_data.discard_checkpoint();
     }
 
     pub fn revert_to_checkpoint(&mut self) {
@@ -70,6 +75,7 @@ impl TopCache {
         self.metadata.revert_to_checkpoint();
         self.shard.revert_to_checkpoint();
         self.action_data.revert_to_checkpoint();
+        self.ibc_data.revert_to_checkpoint();
     }
 
     pub fn commit<'db>(&mut self, trie: &mut (dyn TrieMut + 'db)) -> TrieResult<()> {
@@ -78,6 +84,7 @@ impl TopCache {
         self.metadata.commit(trie)?;
         self.shard.commit(trie)?;
         self.action_data.commit(trie)?;
+        self.ibc_data.commit(trie)?;
         Ok(())
     }
 
@@ -142,6 +149,18 @@ impl TopCache {
         self.action_data.remove(address)
     }
 
+    pub fn ibc_data(&self, a: &H256, db: &dyn Trie) -> TrieResult<Option<IBCData>> {
+        self.ibc_data.get(a, db)
+    }
+
+    pub fn ibc_data_mut(&self, a: &H256, db: &dyn Trie) -> TrieResult<RefMut<'_, IBCData>> {
+        self.ibc_data.get_mut(a, db)
+    }
+
+    pub fn remove_ibc_data(&self, address: &H256) {
+        self.ibc_data.remove(address)
+    }
+
     pub fn cached_accounts(&self) -> Vec<(Address, Option<Account>)> {
         let mut items = self.account.items();
         items.sort_unstable_by(|lhs, rhs| lhs.0.cmp(&rhs.0));
@@ -171,6 +190,12 @@ impl TopCache {
         items.sort_unstable_by(|lhs, rhs| lhs.0.cmp(&rhs.0));
         items.into_iter().map(|(_, addr, item)| (addr, item)).collect()
     }
+
+    pub fn cached_ibc_data(&self) -> Vec<(H256, Option<IBCData>)> {
+        let mut items = self.ibc_data.items();
+        items.sort_unstable_by(|lhs, rhs| lhs.0.cmp(&rhs.0));
+        items.into_iter().map(|(_, addr, item)| (addr, item)).collect()
+    }
 }
 
 impl Clone for TopCache {
@@ -181,6 +206,7 @@ impl Clone for TopCache {
             metadata: self.metadata.clone(),
             shard: self.shard.clone(),
             action_data: self.action_data.clone(),
+            ibc_data: self.ibc_data.clone(),
         }
     }
 }
diff --git a/state/src/impls/top_level.rs b/state/src/impls/top_level.rs
@@ -37,10 +37,11 @@
 
 use crate::cache::{ShardCache, TopCache};
 use crate::checkpoint::{CheckpointId, StateWithCheckpoint};
+use crate::error::Error;
 use crate::traits::{ShardState, ShardStateView, StateWithCache, TopState, TopStateView};
 use crate::{
-    Account, ActionData, FindActionHandler, Metadata, MetadataAddress, RegularAccount, RegularAccountAddress, Shard,
-    ShardAddress, ShardLevelState, StateDB, StateResult,
+    Account, ActionData, FindActionHandler, IBCData, Metadata, MetadataAddress, RegularAccount, RegularAccountAddress,
+    Shard, ShardAddress, ShardLevelState, StateDB, StateResult,
 };
 use ccrypto::BLAKE_NULL_RLP;
 use cdb::{AsHashDB, DatabaseError};
@@ -136,6 +137,12 @@ impl TopStateView for TopLevelState {
         let trie = TrieFactory::readonly(db.as_hashdb(), &self.root)?;
         Ok(self.top_cache.action_data(key, &trie)?.map(Into::into))
     }
+
+    fn ibc_data(&self, key: &H256) -> Result<Option<IBCData>, TrieError> {
+        let db = self.db.borrow();
+        let trie = TrieFactory::readonly(db.as_hashdb(), &self.root)?;
+        Ok(self.top_cache.ibc_data(key, &trie)?.map(Into::into))
+    }
 }
 
 impl StateWithCache for TopLevelState {
@@ -513,6 +520,12 @@ impl TopLevelState {
         self.top_cache.action_data_mut(key, &trie)
     }
 
+    fn get_ibc_data_mut(&self, key: &H256) -> TrieResult<RefMut<'_, IBCData>> {
+        let db = self.db.borrow();
+        let trie = TrieFactory::readonly(db.as_hashdb(), &self.root)?;
+        self.top_cache.ibc_data_mut(key, &trie)
+    }
+
     pub fn journal_under(&self, batch: &mut DBTransaction, now: u64) -> Result<u32, DatabaseError> {
         self.db.borrow_mut().journal_under(batch, now, self.root)
     }
@@ -723,6 +736,16 @@ impl TopState for TopLevelState {
         self.top_cache.remove_action_data(key)
     }
 
+    fn update_ibc_data(&mut self, key: &H256, data: Vec<u8>) -> Result<(), Error> {
+        let mut ibc_data = self.get_ibc_data_mut(key)?;
+        *ibc_data = data.into();
+        Ok(())
+    }
+
+    fn remove_ibc_data(&mut self, key: &H256) {
+        self.top_cache.remove_ibc_data(key)
+    }
+
     fn update_params(&mut self, metadata_seq: u64, params: CommonParams) -> StateResult<()> {
         let mut metadata = self.get_metadata_mut()?;
         if metadata.seq() != metadata_seq {
diff --git a/state/src/item/ibc_data.rs b/state/src/item/ibc_data.rs
@@ -0,0 +1,68 @@
+// Copyright 2020 Kodebox, Inc.
+// This file is part of CodeChain.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+use crate::CacheableItem;
+use primitives::{Bytes, H256};
+use rlp::{Decodable, DecoderError, Encodable, Rlp, RlpStream, NULL_RLP};
+use std::ops::Deref;
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct IBCData(Bytes);
+
+impl Default for IBCData {
+    fn default() -> Self {
+        IBCData(NULL_RLP.to_vec())
+    }
+}
+
+impl Deref for IBCData {
+    type Target = Bytes;
+
+    fn deref(&self) -> &<Self as Deref>::Target {
+        &self.0
+    }
+}
+
+impl CacheableItem for IBCData {
+    type Address = H256;
+    fn is_null(&self) -> bool {
+        self.is_empty()
+    }
+}
+
+impl Encodable for IBCData {
+    fn rlp_append(&self, s: &mut RlpStream) {
+        self.0.rlp_append(s);
+    }
+}
+
+impl Decodable for IBCData {
+    fn decode(rlp: &Rlp<'_>) -> Result<Self, DecoderError> {
+        Bytes::decode(rlp).map(IBCData)
+    }
+}
+
+impl From<Bytes> for IBCData {
+    fn from(f: Vec<u8>) -> Self {
+        IBCData(f)
+    }
+}
+
+impl From<IBCData> for Bytes {
+    fn from(f: IBCData) -> Self {
+        f.0
+    }
+}
diff --git a/state/src/item/mod.rs b/state/src/item/mod.rs
@@ -20,6 +20,7 @@ mod address;
 pub mod account;
 pub mod action_data;
 pub mod dummy_shard_text;
+pub mod ibc_data;
 pub mod metadata;
 pub mod regular_account;
 pub mod shard;
diff --git a/state/src/lib.rs b/state/src/lib.rs
@@ -47,6 +47,7 @@ pub use crate::impls::{ShardLevelState, TopLevelState};
 pub use crate::item::account::Account;
 pub use crate::item::action_data::ActionData;
 pub use crate::item::dummy_shard_text::{ShardText, ShardTextAddress};
+pub use crate::item::ibc_data::IBCData;
 pub use crate::item::metadata::{Metadata, MetadataAddress};
 pub use crate::item::regular_account::{RegularAccount, RegularAccountAddress};
 pub use crate::item::shard::{Shard, ShardAddress};
diff --git a/state/src/traits.rs b/state/src/traits.rs
@@ -14,7 +14,9 @@
 // You should have received a copy of the GNU Affero General Public License
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-use crate::{Account, ActionData, CacheableItem, Metadata, RegularAccount, Shard, ShardText, StateDB, StateResult};
+use crate::{
+    Account, ActionData, CacheableItem, IBCData, Metadata, RegularAccount, Shard, ShardText, StateDB, StateResult,
+};
 use ckey::{public_to_address, Address, Public};
 use ctypes::transaction::ShardTransaction;
 use ctypes::{BlockNumber, CommonParams, ShardId, Tracker, TxHash};
@@ -110,6 +112,8 @@ pub trait TopStateView {
             Some(state) => state.text(tracker),
         }
     }
+
+    fn ibc_data(&self, key: &H256) -> TrieResult<Option<IBCData>>;
 }
 
 pub trait ShardStateView {
@@ -161,6 +165,9 @@ pub trait TopState {
     fn update_action_data(&mut self, key: &H256, data: Bytes) -> StateResult<()>;
     fn remove_action_data(&mut self, key: &H256);
 
+    fn update_ibc_data(&mut self, key: &H256, data: Bytes) -> StateResult<()>;
+    fn remove_ibc_data(&mut self, key: &H256);
+
     fn update_params(&mut self, metadata_seq: u64, params: CommonParams) -> StateResult<()>;
     fn update_term_params(&mut self) -> StateResult<()>;
 }
