Update substrate to latest master

Phala-Network · Dec 28, 2021 · 2d281dd · 2d281dd
1 parent 56a3687
commit 2d281dd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/crates/phala-trie-storage/src/lib.rs b/crates/phala-trie-storage/src/lib.rs
@@ -14,7 +14,7 @@ use serde::{Serialize, Serializer, Deserializer, Deserialize};
 use sp_core::storage::ChildInfo;
 use sp_core::Hasher;
 use sp_state_machine::{Backend, TrieBackend};
-use sp_trie::{trie_types::TrieDBMut, MemoryDB, TrieMut, HashDBT};
+use sp_trie::{trie_types::TrieDBMutV0 as TrieDBMut, MemoryDB, TrieMut, HashDBT};
 
 /// Storage key.
 pub type StorageKey = Vec<u8>;
@@ -130,6 +130,7 @@ where
                         .map(|(k, v)| (k.as_ref(), v.as_ref().map(|v| v.as_ref()))),
                 )
             }),
+            sp_core::storage::StateVersion::V0,
         )
     }
 

diff --git a/crates/pink/src/storage.rs b/crates/pink/src/storage.rs
@@ -72,7 +72,7 @@ where
         });
 
         self.backend
-            .full_storage_root(delta, child_delta)
+            .full_storage_root(delta, child_delta, sp_core::storage::StateVersion::V0)
     }
 
     pub fn commit_transaction(&mut self, root: Hash, transaction: Backend::Transaction) {

diff --git a/standalone/runtime/src/lib.rs b/standalone/runtime/src/lib.rs
@@ -141,6 +141,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
+	state_version: 0,
 };
 
 /// The BABE epoch configuration at genesis.