Skip to content

Commit

Permalink
compilation fix for the accountid
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshankarrao
mshankarrao committed Aug 18, 2023
1 parent 723bb34 commit b443685
Show file tree
Hide file tree
Showing 2 changed files with 143 additions and 147 deletions.
281 changes: 137 additions & 144 deletions pallets/disputes/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,155 +3,148 @@
pub use pallet::*;
pub mod traits;
pub mod weights;
use sp_runtime::{traits::AtLeast32BitUnsigned, DispatchError};
pub use weights::*;
use sp_runtime::{DispatchError, traits::AtLeast32BitUnsigned};

#[frame_support::pallet]
pub mod pallet {
use super::*;
use codec::{FullEncode, FullCodec};
use frame_support::pallet_prelude::*;
use frame_system::pallet_prelude::*;
use traits::DisputeRaiser;

#[pallet::pallet]
pub struct Pallet<T>(_);

pub(crate) type AccountIdOf<T> = <T as frame_system::Config>::AccountId;

#[pallet::config]
pub trait Config: frame_system::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type WeightInfo: WeightInfo;
//Felix teachings --> to keep an associated type into storage it needs to implement certain traits
type DisputeKey: AtLeast32BitUnsigned + FullEncode + FullCodec + MaxEncodedLen + TypeInfo;
type MaxReasonLength: Get<u32>;
type MaxJurySize: Get<u32>;
type DisputeHooks: traits::DisputeHooks;
type TimeLimit: Get<<Self as frame_system::Config>::BlockNumber>;
}

#[pallet::storage]
#[pallet::getter(fn disputes)]
use super::*;
use codec::{FullCodec, FullEncode};
use frame_support::pallet_prelude::*;
use frame_system::pallet_prelude::*;
use traits::DisputeRaiser;

#[pallet::pallet]
pub struct Pallet<T>(_);

pub(crate) type AccountIdOf<T> = <T as frame_system::Config>::AccountId;

#[pallet::config]
pub trait Config: frame_system::Config {
type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
type WeightInfo: WeightInfo;
//Felix teachings --> to keep an associated type into storage it needs to implement certain traits
type DisputeKey: AtLeast32BitUnsigned + FullEncode + FullCodec + MaxEncodedLen + TypeInfo;
type MaxReasonLength: Get<u32>;
type MaxJurySize: Get<u32>;
type DisputeHooks: traits::DisputeHooks<Self::DisputeKey>;
type TimeLimit: Get<<Self as frame_system::Config>::BlockNumber>;
}

#[pallet::storage]
#[pallet::getter(fn disputes)]
pub type Disputes<T: Config> =
StorageMap<_, Blake2_128Concat, T::DisputeKey, Dispute<T>, OptionQuery>;

#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
//This event is emitted when a dispute is being raised
DisputeRaised {who: AccountIdOf<T>},
//This event is emitted from the vote_on_dispute extrinsics
//to notify what dispute is being voted on
DisputeVotedOn {who: AccountIdOf<T>},
}

#[pallet::error]
pub enum Error<T> {
NoneValue,
StorageOverflow,
//This error is thrown whenever the dispute key passed doesn't correspond to any dispute
DisputeDoesNotExist,
DisputeAlreadyExists,
}


#[pallet::call]
impl<T: Config> Pallet<T> {
#[pallet::call_index(0)]
#[pallet::weight(T::WeightInfo::do_something())]
pub fn vote_on_dispute(
origin: OriginFor<T>,
dispute_key: T::DisputeKey,
is_yay: bool,
) -> DispatchResult {
// get dispute struct
// ensure caller is part of the jury
// mutate vote accordingly.
//TODO only the choosen jury can vote on the disputes?
let mut dispute = Disputes::<T>::get(dispute_key).ok_or(Error::<T>::DisputeDoesNotExist)?;
let mut vote = dispute.votes;
if is_yay{
vote.yay +=1;
}
else {
vote.nay +=1;
}


//TODO will update the mutated votes into the dispute correct?
//TODO If the votes met the threshold we need to call the refund pallet correct?

Ok(().into())
}

#[pallet::call_index(1)]
#[pallet::weight(T::WeightInfo::do_something())]
pub fn force_cancel_dispute(
origin: OriginFor<T>,
dispute_key: T::DisputeKey,
is_yay: bool,
) -> DispatchResult {

Ok(().into())
}
}

impl<T: Config> DisputeRaiser<AccountIdOf<T>> for Pallet<T> {
type DisputeKey = T::DisputeKey;

fn raise_dispute(
dispute_key: Self::DisputeKey,
raised_by: AccountIdOf<T>,
fund_account: AccountIdOf<T>,
reason: Vec<u8>,
project_id: u32,
jury: Vec<AccountIdOf<T>>,
) -> Result<(), DispatchError> {
// creating the struct with the passed information and initializing vote as 0 initially
let dispute:Dispute<T> = Dispute{
raised_by,
fund_account,
votes: Vote{
yay: 0,
nay: 0,
},
reason,
jury,
};

ensure!(!Disputes::<T>::contains_key(dispute_key), Error::<T>::DisputeAlreadyExists);

//storing the raised dispute inside the disputes storage
Disputes::<T>::insert(dispute_key, dispute);

// Raise Event
//TODO need to check if want to add more information while raising a dispute like returning the whole dispute struct?
Self::deposit_event(Event::DisputeRaised(
raised_by
));

Ok(())
}
}

