Restore intermediate state root (paritytech#207)

This reverts commit 128f173.
moonbeam-foundation · Jan 26, 2021 · 1d9ca34 · 1d9ca34
1 parent d869aa8
commit 1d9ca34
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -304,17 +304,13 @@ impl fp_rpc::ConvertTransaction<opaque::UncheckedExtrinsic> for TransactionConve
 
 pub struct EthereumFindAuthor<F>(PhantomData<F>);
 
-parameter_types! {
-	pub const DefaultStateRoot: H256 = H256::zero();
-}
-
 impl pallet_ethereum::Config for Runtime {
 	type Event = Event;
 	#[cfg(not(feature = "standalone"))]
 	type FindAuthor = EthereumFindAuthor<PhantomAura>;
 	#[cfg(feature = "standalone")]
 	type FindAuthor = EthereumFindAuthor<Aura>;
-	type StateRoot = DefaultStateRoot;
+	type StateRoot = pallet_ethereum::IntermediateStateRoot;
 }
 
 // 18 decimals

diff --git a/runtime/src/parachain.rs b/runtime/src/parachain.rs
@@ -22,7 +22,7 @@ macro_rules! runtime_parachain {
 			spec_name: create_runtime_str!("moonbase-alphanet"),
 			impl_name: create_runtime_str!("moonbase-alphanet"),
 			authoring_version: 3,
-			spec_version: 10,
+			spec_version: 11,
 			impl_version: 1,
 			apis: RUNTIME_API_VERSIONS,
 			transaction_version: 2,

diff --git a/runtime/src/standalone.rs b/runtime/src/standalone.rs
@@ -31,7 +31,7 @@ macro_rules! runtime_standalone {
 			spec_name: create_runtime_str!("moonbeam-standalone"),
 			impl_name: create_runtime_str!("moonbeam-standalone"),
 			authoring_version: 3,
-			spec_version: 10,
+			spec_version: 11,
 			impl_version: 1,
 			apis: RUNTIME_API_VERSIONS,
 			transaction_version: 2,