pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-20 23:21:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

store contract keys with blake2_256 (#2414)

Browse Source 
* store contract keys with blake2_256

* bump version
This commit is contained in:
thiolliere
2019-04-29 16:13:45 +02:00
committed by Gavin Wood
parent 0b6490854d
commit bb9746c798
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/node/runtime/src/lib.rs
+1 -1
View File
@@ -58,7 +58,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
spec_name: create_runtime_str!("node"), spec_name: create_runtime_str!("node"),
impl_name: create_runtime_str!("substrate-node"), impl_name: create_runtime_str!("substrate-node"),
authoring_version: 10, authoring_version: 10,
spec_version: 66, spec_version: 67,
impl_version: 67, impl_version: 67,
apis: RUNTIME_API_VERSIONS, apis: RUNTIME_API_VERSIONS,
}; };
substrate/srml/contract/src/account_db.rs
+5 -4
View File
@@ -22,6 +22,7 @@ use system;
use rstd::cell::RefCell; use rstd::cell::RefCell;
use rstd::collections::btree_map::{BTreeMap, Entry}; use rstd::collections::btree_map::{BTreeMap, Entry};
use rstd::prelude::*; use rstd::prelude::*;
use runtime_io::blake2_256;
use runtime_primitives::traits::Zero; use runtime_primitives::traits::Zero;
use srml_support::{StorageMap, traits::{UpdateBalanceOutcome, use srml_support::{StorageMap, traits::{UpdateBalanceOutcome,
SignedImbalance, Currency, Imbalance}, storage::child}; SignedImbalance, Currency, Imbalance}, storage::child};
@@ -62,7 +63,7 @@ pub trait AccountDb<T: Trait> {
pub struct DirectAccountDb; pub struct DirectAccountDb;
impl<T: Trait> AccountDb<T> for DirectAccountDb { impl<T: Trait> AccountDb<T> for DirectAccountDb {
fn get_storage(&self, _account: &T::AccountId, trie_id: Option<&TrieId>, location: &StorageKey) -> Option<Vec<u8>> { fn get_storage(&self, _account: &T::AccountId, trie_id: Option<&TrieId>, location: &StorageKey) -> Option<Vec<u8>> {
trie_id.and_then(|id| child::get_raw(id, location)) trie_id.and_then(|id| child::get_raw(id, &blake2_256(location)))
} }
fn get_code(&self, account: &T::AccountId) -> Option<CodeHash<T>> { fn get_code(&self, account: &T::AccountId) -> Option<CodeHash<T>> {
<CodeHashOf<T>>::get(account) <CodeHashOf<T>>::get(account)
@@ -105,14 +106,14 @@ impl<T: Trait> AccountDb<T> for DirectAccountDb {
let mut new_storage_size = info.storage_size; let mut new_storage_size = info.storage_size;
for (k, v) in changed.storage.into_iter() { for (k, v) in changed.storage.into_iter() {
if let Some(value) = child::get_raw(&info.trie_id[..], &k) { if let Some(value) = child::get_raw(&info.trie_id[..], &blake2_256(&k)) {
new_storage_size -= value.len() as u64; new_storage_size -= value.len() as u64;
} }
if let Some(value) = v { if let Some(value) = v {
new_storage_size += value.len() as u64; new_storage_size += value.len() as u64;
child::put_raw(&info.trie_id[..], &k, &value[..]); child::put_raw(&info.trie_id[..], &blake2_256(&k), &value[..]);
} else { } else {
child::kill(&info.trie_id[..], &k); child::kill(&info.trie_id[..], &blake2_256(&k));
} }
} }