diff --git a/substrate/core/client/src/client.rs b/substrate/core/client/src/client.rs index 34334b1388e34fc82a9ea25d1057721400ec7a13..796520cb7f005e43c63ad2bcd7409736fcf068da 100644 --- a/substrate/core/client/src/client.rs +++ b/substrate/core/client/src/client.rs @@ -1059,10 +1059,10 @@ impl<B, E, Block, RA> Client<B, E, Block, RA> where } }; - let encoded_block = <Block as BlockT>::new( - import_headers.pre().clone(), - body.unwrap_or_default(), - ).encode(); + let encoded_block = <Block as BlockT>::encode_from( + import_headers.pre(), + &body.unwrap_or_default() + ); let (_, storage_update, changes_update) = self.executor .call_at_state::<_, _, NeverNativeValue, fn() -> _>( diff --git a/substrate/core/sr-primitives/src/generic/block.rs b/substrate/core/sr-primitives/src/generic/block.rs index 736ad0cbbb6368199ce4fa046c253bdddf66f0a3..29fcaab57290163f87c35ee6448a7a92937765a2 100644 --- a/substrate/core/sr-primitives/src/generic/block.rs +++ b/substrate/core/sr-primitives/src/generic/block.rs @@ -93,6 +93,9 @@ where fn new(header: Self::Header, extrinsics: Vec<Self::Extrinsic>) -> Self { Block { header, extrinsics } } + fn encode_from(header: &Self::Header, extrinsics: &[Self::Extrinsic]) -> Vec<u8> { + (header, extrinsics).encode() + } } /// Abstraction over a substrate block and justification. diff --git a/substrate/core/sr-primitives/src/testing.rs b/substrate/core/sr-primitives/src/testing.rs index 5391735576aa212e49bc14083e504e0d358a02ad..b7903471188151c8912ee6d387f651194b9a0e34 100644 --- a/substrate/core/sr-primitives/src/testing.rs +++ b/substrate/core/sr-primitives/src/testing.rs @@ -259,6 +259,9 @@ impl<Xt: 'static + Codec + Sized + Send + Sync + Serialize + Clone + Eq + Debug fn new(header: Self::Header, extrinsics: Vec<Self::Extrinsic>) -> Self { Block { header, extrinsics } } + fn encode_from(header: &Self::Header, extrinsics: &[Self::Extrinsic]) -> Vec<u8> { + (header, extrinsics).encode() + } } impl<'a, Xt> Deserialize<'a> for Block<Xt> where Block<Xt>: Decode { diff --git a/substrate/core/sr-primitives/src/traits.rs b/substrate/core/sr-primitives/src/traits.rs index f94a71d38a6c5f6d31e278b8d89e7ec8e7c80909..a589f5f389d0bc99cde3e50974ad3371c80d843b 100644 --- a/substrate/core/sr-primitives/src/traits.rs +++ b/substrate/core/sr-primitives/src/traits.rs @@ -687,6 +687,8 @@ pub trait Block: Clone + Send + Sync + Codec + Eq + MaybeSerializeDebugButNotDes fn hash(&self) -> Self::Hash { <<Self::Header as Header>::Hashing as Hash>::hash_of(self.header()) } + /// Create an encoded block from the given `header` and `extrinsics` without requiring to create an instance. + fn encode_from(header: &Self::Header, extrinsics: &[Self::Extrinsic]) -> Vec<u8>; } /// Something that acts like an `Extrinsic`. diff --git a/substrate/node/runtime/src/lib.rs b/substrate/node/runtime/src/lib.rs index 70b1b8f16a7cb6e4e6ae3f05e7768dd24ba25712..d8fc9a1a5784a7e5b211598f2541bcd4f03f2874 100644 --- a/substrate/node/runtime/src/lib.rs +++ b/substrate/node/runtime/src/lib.rs @@ -85,7 +85,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion { // implementation changes and behavior does not, then leave spec_version as // is and increment impl_version. spec_version: 175, - impl_version: 175, + impl_version: 176, apis: RUNTIME_API_VERSIONS, };