Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pallet updates according to latest discussions #31

Merged
merged 1 commit into from
Mar 25, 2022
Merged

Pallet updates according to latest discussions #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 30 additions & 14 deletions control/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ mod tests;

use codec::HasCompact;
use frame_support::{
codec::{Decode, Encode},
codec::{Encode},
dispatch::DispatchResult,
ensure,
traits::{Get, Randomness},
Expand Down Expand Up @@ -243,7 +243,7 @@ pub mod pallet {
// disables an org to be used
// org_id: an organisations hash
#[pallet::weight(1_000_000)]
pub fn disable(origin: OriginFor<T>, org_id: T::Hash) -> DispatchResult {
pub fn disable_org(origin: OriginFor<T>, org_id: T::Hash) -> DispatchResult {
ensure_root(origin)?;
OrgState::<T>::insert(org_id.clone(), ControlState::Inactive);
Self::deposit_event(Event::OrgDisabled(org_id));
Expand All @@ -266,7 +266,6 @@ pub mod pallet {
/// - `gov_asset`: control assets to empower actors
/// - `pay_asset`:
/// - `member_limit`: max members, if 0 == no limit
/// - `member_limit`: max members, if 0 == no limit
///
/// Emits `OrgCreated` event when successful.
///
Expand Down Expand Up @@ -348,12 +347,19 @@ pub mod pallet {
Ok(())
}

// Add Member to Org
/// Add Member to Org
///
/// - `org_id`: Org id
/// - `account`: Account to be added
///
/// Emits `AddMember` event when successful.
///
/// Weight:
#[pallet::weight(1_000_000)]
pub fn add_member(origin: OriginFor<T>, org_id: T::Hash, account: T::AccountId) -> DispatchResult {
ensure_signed(origin)?;
// TODO: ensure not a member yet, org exists
Self::add_org_member(org_id.clone(), account.clone())?;
Self::do_add_member(org_id.clone(), account.clone())?;

let now = <frame_system::Pallet<T>>::block_number();
Self::deposit_event(Event::AddMember {
Expand All @@ -365,12 +371,22 @@ pub mod pallet {
Ok(())
}

// Remove Member from Org
/// Remove Member from Org
///
/// - `org_id`: Org id
/// - `account`: Account to be removed
///
/// Emits `RemoveMember` event when successful.
///
/// Weight:
#[pallet::weight(1_000_000)]
pub fn remove_member(origin: OriginFor<T>, org_id: T::Hash, account: T::AccountId) -> DispatchResult {
// TODO ASAP: when fees==1 unreserve fees
ensure_signed(origin)?;
Self::remove(org_id.clone(), account.clone())?;
Self::do_remove_member(org_id.clone(), account.clone())?;
let config = OrgConfiguration::<T>::get(&org_id).ok_or(Error::<T>::OrganizationUnknown)?;
if config.fee_model == FeeModel::Reserve {
T::Currency::unreserve(T::ProtocolTokenId::get(), &account, config.fee);
}
Self::deposit_event(Event::RemoveMember {
org_id: org_id,
account_id: account,
Expand Down Expand Up @@ -472,7 +488,7 @@ impl<T: Config> Pallet<T> {
// Ok(_) => {},
// Err(err) => { panic!("{err}") }
// };
Self::add_org_member(org_id.clone(), controller.clone())?;
Self::do_add_member(org_id.clone(), controller.clone())?;

Self::mint_nft()?;

Expand Down Expand Up @@ -569,19 +585,19 @@ impl<T: Config> Pallet<T> {
}

fn set_member_state(org_id: T::Hash, account: T::AccountId, member_state: ControlMemberState) -> DispatchResult {
// TODO: we would like to update member state based on voting result
ensure!(Orgs::<T>::contains_key(&org_id), Error::<T>::OrganizationUnknown);
let config = OrgConfiguration::<T>::get(&org_id).ok_or(Error::<T>::OrganizationUnknown)?;
let _current_state = OrgMemberState::<T>::get((&org_id, &account));
let _new_state = match config.access {
let new_state = match config.access {
AccessModel::Open => member_state, // when open use desired state
_ => ControlMemberState::Pending, // else pending
};
// TODO ASAP: save new_state to storage
OrgMemberState::<T>::insert((&org_id, &account), new_state);

Ok(())
}

fn add_org_member(org_id: T::Hash, account: T::AccountId) -> DispatchResult {
fn do_add_member(org_id: T::Hash, account: T::AccountId) -> DispatchResult {
ensure!(Orgs::<T>::contains_key(&org_id), Error::<T>::OrganizationUnknown);

let mut members = OrgMembers::<T>::get(&org_id);
Expand Down Expand Up @@ -641,7 +657,7 @@ impl<T: Config> Pallet<T> {
}
}

fn remove(org_id: T::Hash, account: T::AccountId) -> DispatchResult {
fn do_remove_member(org_id: T::Hash, account: T::AccountId) -> DispatchResult {
// existence
ensure!(Orgs::<T>::contains_key(&org_id), Error::<T>::OrganizationUnknown);

Expand Down
5 changes: 4 additions & 1 deletion flow/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ impl<T: Config> Pallet<T> {
}
}

impl<T: Config> FlowTrait<T::Hash, T::Balance> for Pallet<T> {
impl<T: Config> FlowTrait<T::AccountId, T::Balance, T::Hash> for Pallet<T> {
fn campaign_balance(hash: &T::Hash) -> T::Balance {
CampaignBalance::<T>::get(hash)
}
Expand All @@ -848,6 +848,9 @@ impl<T: Config> FlowTrait<T::Hash, T::Balance> for Pallet<T> {
fn campaign_org(hash: &T::Hash) -> T::Hash {
CampaignOrg::<T>::get(hash)
}
fn campaign_owner(hash: &T::Hash) -> Option<T::AccountId> {
CampaignOwner::<T>::get(hash)
}
fn is_campaign_succeeded(hash: &T::Hash) -> bool {
CampaignState::<T>::get(hash) == FlowState::Success
}
Expand Down
36 changes: 15 additions & 21 deletions signal/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ pub mod pallet {
+ MultiReservableCurrency<Self::AccountId>;
type Randomness: Randomness<Self::Hash, Self::BlockNumber>;
type Control: ControlTrait<Self::AccountId, Self::Hash>;
type Flow: FlowTrait<Self::Hash, Self::Balance>;
type Flow: FlowTrait<Self::AccountId, Self::Balance, Self::Hash>;
type ForceOrigin: EnsureOrigin<Self::Origin>;
type WeightInfo: WeightInfo;

Expand Down Expand Up @@ -246,7 +246,7 @@ pub mod pallet {
WithdrawalGranted {
proposal_id: T::Hash,
campaign_id: T::Hash,
body_id: T::Hash,
org_id: T::Hash,
},
}

Expand Down Expand Up @@ -330,7 +330,6 @@ pub mod pallet {
);

let current_block = <frame_system::Pallet<T>>::block_number();
// ensure!(start > current_block, Error::<T>::OutOfBounds);
ensure!(expiry > current_block, Error::<T>::OutOfBounds);
ensure!(
expiry <= current_block + ProposalTimeLimit::<T>::get(),
Expand Down Expand Up @@ -422,7 +421,6 @@ pub mod pallet {
#[transactional]
pub fn withdraw_proposal(
origin: OriginFor<T>,
// TODO: maybe use org_id instead?
campaign_id: T::Hash,
title: Vec<u8>,
cid: Vec<u8>,
Expand All @@ -434,20 +432,16 @@ pub mod pallet {

ensure!(T::Flow::is_campaign_succeeded(&campaign_id), Error::<T>::CampaignFailed);

// TODO ASAP: fix this
// Should this checks be performed? - YES
let owner = T::Flow::campaign_owner(&campaign_id).ok_or(Error::<T>::AuthorizationError)?;
ensure!(sender == owner, Error::<T>::AuthorizationError);

// let owner = T::Flow::campaign_owner(&campaign_id);
// ensure!( sender == owner, Error::<T>::AuthorizationError );

// TODO ASAP: fix this
// Should this checks be performed or not? - YES

// let current_block = <frame_system::Pallet<T>>::block_number();
// ensure!(start > current_block, Error::<T>::OutOfBounds );
// ensure!(expiry > start, Error::<T>::OutOfBounds );
// ensure!(expiry <= current_block + Self::proposal_time_limit(),
// Error::<T>::OutOfBounds );
let current_block = <frame_system::Pallet<T>>::block_number();
ensure!(start > current_block, Error::<T>::OutOfBounds );
ensure!(expiry > start, Error::<T>::OutOfBounds );
ensure!(
expiry <= current_block + ProposalTimeLimit::<T>::get(),
Error::<T>::OutOfBounds
);

let used_balance = CampaignBalanceUsed::<T>::get(&campaign_id);
let total_balance = T::Flow::campaign_balance(&campaign_id);
Expand Down Expand Up @@ -657,9 +651,9 @@ pub mod pallet {
// Get the owner of the campaign
let _owner = Owners::<T>::get(&proposal.proposal_id).ok_or(Error::<T>::NoProposalOwner)?;

// get treasury account for related body and unlock balance
let body = T::Flow::campaign_org(&proposal.campaign_id);
let treasury_account = T::Control::org_treasury_account(&body);
// get treasury account for related org and unlock balance
let org_id = T::Flow::campaign_org(&proposal.campaign_id);
let treasury_account = T::Control::org_treasury_account(&org_id);
T::Currency::unreserve(T::PaymentTokenId::get(), &treasury_account, proposal_balance);

// Change the used amount
Expand All @@ -674,7 +668,7 @@ pub mod pallet {
Self::deposit_event(Event::<T>::WithdrawalGranted {
proposal_id: proposal.proposal_id,
campaign_id: proposal.campaign_id,
body_id: body,
org_id
});
Ok(())
}
Expand Down
Loading