pallet grants BlockNumberProvider integration

pallets/grants/src/lib.rs

@@ -32,7 +32,7 @@ use frame_support::{
 };
 use parity_scale_codec::{Decode, Encode};
 use sp_runtime::{
-    traits::{AtLeast32Bit, CheckedAdd, Saturating, StaticLookup, Zero},
+    traits::{AtLeast32Bit, BlockNumberProvider, CheckedAdd, Saturating, StaticLookup, Zero},
     DispatchResult, RuntimeDebug,
 };
 use sp_std::{
@@ -123,6 +123,8 @@ pub mod pallet {
         type ForceOrigin: EnsureOrigin<Self::Origin>;
         /// Weight information for extrinsics in this pallet.
         type WeightInfo: WeightInfo;
+        // The block number provider
+        type BlockNumberProvider: BlockNumberProvider<BlockNumber = Self::BlockNumber>;
     }
 
     #[pallet::pallet]
@@ -231,7 +233,7 @@ pub mod pallet {
             let target = T::Lookup::lookup(who)?;
             VestingSchedules::<T>::insert(target.clone(), new_schedules.clone());
 
-            let now = <frame_system::Pallet<T>>::block_number();
+            let now = T::BlockNumberProvider::current_block_number();
             let new_lock: BalanceOf<T> = new_schedules
                 .iter()
                 .fold(Zero::zero(), |acc, s| {
@@ -374,7 +376,7 @@ impl<T: Config> Pallet<T> {
 
     /// Returns locked balance based on current block number.
     fn locked_balance(who: &T::AccountId) -> BalanceOf<T> {
-        let now = <frame_system::Pallet<T>>::block_number();
+        let now = T::BlockNumberProvider::current_block_number();
         Self::vesting_schedules(who)
             .iter()
             .fold(Zero::zero(), |acc, s| {

pallets/grants/src/mock.rs

@@ -86,6 +86,7 @@ impl Config for Test {
     type CancelOrigin = EnsureSignedBy<CancelOrigin, AccountId>;
     type ForceOrigin = EnsureSignedBy<ForceOrigin, AccountId>;
     type WeightInfo = ();
+    type BlockNumberProvider = frame_system::Pallet<Test>;
 }
 
 pub const ALICE: AccountId = 1;

runtimes/eden/Cargo.toml

@@ -2,7 +2,7 @@
 authors = ["Eliott Teissonniere <[email protected]>"]
 edition = "2018"
 name = "runtime-eden"
-version = "2.0.13"
+version = "2.0.14"
 
 [features]
 default = ["std"]

runtimes/eden/src/implementations.rs

@@ -21,7 +21,8 @@
 
 use crate::{Authorship, Balances, CompanyReserve};
 use frame_support::traits::{Currency, Imbalance, OnUnbalanced};
-use primitives::AccountId;
+use primitives::{AccountId, BlockNumber};
+use sp_runtime::traits::BlockNumberProvider;
 
 /// Logic for the author to get a portion of fees.
 pub struct Author;
@@ -49,3 +50,17 @@ impl OnUnbalanced<NegativeImbalance> for DealWithFees {
         }
     }
 }
+
+pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);
+
+impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider
+    for RelayChainBlockNumberProvider<T>
+{
+    type BlockNumber = BlockNumber;
+
+    fn current_block_number() -> Self::BlockNumber {
+        cumulus_pallet_parachain_system::Pallet::<T>::validation_data()
+            .map(|d| d.relay_parent_number)
+            .unwrap_or_default()
+    }
+}

runtimes/eden/src/pallets_util.rs

@@ -15,7 +15,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-use crate::{constants, Balances, Call, Event, Origin, OriginCaller, Runtime};
+use crate::{
+    constants, implementations::RelayChainBlockNumberProvider, Balances, Call, Event, Origin,
+    OriginCaller, Runtime,
+};
 use frame_support::{parameter_types, weights::Weight};
 use primitives::{AccountId, Balance};
 use sp_runtime::Perbill;
@@ -26,6 +29,7 @@ impl pallet_grants::Config for Runtime {
     type CancelOrigin = frame_system::EnsureRoot<AccountId>;
     type ForceOrigin = frame_system::EnsureRoot<AccountId>;
     type WeightInfo = pallet_grants::weights::SubstrateWeight<Runtime>;
+    type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;
 }
 
 impl pallet_utility::Config for Runtime {

runtimes/main/src/pallets_util.rs

@@ -37,6 +37,7 @@ impl pallet_grants::Config for Runtime {
     type ForceOrigin =
         pallet_collective::EnsureProportionMoreThan<_1, _2, AccountId, FinancialCollective>;
     type WeightInfo = pallet_grants::weights::SubstrateWeight<Runtime>;
+    type BlockNumberProvider = frame_system::Pallet<Runtime>;
 }
 
 impl pallet_utility::Config for Runtime {