Fix issue with future

.github/workflows/mangata-dev.yml

@@ -9,7 +9,7 @@ on:
 name: CI
 
 env:
-  TOOLCHAIN: nightly-2022-05-11
+  TOOLCHAIN: nightly-2022-09-19
 
 
 jobs:
@@ -34,6 +34,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v2
       - name: Install ${{ env.TOOLCHAIN }}
         uses: actions-rs/toolchain@v1
@@ -52,6 +56,10 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
+      - name: Install Protoc
+        uses: arduino/setup-protoc@v1
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
       - uses: actions/checkout@v2
       - name: Install ${{ env.TOOLCHAIN }}
         uses: actions-rs/toolchain@v1

client/consensus/slots/src/lib.rs

@@ -40,14 +40,12 @@ use sc_telemetry::{telemetry, TelemetryHandle, CONSENSUS_DEBUG, CONSENSUS_INFO,
 use sp_arithmetic::traits::BaseArithmetic;
 use sp_consensus::{Proposal, Proposer, SelectChain, SyncOracle};
 use sp_consensus_slots::{Slot, SlotDuration};
-use sp_core::{crypto::key_types::AURA, sr25519, ShufflingSeed};
+use sp_core::{sr25519, ShufflingSeed};
 use sp_inherents::{CreateInherentDataProviders, InherentDataProvider};
 use sp_keystore::{vrf, SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{
-	generic::BlockId,
 	traits::{Block as BlockT, HashFor, Header as HeaderT},
 };
-use sp_timestamp::Timestamp;
 use sp_ver::RandomSeedInherentDataProvider;
 use std::{fmt::Debug, ops::Deref, time::{Duration, Instant}};
 
@@ -394,7 +392,7 @@ pub trait SimpleSlotWorker<B: BlockT> {
 		let claim = self.claim_slot(&slot_info.chain_head, slot, &aux_data).await?;
 
 		let key = self.get_key(&claim);
-		inject_inherents(keystore, &key, &mut slot_info);
+		inject_inherents(keystore, &key, &mut slot_info).await.ok();
 
 		if self.should_backoff(slot, &slot_info.chain_head) {
 			return None

frame/collective-mangata/src/lib.rs

@@ -405,6 +405,7 @@ pub mod pallet {
 		///   - `P` storage mutations (codec `O(M)`) for updating the votes for each proposal
 		///   - 1 storage write (codec `O(1)`) for deleting the old `prime` and setting the new one
 		/// # </weight>
+		#[pallet::call_index(0)]
 		#[pallet::weight((
 			T::WeightInfo::set_members(
 				*old_count, // M
@@ -462,6 +463,7 @@ pub mod pallet {
 		/// - DB: 1 read (codec `O(M)`) + DB access of `proposal`
 		/// - 1 event
 		/// # </weight>
+		#[pallet::call_index(1)]
 		#[pallet::weight((
 			T::WeightInfo::execute(
 				*length_bound, // B
@@ -532,6 +534,7 @@ pub mod pallet {
 		///       - 1 storage write `Voting` (codec `O(M)`)
 		///   - 1 event
 		/// # </weight>
+		#[pallet::call_index(2)]
 		#[pallet::weight((
 			if *threshold < 2 {
 				T::WeightInfo::propose_execute(
@@ -597,6 +600,7 @@ pub mod pallet {
 		///   - 1 storage mutation `Voting` (codec `O(M)`)
 		/// - 1 event
 		/// # </weight>
+		#[pallet::call_index(3)]
 		#[pallet::weight((T::WeightInfo::vote(T::MaxMembers::get()), DispatchClass::Operational))]
 		pub fn vote(
 			origin: OriginFor<T>,
@@ -650,6 +654,7 @@ pub mod pallet {
 		///  - any mutations done while executing `proposal` (`P1`)
 		/// - up to 3 events
 		/// # </weight>
+		#[pallet::call_index(4)]
 		#[pallet::weight((
 			{
 				let b = *length_bound;
@@ -690,6 +695,7 @@ pub mod pallet {
 		/// * Reads: Proposals
 		/// * Writes: Voting, Proposals, ProposalOf
 		/// # </weight>
+		#[pallet::call_index(5)]
 		#[pallet::weight(T::WeightInfo::disapprove_proposal(T::MaxProposals::get()))]
 		pub fn disapprove_proposal(
 			origin: OriginFor<T>,

frame/executive/src/lib.rs

@@ -873,7 +873,7 @@ mod tests {
 	use frame_system::{Call as SystemCall, ChainContext, LastRuntimeUpgradeInfo};
 	use pallet_balances::Call as BalancesCall;
 	use pallet_transaction_payment::CurrencyAdapter;
-	use sp_core::{crypto::key_types::AURA};
+	use sp_core::crypto::key_types::AURA;
 	use sp_keystore::{
 		vrf::{VRFTranscriptData, VRFTranscriptValue},
 		SyncCryptoStore,

frame/sudo-mangata/src/lib.rs

@@ -153,6 +153,7 @@ pub mod pallet {
 		/// - One DB write (event).
 		/// - Weight of derivative `call` execution + 10,000.
 		/// # </weight>
+		#[pallet::call_index(0)]
 		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
 			(dispatch_info.weight, dispatch_info.class)
@@ -184,6 +185,7 @@ pub mod pallet {
 		/// - O(1).
 		/// - The weight of this call is defined by the caller.
 		/// # </weight>
+		#[pallet::call_index(1)]
 		#[pallet::weight((*_weight, call.get_dispatch_info().class))]
 		pub fn sudo_unchecked_weight(
 			origin: OriginFor<T>,
@@ -218,6 +220,7 @@ pub mod pallet {
 		/// - Limited storage reads.
 		/// - One DB change.
 		/// # </weight>
+		#[pallet::call_index(2)]
 		#[pallet::weight(0)]
 		pub fn set_key(
 			origin: OriginFor<T>,
@@ -246,6 +249,7 @@ pub mod pallet {
 		/// - One DB write (event).
 		/// - Weight of derivative `call` execution + 10,000.
 		/// # </weight>
+		#[pallet::call_index(3)]
 		#[pallet::weight({
 			let dispatch_info = call.get_dispatch_info();
 			(

frame/system/src/lib.rs

@@ -379,6 +379,7 @@ pub mod pallet {
 		/// Persists list of encoded txs into the storage queue. There is an dedicated
 		/// check in [Executive](https://storage.googleapis.com/mangata-docs-node/frame_executive/struct.Executive.html) that verifies that passed binary data can be
 		/// decoded into extrinsics.
+		#[pallet::call_index(0)]
 		#[pallet::weight((
 			0,
 			DispatchClass::Mandatory

frame/vesting-mangata/src/lib.rs

@@ -294,6 +294,7 @@ pub mod pallet {
 		///     - Reads: Vesting Storage, Balances Locks, [Sender Account]
 		///     - Writes: Vesting Storage, Balances Locks, [Sender Account]
 		/// # </weight>
+		#[pallet::call_index(0)]
 		#[pallet::weight(T::WeightInfo::vest_locked(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
 			.max(T::WeightInfo::vest_unlocked(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES))
 		)]
@@ -317,6 +318,7 @@ pub mod pallet {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account
 		///     - Writes: Vesting Storage, Balances Locks, Target Account
 		/// # </weight>
+		#[pallet::call_index(1)]
 		#[pallet::weight(T::WeightInfo::vest_other_locked(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
 			.max(T::WeightInfo::vest_other_unlocked(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES))
 		)]
@@ -348,6 +350,7 @@ pub mod pallet {
 		///     - Reads: Vesting Storage, Balances Locks, Target Account, Source Account
 		///     - Writes: Vesting Storage, Balances Locks, Target Account, Source Account
 		/// # </weight>
+		#[pallet::call_index(2)]
 		#[pallet::weight(
 			T::WeightInfo::force_vested_transfer(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
 		)]
@@ -383,6 +386,7 @@ pub mod pallet {
 		///
 		/// - `schedule1_index`: index of the first schedule to merge.
 		/// - `schedule2_index`: index of the second schedule to merge.
+		#[pallet::call_index(3)]
 		#[pallet::weight(
 			T::WeightInfo::not_unlocking_merge_schedules(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES)
 			.max(T::WeightInfo::unlocking_merge_schedules(MaxLocksOf::<T>::get(), T::MAX_VESTING_SCHEDULES))
@@ -413,6 +417,7 @@ pub mod pallet {
 
 		// TODO
 		// Needs to be benchmarked
+		#[pallet::call_index(4)]
 		#[pallet::weight(400_000_000u64)]
 		pub fn sudo_unlock_all_vesting_tokens(
 			origin: OriginFor<T>,

primitives/keystore/src/testing.rs

@@ -368,11 +368,8 @@ impl SyncCryptoStore for KeyStore {
 		transcript_data: VRFTranscriptData,
 	) -> Result<Option<VRFSignature>, Error> {
 		let transcript = make_transcript(transcript_data);
-		let pair = if let Some(k) = self.sr25519_key_pair(key_type, public) {
-			k
-		} else {
-			return Ok(None)
-		};
+		let pair =
+			if let Some(k) = self.sr25519_key_pair(key_type, public) { k } else { return Ok(None) };
 
 		let (inout, proof, _) = pair.as_ref().vrf_sign(transcript);
 		Ok(Some(VRFSignature { output: inout.to_output(), proof }))