Moar progress (reenable author inherent)

pallets/author-filter/Cargo.toml

@@ -10,6 +10,7 @@ parity-scale-codec = { version = "2.0.0", default-features = false, features = [
 frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
 frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
 sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
 sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "rococo-v1" }
 author-inherent = { path = "../author-inherent", default-features = false }
 parachain-staking = { path = "../parachain-staking", default-features = false }

pallets/author-filter/src/lib.rs

@@ -38,11 +38,10 @@ pub mod pallet {
 	use frame_support::log;
 	use frame_support::pallet_prelude::*;
 	use frame_support::traits::Randomness;
-	use frame_support::traits::Vec;
 	use frame_system::pallet_prelude::*;
 	use sp_core::H256;
 	use sp_runtime::Percent;
-
+	use sp_std::vec::Vec;
 	/// The Author Filter pallet
 	#[pallet::pallet]
 	pub struct Pallet<T>(PhantomData<T>);

runtime/Cargo.toml

@@ -18,7 +18,7 @@ precompiles = { path = "precompiles/", default-features = false }
 account = { path = "account/", default-features = false }
 pallet-ethereum-chain-id = { path = "../pallets/ethereum-chain-id", default-features = false }
 parachain-staking = { path = "../pallets/parachain-staking", default-features = false }
-# author-inherent = { path = "../pallets/author-inherent", default-features = false }
+author-inherent = { path = "../pallets/author-inherent", default-features = false }
 pallet-author-filter = { path = "../pallets/author-filter", default-features = false }
 
 # Substrate dependencies
@@ -109,15 +109,15 @@ std = [
 	"pallet-democracy/std",
 	"pallet-scheduler/std",
 	"pallet-collective/std",
-
+	"author-inherent/std",
 	"moonbeam-extensions-evm/std",
 	"parachain-info/std",
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-primitives-core/std",
 	"account/std",
 	"parachain-staking/std",
 	"pallet-author-filter/std",
-] # "author-inherent/std",
+]
 
 # Will be enabled by the `wasm-builder` when building the runtime for WASM.
 runtime-wasm = [] # "cumulus-upward-message/runtime-wasm",	

runtime/src/lib.rs

@@ -443,7 +443,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type OnValidationData = ();
 	type SelfParaId = ParachainInfo;
 	type DownwardMessageHandlers = ();
-	type HrmpMessageHandlers = ();
 }
 
 impl parachain_info::Config for Runtime {}
@@ -487,16 +486,14 @@ impl parachain_staking::Config for Runtime {
 	type MinNominatorStk = MinNominatorStk;
 }
 
-// Try to disable this pallet to make the runtime compile.
-
-// impl author_inherent::Config for Runtime {
-// 	type EventHandler = ParachainStaking;
-// 	// We cannot run the full filtered author checking logic in the preliminary check because it
-// 	// depends on entropy from the relay chain. Instead we just make sure that the author is staked
-// 	// in the preliminary check. The final check including the filtering happens during execution.
-// 	type PreliminaryCanAuthor = ParachainStaking;
-// 	type FinalCanAuthor = AuthorFilter;
-// }
+impl author_inherent::Config for Runtime {
+	type EventHandler = ParachainStaking;
+	// We cannot run the full filtered author checking logic in the preliminary check because it
+	// depends on entropy from the relay chain. Instead we just make sure that the author is staked
+	// in the preliminary check. The final check including the filtering happens during execution.
+	type PreliminaryCanAuthor = ParachainStaking;
+	type FinalCanAuthor = AuthorFilter;
+}
 
 impl pallet_author_filter::Config for Runtime {
 	type Event = Event;
@@ -531,7 +528,7 @@ construct_runtime! {
 		// The order matters here. Inherents will be included in the order specified here.
 		// Concretely we need the author inherent to come after the parachain_upgrade inherent.
 		AuthorInherent: author_inherent::{Pallet, Call, Storage, Inherent},
-		// AuthorFilter: pallet_author_filter::{Pallet, Call, Storage, Event<T>,}
+		AuthorFilter: pallet_author_filter::{Pallet, Call, Storage, Event<T>,}
 	}
 }
 
@@ -1027,10 +1024,6 @@ impl_runtime_apis! {
 				Ethereum::current_transaction_statuses()
 			)
 		}
-
-		fn current_block_gas_limit() -> U256 {
-			<Runtime as pallet_evm::Config>::BlockGasLimit::get()
-		}
 	}
 
 	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance>