pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-07-20 05:45:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix extensions handling for Parachain validation (#1015)

Browse Source 
The `TaskExecutor` extension is now required by Substrate to batch verify signatures.

Co-authored-by: NikVolf <nikvolf@gmail.com>
This commit is contained in:
Bastian Köcher
2020-04-21 18:59:59 +02:00
committed by GitHub
parent 2e521d30ea
commit ed9c8ce662
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/parachain/src/wasm_executor/mod.rs
+16 -12
View File
@@ -26,6 +26,7 @@ use codec::{Decode, Encode};
use sp_core::storage::ChildInfo; use sp_core::storage::ChildInfo;
use sp_core::traits::CallInWasm; use sp_core::traits::CallInWasm;
use sp_wasm_interface::HostFunctions as _; use sp_wasm_interface::HostFunctions as _;
use sp_externalities::Extensions;
#[cfg(not(target_os = "unknown"))] #[cfg(not(target_os = "unknown"))]
pub use validation_host::{run_worker, ValidationPool, EXECUTION_TIMEOUT_SEC}; pub use validation_host::{run_worker, ValidationPool, EXECUTION_TIMEOUT_SEC};
@@ -171,7 +172,11 @@ pub fn validate_candidate_internal<E: Externalities + 'static>(
encoded_call_data: &[u8], encoded_call_data: &[u8],
externalities: E, externalities: E,
) -> Result<ValidationResult, Error> { ) -> Result<ValidationResult, Error> {
let mut ext = ValidationExternalities(ParachainExt::new(externalities)); let mut extensions = Extensions::new();
extensions.register(ParachainExt::new(externalities));
extensions.register(sp_core::traits::TaskExecutorExt(sp_core::tasks::executor()));
let mut ext = ValidationExternalities(extensions);
let executor = sc_executor::WasmExecutor::new( let executor = sc_executor::WasmExecutor::new(
sc_executor::WasmExecutionMethod::Interpreted, sc_executor::WasmExecutionMethod::Interpreted,
@@ -194,7 +199,7 @@ pub fn validate_candidate_internal<E: Externalities + 'static>(
/// The validation externalities that will panic on any storage related access. They just provide /// The validation externalities that will panic on any storage related access. They just provide
/// access to the parachain extension. /// access to the parachain extension.
struct ValidationExternalities(ParachainExt); struct ValidationExternalities(Extensions);
impl sp_externalities::Externalities for ValidationExternalities { impl sp_externalities::Externalities for ValidationExternalities {
fn storage(&self, _: &[u8]) -> Option<Vec<u8>> { fn storage(&self, _: &[u8]) -> Option<Vec<u8>> {
@@ -268,25 +273,24 @@ impl sp_externalities::Externalities for ValidationExternalities {
impl sp_externalities::ExtensionStore for ValidationExternalities { impl sp_externalities::ExtensionStore for ValidationExternalities {
fn extension_by_type_id(&mut self, type_id: TypeId) -> Option<&mut dyn Any> { fn extension_by_type_id(&mut self, type_id: TypeId) -> Option<&mut dyn Any> {
if type_id == TypeId::of::<ParachainExt>() { self.0.get_mut(type_id)
Some(&mut self.0)
} else {
None
}
} }
fn register_extension_with_type_id( fn register_extension_with_type_id(
&mut self, &mut self,
_type_id: TypeId, type_id: TypeId,
_extension: Box<dyn sp_externalities::Extension>, extension: Box<dyn sp_externalities::Extension>,
) -> Result<(), sp_externalities::Error> { ) -> Result<(), sp_externalities::Error> {
panic!("register_extension_with_type_id: unsupported feature for parachain validation") self.0.register_with_type_id(type_id, extension)
} }
fn deregister_extension_by_type_id( fn deregister_extension_by_type_id(
&mut self, &mut self,
_type_id: TypeId, type_id: TypeId,
) -> Result<(), sp_externalities::Error> { ) -> Result<(), sp_externalities::Error> {
panic!("deregister_extension_by_type_id: unsupported feature for parachain validation") match self.0.deregister(type_id) {
Some(_) => Ok(()),
None => Err(sp_externalities::Error::ExtensionIsNotRegistered(type_id))
}
} }
} }