Add a new ReleaseSchedule trait

polimec-skeleton/pallets/funding/Cargo.toml

@@ -11,6 +11,7 @@ version = "0.1.0"
 rust-version = "1.69.0"
 
 [dependencies]
+serde = { version = "*", optional = true }
 parity-scale-codec = { version = "3.0.0", features = [
     "derive",
 ], default-features = false }
@@ -28,14 +29,14 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f
 sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 sp-arithmetic = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 polimec-traits = { path = "../../traits", default-features = false }
+pallet-linear-release = { path = "../linear-release", default-features = false }
 
 [dev-dependencies]
 sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
 pallet-assets = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
-
 pallet-credentials = { path = "../credentials", default-features = false }
 
 [features]
@@ -53,7 +54,9 @@ std = [
     "pallet-balances/std",
     "pallet-credentials/std",
     "polimec-traits/std",
+    "pallet-linear-release/std",
     "frame-benchmarking?/std",
+    "serde",
 ]
 runtime-benchmarks = [
     "frame-benchmarking/runtime-benchmarks",

polimec-skeleton/pallets/funding/src/functions.rs

@@ -790,7 +790,7 @@ impl<T: Config> Pallet<T> {
 		let mut caller_existing_evaluations = Evaluations::<T>::get(project_id, evaluator.clone());
 		let plmc_usd_price = T::PriceProvider::get_price(PLMC_STATEMINT_ID).ok_or(Error::<T>::PLMCPriceNotAvailable)?;
 		let early_evaluation_reward_threshold_usd =
-			T::EvaluationSuccessThreshold::get() * project_details.fundraising_target;
+		T::EvaluationSuccessThreshold::get() * project_details.fundraising_target;
 		let evaluation_round_info = &mut project_details.evaluation_round_info;
 
 		// * Validity Checks *

polimec-skeleton/pallets/funding/src/lib.rs

@@ -314,6 +314,8 @@ pub mod pallet {
 		/// Something that provides the members of Polimec
 		type HandleMembers: PolimecMembers<AccountIdOf<Self>>;
 
+		type Vesting: traits::ReleaseSchedule<AccountIdOf<Self>, BondTypeOf<Self>>;
+
 		/// The maximum length of data stored on-chain.
 		#[pallet::constant]
 		type StringLimit: Get<u32>;

polimec-skeleton/pallets/funding/src/mock.rs

@@ -33,7 +33,7 @@ use sp_arithmetic::Percent;
 use sp_core::H256;
 use sp_runtime::{
 	testing::Header,
-	traits::{BlakeTwo256, IdentityLookup},
+	traits::{BlakeTwo256, IdentityLookup, ConvertInto},
 	BuildStorage,
 };
 use system::EnsureSigned;
@@ -65,6 +65,7 @@ frame_support::construct_runtime!(
 		Balances: pallet_balances,
 		FundingModule: pallet_funding,
 		Credentials: pallet_credentials,
+		Vesting: pallet_linear_release,
 		LocalAssets: pallet_assets::<Instance1>::{Pallet, Call, Storage, Event<T>},
 		StatemintAssets: pallet_assets::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>},
 	}
@@ -199,7 +200,6 @@ impl pallet_credentials::Config for TestRuntime {
 	type MembershipInitialized = ();
 	type MembershipChanged = ();
 }
-
 pub const HOURS: BlockNumber = 300u64;
 
 // REMARK: In the production configuration we use DAYS instead of HOURS.
@@ -225,6 +225,25 @@ parameter_types! {
 	pub EarlyEvaluationThreshold: Percent = Percent::from_percent(10);
 }
 
+use frame_support::traits::WithdrawReasons;
+
+parameter_types! {
+	pub const MinVestedTransfer: u64 = 256 * 2;
+	pub UnvestedFundsAllowedWithdrawReasons: WithdrawReasons =
+		WithdrawReasons::except(WithdrawReasons::TRANSFER | WithdrawReasons::RESERVE);
+}
+impl pallet_linear_release::Config for TestRuntime {
+	type Balance = Balance;
+	type BlockNumberToBalance = ConvertInto;
+	type Currency = Balances;
+	type MinVestedTransfer = MinVestedTransfer;
+	type RuntimeEvent = RuntimeEvent;
+	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
+	type WeightInfo = ();
+	type Reason = LockType<u32>;
+	const MAX_VESTING_SCHEDULES: u32 = 3;
+}
+
 impl pallet_funding::Config for TestRuntime {
 	type RuntimeEvent = RuntimeEvent;
 	type ProjectIdentifier = Identifier;
@@ -258,6 +277,7 @@ impl pallet_funding::Config for TestRuntime {
 	type WeightInfo = ();
 	type FeeBrackets = FeeBrackets;
 	type EvaluationSuccessThreshold = EarlyEvaluationThreshold;
+	type Vesting = Vesting;
 }
 
 // Build genesis storage according to the mock runtime.

polimec-skeleton/pallets/funding/src/tests.rs

@@ -1966,7 +1966,6 @@ mod evaluation_round_success {
 
 		remainder_funding_project.end_funding();
 		test_env.advance_time(10).unwrap();
-
 		let post_unbond_amounts: UserToPLMCBalance = prev_reserved_plmc
 			.iter()
 			.map(|(evaluator, _amount)| (*evaluator, Zero::zero()))
@@ -2011,7 +2010,6 @@ mod evaluation_round_success {
 		let project_id = remainder_funding_project.get_project_id();
 		let prev_reserved_plmc =
 			test_env.get_reserved_plmc_balances_for(evaluators.clone(), LockType::Evaluation(project_id));
-
 		let prev_free_plmc = test_env.get_free_plmc_balances_for(evaluators.clone());
 
 		let finished_project = remainder_funding_project.end_funding();
@@ -2897,7 +2895,6 @@ mod auction_round_failure {
 		auctioning_project
 			.bid_for_users(vec![bid_in])
 			.expect("Bids should pass");
-
 		test_env
 			.advance_time(
 				<TestRuntime as Config>::EnglishAuctionDuration::get()
@@ -2930,9 +2927,7 @@ mod auction_round_failure {
 			],
 			project_id,
 		);
-
 		let _community_funding_project = auctioning_project.start_community_funding();
-
 		test_env.do_free_plmc_assertions(vec![(BIDDER_1, get_ed()), (BIDDER_2, plmc_fundings[1].1 + get_ed())]);
 
 		test_env.do_reserved_plmc_assertions(

polimec-skeleton/pallets/funding/src/traits.rs

@@ -19,3 +19,5 @@ pub trait DoRemainingOperation {
 	fn do_one_operation<T: crate::Config>(&mut self, project_id: T::ProjectIdentifier)
 		-> Result<Weight, DispatchError>;
 }
+
+pub use pallet_linear_release::traits::ReleaseSchedule;

polimec-skeleton/pallets/funding/src/types.rs

@@ -55,6 +55,7 @@ pub mod config_types {
 
 	/// Enum used to identify PLMC holds
 	#[derive(Clone, Encode, Decode, Eq, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen, Copy, Ord, PartialOrd)]
+	#[cfg_attr(feature = "std", derive(serde::Serialize, serde::Deserialize))]
 	pub enum LockType<ProjectId> {
 		Evaluation(ProjectId),
 		Participation(ProjectId),

polimec-skeleton/pallets/linear-release/Cargo.toml

@@ -0,0 +1,43 @@
+[package]
+name = "pallet-linear-release"
+version = "4.0.0-dev"
+authors = ["Parity Technologies <admin@parity.io>"]
+edition = "2021"
+license = "MIT-0"
+homepage = "https://substrate.io"
+repository = "https://github.com/paritytech/substrate/"
+description = "FRAME example pallet"
+readme = "README.md"
+
+[package.metadata.docs.rs]
+targets = ["x86_64-unknown-linux-gnu"]
+
+[dependencies]
+serde = { version = "1.0.136", optional = true }
+codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
+log = { version = "0.4.17", default-features = false }
+scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
+frame-support = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+frame-system = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+sp-std = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+sp-runtime = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+
+[dev-dependencies]
+sp-core = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+sp-io = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-v0.9.42" }
+
+[features]
+default = ["std"]
+std = [
+	"codec/std",
+	"frame-support/std",
+	"frame-system/std",
+	"log/std",
+	"scale-info/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"pallet-balances/std",
+	"serde"
+]
+try-runtime = ["frame-support/try-runtime"]

polimec-skeleton/pallets/linear-release/README.md

@@ -0,0 +1,11 @@
+<!-- markdown-link-check-disable -->
+# Dev Mode Example Pallet
+
+A simple example of a FRAME pallet demonstrating
+the ease of requirements for a pallet in dev mode.
+
+Run `cargo doc --package pallet-dev-mode --open` to view this pallet's documentation.
+
+**Dev mode is not meant to be used in production.**
+
+License: MIT-0