Merge pull request #23 from paritytech/bko-on-dm-upgrade-polkadot-sdk

Upgrade polkadot sdk - NoCurrency + other nits

Author: dmitry-markin

.gitignore

@@ -9,3 +9,4 @@
 # direnv files
 .envrc
 .direnv
+.idea

Cargo.lock

@@ -7,6 +7,7 @@ repository = "https://github.com/zdave-parity/polkadot-bulletin-chain.git"
 resolver = "2"
 members = [
     "node",
+    "pallets/common",
     "pallets/relayer-set",
     "pallets/transaction-storage",
     "pallets/validator-set",

Cargo.toml

@@ -0,0 +1,35 @@
+[package]
+name = "pallets-common"
+version = "0.1.0"
+authors = ["Parity Technologies <[email protected]>"]
+edition = "2021"
+license = "Apache-2.0"
+description = "Common utilities for pallets and/or runtime"
+repository.workspace = true
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+codec = { package = "parity-scale-codec", version = "3.7.5", default-features = false }
+log = "0.4.17"
+scale-info = { version = "2.11.6", default-features = false, features = ["derive"] }
+
+polkadot-sdk-frame = { git = "https://github.com/paritytech/polkadot-sdk.git", rev = "436b4935b52562f79a83b6ecadeac7dcbc1c2367", default-features = false, features = [
+    "experimental",
+    "runtime",
+] }
+
+[features]
+default = ["std"]
+runtime-benchmarks = [
+    "polkadot-sdk-frame/runtime-benchmarks"
+]
+std = [
+    "codec/std",
+    "scale-info/std",
+    "polkadot-sdk-frame/std"
+]
+try-runtime = [
+    "polkadot-sdk-frame/try-runtime"
+]

pallets/common/Cargo.toml

@@ -0,0 +1,121 @@
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use codec::{Decode, Encode};
+use polkadot_sdk_frame::prelude::{
+	fungible::{Dust, Inspect, InspectHold, MutateHold, Unbalanced, UnbalancedHold},
+	DepositConsequence, DispatchError, DispatchResult, Fortitude, Preservation, Provenance,
+	WithdrawConsequence, Zero,
+};
+use scale_info::TypeInfo;
+
+/// Fungible currency implementation that does not support any balance operations.
+/// Works only with zero balances.
+///
+/// Note: This is a workaround to satisfy the `pallet-session::Config::Currency` trait requirements.
+pub struct NoCurrency<AccountId, HoldReason>(core::marker::PhantomData<(AccountId, HoldReason)>);
+
+impl<AccountId, HoldReason: Encode + Decode + TypeInfo + 'static> Inspect<AccountId>
+	for NoCurrency<AccountId, HoldReason>
+{
+	type Balance = u128;
+
+	fn total_issuance() -> Self::Balance {
+		Zero::zero()
+	}
+
+	fn minimum_balance() -> Self::Balance {
+		Zero::zero()
+	}
+
+	fn total_balance(_who: &AccountId) -> Self::Balance {
+		Zero::zero()
+	}
+
+	fn balance(_who: &AccountId) -> Self::Balance {
+		Zero::zero()
+	}
+
+	fn reducible_balance(
+		_who: &AccountId,
+		_preservation: Preservation,
+		_force: Fortitude,
+	) -> Self::Balance {
+		Zero::zero()
+	}
+
+	fn can_deposit(
+		_who: &AccountId,
+		_amount: Self::Balance,
+		_provenance: Provenance,
+	) -> DepositConsequence {
+		DepositConsequence::Success
+	}
+
+	fn can_withdraw(
+		_who: &AccountId,
+		_amount: Self::Balance,
+	) -> WithdrawConsequence<Self::Balance> {
+		WithdrawConsequence::Success
+	}
+}
+
+impl<AccountId, HoldReason: Encode + Decode + TypeInfo + 'static> Unbalanced<AccountId>
+	for NoCurrency<AccountId, HoldReason>
+{
+	fn handle_dust(_dust: Dust<AccountId, Self>) {}
+
+	fn write_balance(
+		_who: &AccountId,
+		_amount: Self::Balance,
+	) -> Result<Option<Self::Balance>, DispatchError> {
+		Ok(None)
+	}
+
+	fn set_total_issuance(_amount: Self::Balance) {}
+}
+
+impl<AccountId, HoldReason: Encode + Decode + TypeInfo + 'static> InspectHold<AccountId>
+	for NoCurrency<AccountId, HoldReason>
+{
+	type Reason = HoldReason;
+
+	fn total_balance_on_hold(_who: &AccountId) -> Self::Balance {
+		Zero::zero()
+	}
+
+	fn balance_on_hold(_reason: &Self::Reason, _who: &AccountId) -> Self::Balance {
+		Zero::zero()
+	}
+}
+
+impl<AccountId, HoldReason: Encode + Decode + TypeInfo + 'static> UnbalancedHold<AccountId>
+	for NoCurrency<AccountId, HoldReason>
+{
+	fn set_balance_on_hold(
+		_reason: &Self::Reason,
+		_who: &AccountId,
+		_amount: Self::Balance,
+	) -> DispatchResult {
+		Ok(())
+	}
+}
+
+impl<AccountId, HoldReason: Encode + Decode + TypeInfo + 'static> MutateHold<AccountId>
+	for NoCurrency<AccountId, HoldReason>
+{
+}

pallets/common/src/lib.rs

@@ -46,6 +46,7 @@ pub mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		/// The overarching event type.
+		#[allow(deprecated)]
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;

pallets/relayer-set/src/lib.rs

@@ -147,6 +147,7 @@ pub mod pallet {
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		/// The overarching event type.
+		#[allow(deprecated)]
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 		/// Weight information for extrinsics in this pallet.
 		type WeightInfo: WeightInfo;

pallets/transaction-storage/src/lib.rs

@@ -21,6 +21,7 @@ pallet-session = { git = "https://github.com/paritytech/polkadot-sdk.git", rev =
 
 [dev-dependencies]
 serde = { version = "1.0.126", features = ["derive"] }
+pallets-common = { version = "0.1.0", default-features = false, path = "../common" }
 
 [features]
 default = ['std']

pallets/validator-set/Cargo.toml

@@ -78,6 +78,7 @@ pub mod pallet {
 		>
 	{
 		/// The overarching event type.
+		#[allow(deprecated)]
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// Weight information for extrinsics in this pallet.

pallets/validator-set/src/lib.rs

@@ -37,6 +37,7 @@ construct_runtime!(
 		System: frame_system,
 		ValidatorSet: pallet_validator_set,
 		Session: pallet_session,
+		Historical: pallet_session::historical,
 	}
 );
 
@@ -143,9 +144,14 @@ impl pallet_session::Config for Test {
 	type Keys = MockSessionKeys;
 	type WeightInfo = ();
 	type RuntimeEvent = RuntimeEvent;
+	type Currency = pallets_common::NoCurrency<AccountId, RuntimeHoldReason>;
+	type KeyDeposit = ();
+	// TODO: check this
+	type DisablingStrategy = ();
 }
 
 impl pallet_session::historical::Config for Test {
+	type RuntimeEvent = RuntimeEvent;
 	type FullIdentification = Self::ValidatorId;
 	type FullIdentificationOf = Self::ValidatorIdOf;
 }