Merge branch 'master' into do_not_panic_when_checking_exec_proof

core/state-machine/src/ext.rs

@@ -19,7 +19,10 @@
 use std::{error, fmt, cmp::Ord};
 use log::warn;
 use crate::backend::Backend;
-use crate::changes_trie::{Storage as ChangesTrieStorage, build_changes_trie};
+use crate::changes_trie::{
+	Storage as ChangesTrieStorage, CacheAction as ChangesTrieCacheAction,
+	build_changes_trie,
+};
 use crate::{Externalities, StorageExternalities, OverlayedChanges, ChildStorageKey};
 use hash_db::Hasher;
 use primitives::{offchain, storage::well_known_keys::is_child_storage_key, traits::BareCryptoStorePtr};