consensus: updated branch with latest master

src/consensus/validator.rs

@@ -45,7 +45,7 @@ use super::{
 use crate::{
     blockchain::{Blockchain, BlockchainOverlay, BlockchainOverlayPtr},
     rpc::jsonrpc::JsonNotification,
-    runtime::vm_runtime::Runtime,
+    runtime::vm_runtime::{Runtime, SMART_CONTRACT_ZKAS_DB_NAME},
     system::{Subscriber, SubscriberPtr},
     tx::Transaction,
     util::time::Timestamp,