#[derive(Encode, Decode, PartialEq, Eq, Clone, Debug, TypeInfo, MaxEncodedLen)]
#[scale_info(skip_type_params(T))]
struct Dispute<T: Config> {
raised_by: AccountIdOf<T>,
fund_account: AccountIdOf<T>,
// TODO: Add balance type
// currencyid: CurrencyId
//fund_amount: BalanceOf<T>
votes: Vote,
reason: BoundedVec<u8, <T as Config>::MaxReasonLength>,
jury: BoundedVec<AccountIdOf<T>, <T as Config>::MaxJurySize>
}

#[derive(Encode, Decode, PartialEq, Eq, Clone, Debug, TypeInfo, MaxEncodedLen)]
pub struct Vote {
yay: u32 ,
nay: u32,
#[pallet::event]
#[pallet::generate_deposit(pub(super) fn deposit_event)]
pub enum Event<T: Config> {
//This event is emitted when a dispute is being raised
DisputeRaised { who: AccountIdOf<T> },
//This event is emitted from the vote_on_dispute extrinsics
//to notify what dispute is being voted on
DisputeVotedOn { who: AccountIdOf<T> },
}

#[pallet::error]
pub enum Error<T> {
NoneValue,
StorageOverflow,
//This error is thrown whenever the dispute key passed doesn't correspond to any dispute
DisputeDoesNotExist,
DisputeAlreadyExists,
}

#[pallet::call]
impl<T: Config> Pallet<T> {
#[pallet::call_index(0)]
#[pallet::weight(T::WeightInfo::do_something())]
pub fn vote_on_dispute(
origin: OriginFor<T>,
dispute_key: T::DisputeKey,
is_yay: bool,
) -> DispatchResult {
// get dispute struct
// ensure caller is part of the jury
// mutate vote accordingly.
//TODO only the choosen jury can vote on the disputes?
let mut dispute =
Disputes::<T>::get(dispute_key).ok_or(Error::<T>::DisputeDoesNotExist)?;
let mut vote = dispute.votes;
if is_yay {
vote.yay += 1;
} else {
vote.nay += 1;
}

//TODO will update the mutated votes into the dispute correct?
//TODO If the votes met the threshold we need to call the refund pallet correct?

Ok(().into())
}

#[pallet::call_index(1)]
#[pallet::weight(T::WeightInfo::do_something())]
pub fn force_cancel_dispute(
origin: OriginFor<T>,
dispute_key: T::DisputeKey,
is_yay: bool,
) -> DispatchResult {
Ok(().into())
}
}

impl<T: Config> DisputeRaiser<AccountIdOf<T>> for Pallet<T> {
type DisputeKey = T::DisputeKey;

fn raise_dispute(
dispute_key: Self::DisputeKey,
raised_by: AccountIdOf<T>,
fund_account: AccountIdOf<T>,
reason: Vec<u8>,
project_id: u32,
jury: Vec<AccountIdOf<T>>,
) -> Result<(), DispatchError> {
// creating the struct with the passed information and initializing vote as 0 initially
let dispute: Dispute<T> = Dispute {
raised_by,
fund_account,
votes: Vote { yay: 0, nay: 0 },
reason,
jury,
};

ensure!(
!Disputes::<T>::contains_key(dispute_key),
Error::<T>::DisputeAlreadyExists
);
//storing the raised dispute inside the disputes storage
Disputes::<T>::insert(dispute_key, dispute);

// Raise Event
//TODO need to check if want to add more information while raising a dispute like returning the whole dispute struct?
Self::deposit_event(Event::DisputeRaised(raised_by));

Ok(())
}
}

#[derive(Encode, Decode, PartialEq, Eq, Clone, Debug, TypeInfo, MaxEncodedLen)]
#[scale_info(skip_type_params(T))]
struct Dispute<T: Config> {
raised_by: AccountIdOf<T>,
fund_account: AccountIdOf<T>,
// TODO: Add balance type
// currencyid: CurrencyId
//fund_amount: BalanceOf<T>
votes: Vote,
reason: BoundedVec<u8, <T as Config>::MaxReasonLength>,
jury: BoundedVec<AccountIdOf<T>, <T as Config>::MaxJurySize>,
}

#[derive(Encode, Decode, PartialEq, Eq, Clone, Debug, TypeInfo, MaxEncodedLen)]
pub struct Vote {
yay: u32,
nay: u32,
}
}

}
9 changes: 6 additions & 3 deletions pallets/disputes/src/traits.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
use codec::{FullEncode, FullCodec, MaxEncodedLen};
use scale_info::TypeInfo;
use sp_runtime::{DispatchError, traits::AtLeast32BitUnsigned};


pub trait DisputeRaiser<AccountId> {
type DisputeKey: AtLeast32BitUnsigned + FullEncode + FullCodec + MaxEncodedLen + TypeInfo;

Expand All @@ -9,11 +12,11 @@ pub trait DisputeRaiser<AccountId> {
// Bind the string to a constant amount (500)
fn raise_dispute(
dispute_key: Self::DisputeKey,
raised_by: AccountIdOf<T>,
fund_account: AccountIdOf<T>,
raised_by: AccountId,
fund_account: AccountId,
reason: Vec<u8>,
project_id: u32,
jury: Vec<AccountIdOf<T>>,
jury: Vec<AccountId>,
) -> Result<(), DispatchError>;
}

Expand Down

0 comments on commit b443685

Please sign in to comment.