project configs

libs/common-types/src/milestone_origin.rs

@@ -1,32 +1,27 @@
 use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support::{sp_runtime::traits::AccountIdConversion, PalletId};
 use scale_info::TypeInfo;
 use xcm::latest::{Junction, Junctions::*, MultiLocation};
 
 /// A wrapper around
-pub trait TreasuryOriginConverter<AccountId: Into<[u8; 32]>> {
-    fn get_multi_location(
-        &self,
-        recipiant: AccountId,
-    ) -> Result<MultiLocation, TreasuryOriginError>;
+pub trait TreasuryOriginConverter {
+    fn get_multi_location(&self) -> Result<MultiLocation, TreasuryOriginError>;
 }
 
-impl<AccountId: Into<[u8; 32]>> TreasuryOriginConverter<AccountId> for TreasuryOrigin {
-    fn get_multi_location(
-        &self,
-        recipiant: AccountId,
-    ) -> Result<MultiLocation, TreasuryOriginError> {
+impl TreasuryOriginConverter for TreasuryOrigin {
+    fn get_multi_location(&self) -> Result<MultiLocation, TreasuryOriginError> {
         match &self {
             TreasuryOrigin::Kusama => Ok(MultiLocation::new(
                 1,
                 X1(Junction::AccountId32 {
-                    id: recipiant.into(),
+                    id: PalletId(*b"py/trsry").into_account_truncating(),
                     network: None,
                 }),
             )),
             TreasuryOrigin::Imbue => Ok(MultiLocation::new(
                 0,
                 X1(Junction::AccountId32 {
-                    id: recipiant.into(),
+                    id: PalletId(*b"py/trsry").into_account_truncating(),
                     network: None,
                 }),
             )),
@@ -43,15 +38,6 @@ pub enum TreasuryOriginError {
     NetworkUnsupported,
 }
 
-#[derive(
-    Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Debug, Encode, Decode, TypeInfo, MaxEncodedLen,
-)]
-pub enum FundingType {
-    Proposal,
-    Brief,
-    Grant(TreasuryOrigin),
-}
-
 #[derive(
     Clone, Copy, PartialOrd, Ord, PartialEq, Eq, Debug, Encode, Decode, TypeInfo, MaxEncodedLen,
 )]

pallets/briefs/Cargo.toml

@@ -33,6 +33,7 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li
 common-traits = { path = "../../libs/common-traits", default-features = false }
 common-types = { path = "../../libs/common-types", default-features = false }
 pallet-deposits = {path= "../deposits", default-features = false }
+pallet-fellowship = { path = "../fellowship", default-features = false }
 pallet-proposals = {path= "../proposals", default-features = false }
 
 [dev-dependencies]
@@ -54,7 +55,7 @@ common-types = { path = "../../libs/common-types" }
 common-runtime = { path = "../../runtime/common"}
 pallet-proposals = {path= "../proposals"}
 pallet-deposits = {path= "../deposits"}
-
+pallet-disputes = {path= "../disputes"}
 
 [features]
 default = [ 'std' ]
@@ -70,7 +71,7 @@ std = [
 	"pallet-balances/std",
 	"pallet-deposits/std",
 	"pallet-proposals/std",
-	"pallet-timestamp/std",
+	"pallet-fellowship/std",
 	"scale-info/std",
 	"serde/std",
 	"sp-api/std",
@@ -102,6 +103,7 @@ try-runtime = [
 	"pallet-proposals/try-runtime",
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
+	"pallet-fellowship/try-runtime",
 	"pallet-xcm/try-runtime",
 	"sp-runtime/try-runtime",
 ]

pallets/briefs/src/lib.rs

@@ -20,19 +20,20 @@ mod benchmarking;
 #[cfg(any(feature = "runtime-benchmarks", test))]
 mod test_utils;
 
-pub mod migrations;
+//pub mod migrations;
 
 #[frame_support::pallet]
 pub mod pallet {
-    use common_types::{milestone_origin::FundingType, CurrencyId};
+    use common_types::CurrencyId;
     use frame_support::{
         pallet_prelude::*, sp_runtime::Saturating, traits::Get, weights::Weight, BoundedBTreeMap,
     };
     use frame_system::pallet_prelude::*;
     use orml_traits::{MultiCurrency, MultiReservableCurrency};
     use pallet_deposits::traits::DepositHandler;
+    use pallet_fellowship::traits::SelectJury;
     use pallet_proposals::traits::IntoProposal;
-    use pallet_proposals::{Contribution, ProposedMilestone};
+    use pallet_proposals::{Contribution, FundingPath, ProposedMilestone};
     use sp_arithmetic::per_things::Percent;
     use sp_core::H256;
     use sp_runtime::traits::Zero;
@@ -70,8 +71,8 @@ pub mod pallet {
     #[pallet::config]
     pub trait Config: frame_system::Config {
         type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
+        /// The currency type.
         type RMultiCurrency: MultiReservableCurrency<AccountIdOf<Self>, CurrencyId = CurrencyId>;
-        type AuthorityOrigin: EnsureOrigin<Self::RuntimeOrigin>;
         /// The type that allows for evolution from brief to proposal.
         type IntoProposal: IntoProposal<AccountIdOf<Self>, BalanceOf<Self>, BlockNumberFor<Self>>;
         /// The maximum amount of owners to a brief.
@@ -82,7 +83,9 @@ pub mod pallet {
         /// Storage deposits.
         type BriefStorageItem: Get<StorageItemOf<Self>>;
         type DepositHandler: DepositHandler<BalanceOf<Self>, AccountIdOf<Self>>;
-
+        /// The type that selects a list of jury members.
+        type JurySelector: SelectJury<AccountIdOf<Self>>;
+        /// The weight info for the extrinsics.
         type WeightInfo: WeightInfoT;
     }
 
@@ -147,6 +150,8 @@ pub mod pallet {
         FreelancerApprovalRequired,
         /// Milestones total do not add up to 100%.
         MilestonesTotalPercentageMustEqual100,
+        /// too many milestones here mate fixed with https://github.com/ImbueNetwork/imbue/issues/267
+        TooManyMilestones,
     }
 
     #[pallet::call]
@@ -291,13 +296,35 @@ pub mod pallet {
             let contributions = BriefContributions::<T>::get(brief_id);
 
             <T as Config>::DepositHandler::return_deposit(brief.deposit_id)?;
+
+            let refund_locations =
+                <T as Config>::IntoProposal::convert_contributions_to_refund_locations(
+                    &contributions
+                        .clone()
+                        .into_inner()
+                        .try_into()
+                        .map_err(|_| Error::<T>::TooManyBriefOwners)?,
+                );
+
             <T as Config>::IntoProposal::convert_to_proposal(
                 brief.currency_id,
-                contributions.into_inner(),
+                contributions
+                    .into_inner()
+                    .try_into()
+                    .map_err(|_| Error::<T>::TooManyBriefOwners)?,
                 brief_id,
                 brief.applicant,
-                brief.milestones.into(),
-                FundingType::Brief,
+                brief
+                    .milestones
+                    .to_vec()
+                    .try_into()
+                    .map_err(|_| Error::<T>::TooManyMilestones)?,
+                refund_locations,
+                <T::JurySelector as SelectJury<AccountIdOf<T>>>::select_jury()
+                    .to_vec()
+                    .try_into()
+                    .map_err(|_| Error::<T>::TooManyMilestones)?,
+                FundingPath::TakeFromReserved,
             )?;
 
             BriefContributions::<T>::remove(brief_id);

pallets/briefs/src/mock.rs

@@ -202,19 +202,17 @@ parameter_types! {
 impl pallet_briefs::Config for Test {
     type RuntimeEvent = RuntimeEvent;
     type RMultiCurrency = Tokens;
-    type AuthorityOrigin = EnsureRoot<AccountId>;
     type IntoProposal = pallet_proposals::Pallet<Test>;
     type MaxBriefOwners = MaxBriefOwners;
     type MaxMilestonesPerBrief = MaxMilestonesPerProject;
     type BriefStorageItem = BriefStorageItem;
     type DepositHandler = MockDepositHandler;
     type WeightInfo = pallet_briefs::WeightInfo<Self>;
+    type JurySelector = MockJurySelector;
 }
 
 parameter_types! {
-    pub const TwoWeekBlockUnit: u32 = 100800u32;
     pub const ProposalsPalletId: PalletId = PalletId(*b"imbgrant");
-    pub NoConfidenceTimeLimit: BlockNumber = 100800u32.into();
     pub PercentRequiredForVoteToPass: Percent = Percent::from_percent(75u8);
     pub MaximumContributorsPerProject: u32 = 50;
     pub RefundsPerBlock: u8 = 2;
@@ -226,30 +224,31 @@ parameter_types! {
     pub ExpiringProjectRoundsPerBlock: u32 = 10;
     pub ProjectStorageItem: StorageItem = StorageItem::Project;
     pub MaxProjectsPerAccount: u16 = 100;
-    pub PercentRequiredForVoteNoConfidenceToPass: Percent = Percent::from_percent(75u8);
+    pub ImbueFeeAccount: AccountId = TREASURY;
+    pub MaxJuryMembers: u32 = 100;
 }
 
 impl pallet_proposals::Config for Test {
     type RuntimeEvent = RuntimeEvent;
     type PalletId = ProposalsPalletId;
-    type AuthorityOrigin = EnsureRoot<AccountId>;
     type MultiCurrency = Tokens;
     type WeightInfo = pallet_proposals::WeightInfo<Self>;
-    // Adding 2 weeks as th expiration time
-    type MaxWithdrawalExpiration = TwoWeekBlockUnit;
-    type NoConfidenceTimeLimit = NoConfidenceTimeLimit;
     type PercentRequiredForVoteToPass = PercentRequiredForVoteToPass;
     type MaximumContributorsPerProject = MaximumContributorsPerProject;
     type MilestoneVotingWindow = MilestoneVotingWindow;
-    type RefundHandler = pallet_proposals::traits::MockRefundHandler<Test>;
+    type ExternalRefundHandler = pallet_proposals::traits::MockRefundHandler<Test>;
     type MaxMilestonesPerProject = MaxMilestonesPerProject;
     type ImbueFee = ImbueFee;
+    type ImbueFeeAccount = ImbueFeeAccount;
     type ExpiringProjectRoundsPerBlock = ExpiringProjectRoundsPerBlock;
-    type ProjectStorageItem = ProjectStorageItem;
     type DepositHandler = MockDepositHandler;
+    type ProjectStorageItem = ProjectStorageItem;
     type MaxProjectsPerAccount = MaxProjectsPerAccount;
-    type PercentRequiredForVoteNoConfidenceToPass = PercentRequiredForVoteNoConfidenceToPass;
+    type DisputeRaiser = MockDisputeRaiser;
+    type JurySelector = MockJurySelector;
+    type AssetSignerOrigin = EnsureRoot<AccountId>;
 }
+
 parameter_types! {
     pub const BasicDeposit: u64 = 10;
     pub const FieldDeposit: u64 = 10;
@@ -281,6 +280,7 @@ parameter_types! {
 pub static ALICE: AccountId = 125;
 pub static BOB: AccountId = 126;
 pub static CHARLIE: AccountId = 127;
+pub static TREASURY: AccountId = 200;
 
 pub(crate) fn build_test_externality() -> sp_io::TestExternalities {
     let mut t = frame_system::GenesisConfig::<Test>::default()
@@ -307,3 +307,27 @@ pub(crate) fn build_test_externality() -> sp_io::TestExternalities {
     });
     ext
 }
+
+pub struct MockJurySelector;
+impl pallet_fellowship::traits::SelectJury<AccountId> for MockJurySelector {
+    type JurySize = MaxJuryMembers;
+    fn select_jury() -> BoundedVec<AccountId, Self::JurySize> {
+        BoundedVec::new()
+    }
+}
+
+pub struct MockDisputeRaiser;
+impl pallet_disputes::traits::DisputeRaiser<AccountId> for MockDisputeRaiser {
+    type DisputeKey = u32;
+    type SpecificId = u32;
+    type MaxJurySize = MaxJuryMembers;
+    type MaxSpecifics = MaxMilestonesPerProject;
+    fn raise_dispute(
+        _dispute_key: Self::DisputeKey,
+        _raised_by: AccountId,
+        _jury: BoundedVec<AccountId, Self::MaxJurySize>,
+        _specific_ids: BoundedVec<Self::SpecificId, Self::MaxSpecifics>,
+    ) -> Result<(), DispatchError> {
+        Ok(())
+    }
+}