Merge branch 'feature/offers' into feature/role-base-access-control

Author: amatsonkali

.devcontainer/devcontainer.json

@@ -6,10 +6,11 @@
     "lldb.executable": "/usr/bin/lldb"
   },
   "extensions": [
-    "rust-lang.rust",
-    "bungcip.better-toml",
-    "vadimcn.vscode-lldb"
-  ],
+	"rust-lang.rust",
+	"bungcip.better-toml",
+	"vadimcn.vscode-lldb",
+	"rust-lang.rust-analyzer"
+],
   "forwardPorts": [
     3000,
     9944

pallets/fruniques/src/tests.rs

@@ -1,6 +1,6 @@
 use crate::{mock::*, Error};
 
-use frame_support::{assert_err, assert_noop, assert_ok};
+use frame_support::{assert_noop, assert_ok};
 use sp_runtime::Permill;
 
 pub struct ExtBuilder;

pallets/gated-marketplace/src/functions.rs

@@ -15,19 +15,31 @@ mod types;
 
 #[frame_support::pallet]
 pub mod pallet {
-	use frame_support::{pallet_prelude::{*, OptionQuery}, transactional};
+	use frame_support::pallet_prelude::*;
+	use frame_support::transactional;
 	use frame_system::pallet_prelude::*;
-	use frame_support::traits::Currency;
-	//use sp_runtime::sp_std::vec::Vec;
+	use sp_runtime::traits::Scale;
+	use frame_support::traits::{Currency, Time};
+		
 	use crate::types::*;
-	//use frame_support::traits::tokens::Balance;
 	use pallet_rbac::types::RoleBasedAccessControl;
 
+	pub type BalanceOf<T> = <<T as pallet_uniques::Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::Balance;
+
 	#[pallet::config]
-	pub trait Config: frame_system::Config + pallet_fruniques::Config + pallet_uniques::Config + pallet_timestamp::Config{
+	pub trait Config: frame_system::Config + pallet_fruniques::Config{
+
 		type Event: From<Event<Self>> + IsType<<Self as frame_system::Config>::Event>;
-		type LocalCurrency: Currency<Self::AccountId>;
-		//type Balance: Balance + MaybeSerializeDeserialize + Debug + MaxEncodedLen;
+
+		type Moment: Parameter
+			+ Default
+			+ Scale<Self::BlockNumber, Output = Self::Moment>
+			+ Copy
+			+ MaxEncodedLen
+			+ scale_info::StaticTypeInfo
+			+ Into<u64>;
+
+		type Timestamp: Time<Moment = Self::Moment>;
 
 		type RemoveOrigin: EnsureOrigin<Self::Origin>;		
 		#[pallet::constant]
@@ -88,7 +100,7 @@ pub mod pallet {
 		_, 
 		Blake2_128Concat, 
 		T::AccountId, // K1: account_id
-		Blake2_128Concat, 
+		Identity, 
 		[u8;32], // k2: marketplace_id 
 		[u8;32], //application_id
 		OptionQuery
@@ -113,7 +125,7 @@ pub mod pallet {
 		_, 
 		Blake2_128Concat, 
 		T::AccountId, //custodians
-		Blake2_128Concat, 
+		Identity, 
 		[u8;32], //marketplace_id 
 		BoundedVec<T::AccountId,T::MaxApplicationsPerCustodian>, //applicants 
 		ValueQuery
@@ -135,7 +147,7 @@ pub mod pallet {
 	#[pallet::getter(fn offers_by_account)]
 	pub(super) type OffersByAccount<T: Config> = StorageMap<
 		_, 
-		Identity, 
+		Blake2_128Concat, 
 		T::AccountId, // account_id
 		BoundedVec<[u8;32], T::MaxOffersPerMarket>, // offer_id's
 		ValueQuery,
@@ -187,6 +199,8 @@ pub mod pallet {
 		OfferWasAccepted([u8;32], T::AccountId),
 		/// Offer was duplicated. [new_offer_id, new_marketplace_id]
 		OfferDuplicated([u8;32], [u8;32]),
+		/// Offer was removed. [offer_id], [marketplace_id]
+		OfferRemoved([u8;32], [u8;32]), 
 	}
 
 	// Errors inform users that something went wrong.
@@ -321,7 +335,7 @@ pub mod pallet {
 			origin: OriginFor<T>, 
 			marketplace_id: [u8;32],
 			// Getting encoding errors from polkadotjs if an object vector have optional fields
-			fields : BoundedVec<(BoundedVec<u8,ConstU32<100> >,BoundedVec<u8,ConstU32<100>> ), T::MaxFiles>,
+			fields : Fields<T>,
 			custodian_fields: Option<(T::AccountId, BoundedVec<BoundedVec<u8,ConstU32<100>>, T::MaxFiles> )> 
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -359,7 +373,7 @@ pub mod pallet {
 			origin: OriginFor<T>, 
 			marketplace_id: [u8;32],
 			// Getting encoding errors from polkadotjs if an object vector have optional fields
-			fields : BoundedVec<(BoundedVec<u8,ConstU32<100> >,BoundedVec<u8,ConstU32<100>> ), T::MaxFiles>,
+			fields : Fields<T>,
 			custodian_fields: Option<(T::AccountId, BoundedVec<BoundedVec<u8,ConstU32<100>>, T::MaxFiles> )> 
 		) -> DispatchResult {
 			let who = ensure_signed(origin)?;
@@ -520,58 +534,33 @@ pub mod pallet {
 
 		/// Accepts a sell order.
 		/// 
-		/// This extrinsic accepts a sell order in the selected marketplace.
+		/// This extrisicn is called by the user who wants to buy the item.
+		/// Aaccepts a sell order in the selected marketplace.
 		/// 
 		/// ### Parameters:
 		/// - `origin`: The user who performs the action.
+		/// - 'offer_id`: The id of the sell order to be accepted.
 		/// - `marketplace_id`: The id of the marketplace where we want to accept the sell order.
-		/// - `collection_id`: The id of the collection.
-		/// - `item_id`: The id of the item inside the collection.
 		/// 
 		/// ### Considerations:
 		/// - You don't need to be the owner of the item to accept the sell order.
 		/// - Once the sell order is accepted, the ownership of the item is transferred to the buyer.
 		/// - If you don't have the enough balance to accept the sell order, it will throw an error.
 		#[transactional]
 		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
-		pub fn take_sell_offer(origin: OriginFor<T>, offer_id: [u8;32], marketplace_id: [u8;32], collection_id: T::CollectionId, item_id: T::ItemId,) -> DispatchResult {
+		pub fn take_sell_offer(origin: OriginFor<T>, offer_id: [u8;32]) -> DispatchResult {
 			let who = ensure_signed(origin.clone())?; 
 
-			Self::do_take_sell_offer(who, offer_id, marketplace_id, collection_id, item_id)
+			Self::do_take_sell_offer(who, offer_id)
 		}
-
-		/// Allows a user to duplicate a sell order.
-		/// 
-		/// This extrinsic allows a user to duplicate a sell order in any marketplace.
-		/// 
-		/// ### Parameters:
-		/// - `origin`: The user who performs the action.
-		/// - `marketplace_id`: The id of the marketplace where we want to duplicate the sell order.
-		/// - `collection_id`: The id of the collection.
-		/// - `item_id`: The id of the item inside the collection.
-		/// 
-		/// ### Considerations:
-		/// - You can only duplicate a sell order if you are the owner of the item.
-		/// - The expiration date of the sell order is the same as the original sell order.
-		/// - You can update the price of the sell order.
-		#[transactional]
-		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]	
-		pub fn duplicate_offer(origin: OriginFor<T>, offer_id: [u8;32], marketplace_id: [u8;32], collection_id: T::CollectionId, item_id: T::ItemId, modified_price: BalanceOf<T>) -> DispatchResult {
-			let who = ensure_signed(origin.clone())?; 
-
-			Self::do_duplicate_offer(who, offer_id, marketplace_id, collection_id, item_id, modified_price)
-		}	
-
-
+		
 		/// Delete an offer.
 		/// 
 		/// This extrinsic deletes an offer in the selected marketplace.
 		/// 
 		/// ### Parameters:
 		/// - `origin`: The user who performs the action.
-		/// - `marketplace_id`: The id of the marketplace where we want to delete the offer.
-		/// - `collection_id`: The id of the collection.
-		/// - `item_id`: The id of the item inside the collection.
+		/// - `offer_id`: The id of the offer to be deleted.
 		/// 
 		/// ### Considerations:
 		/// - You can delete sell orders or buy orders.
@@ -581,12 +570,12 @@ pub mod pallet {
 		///  delete them one by one.
 		#[transactional]
 		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
-		pub fn remove_offer(origin: OriginFor<T>, offer_id: [u8;32], marketplace_id: [u8;32], collection_id: T::CollectionId, item_id: T::ItemId,) -> DispatchResult {
+		pub fn remove_offer(origin: OriginFor<T>, offer_id: [u8;32]) -> DispatchResult {
 			//Currently, we can only remove one offer at a time.
 			//TODO: Add support for removing multiple offers at a time.
 			let who = ensure_signed(origin.clone())?; 
 
-			Self::do_remove_offer(who, offer_id, marketplace_id, collection_id, item_id)
+			Self::do_remove_offer(who, offer_id)
 		}
 
 		/// Enlist a buy order.
@@ -615,13 +604,13 @@ pub mod pallet {
 
 		/// Accepts a buy order.
 		/// 	
-		/// This extrinsic accepts a buy order in the selected marketplace.
+		/// This extrinsic is called by the owner of the item who accepts the buy offer created by a marketparticipant.
+		/// Accepts a buy order in the selected marketplace.
 		/// 
 		/// ### Parameters:
 		/// - `origin`: The user who performs the action.
+		/// - `offer_id`: The id of the buy order to be accepted.
 		/// - `marketplace_id`: The id of the marketplace where we accept the buy order.
-		/// - `collection_id`: The id of the collection.
-		/// - `item_id`: The id of the item inside the collection.
 		/// 
 		/// ### Considerations:
 		/// - You need to be the owner of the item to accept a buy order.
@@ -631,10 +620,10 @@ pub mod pallet {
 		/// - Once the buy order is accepted, the ownership of the item is transferred to the buyer.
 		#[transactional]
 		#[pallet::weight(10_000 + T::DbWeight::get().writes(1))]
-		pub fn take_buy_offer(origin: OriginFor<T>, offer_id: [u8;32], marketplace_id: [u8;32], collection_id: T::CollectionId, item_id: T::ItemId,) -> DispatchResult {
+		pub fn take_buy_offer(origin: OriginFor<T>, offer_id: [u8;32]) -> DispatchResult {
 			let who = ensure_signed(origin.clone())?; 
 
-			Self::do_take_buy_offer(who, offer_id, marketplace_id, collection_id, item_id)
+			Self::do_take_buy_offer(who, offer_id)
 		}
 
 

pallets/gated-marketplace/src/lib.rs

@@ -71,7 +71,6 @@ parameter_types! {
 	pub const MaxFiles: u32 = 10;
 	pub const MaxApplicationsPerCustodian: u32 = 2;
 	pub const MaxMarketsPerItem: u32 = 10;
-
 	pub const MaxOffersPerMarket: u32 = 100;
 }
 
@@ -89,7 +88,9 @@ impl pallet_gated_marketplace::Config for Test {
 	type MaxApplicationsPerCustodian = MaxApplicationsPerCustodian;
 	type MaxOffersPerMarket = MaxOffersPerMarket;
 	type MaxMarketsPerItem = MaxMarketsPerItem;
-	type LocalCurrency = Balances;
+	type Timestamp = Timestamp;
+	type Moment = u64;
+	//type LocalCurrency = Balances;
 	type Rbac = RBAC;
 }
 

pallets/gated-marketplace/src/mock.rs

@@ -53,7 +53,7 @@ fn _create_file(name: &str, cid: &str, create_custodian_file: bool) -> Applicati
 
 // due to encoding problems with polkadot-js, the custodians_cid generation will be done in another function
 fn create_application_fields( n_files: u32) -> 
-		BoundedVec<(BoundedVec<u8,ConstU32<100> >,BoundedVec<u8,ConstU32<100>> ), MaxFiles> {
+	BoundedVec<(BoundedVec<u8,ConstU32<100> >,BoundedVec<u8,ConstU32<100>> ), MaxFiles> {
 	let mut files = Vec::<(BoundedVec<u8,ConstU32<100> >,BoundedVec<u8,ConstU32<100>> )>::default();
 	for i in 0..n_files{
 		let file_name = format!("file{}",i.to_string());
@@ -1118,7 +1118,7 @@ fn take_sell_offer_works(){
 		assert_ok!(GatedMarketplace::enlist_sell_offer(Origin::signed(1), m_id, 0, 0, 1200)); 
 		let offer_id = GatedMarketplace::offers_by_item(0, 0).iter().next().unwrap().clone();
 
-		assert_ok!(GatedMarketplace::take_sell_offer(Origin::signed(2), offer_id, m_id, 0, 0));
+		assert_ok!(GatedMarketplace::take_sell_offer(Origin::signed(2), offer_id));
 		assert_eq!(GatedMarketplace::offers_by_item(0, 0).len(), 0);
 		assert_eq!(GatedMarketplace::offers_info(offer_id).unwrap().status, OfferStatus::Closed);
 
@@ -1141,7 +1141,7 @@ fn take_sell_offer_owner_cannnot_be_the_buyer_shouldnt_work() {
 		assert_ok!(GatedMarketplace::enlist_sell_offer(Origin::signed(1), m_id, 0, 0, 1200)); 
 		let offer_id = GatedMarketplace::offers_by_item(0, 0).iter().next().unwrap().clone();
 
-		assert_noop!(GatedMarketplace::take_sell_offer(Origin::signed(1), offer_id, m_id, 0, 0), Error::<Test>::CannotTakeOffer);
+		assert_noop!(GatedMarketplace::take_sell_offer(Origin::signed(1), offer_id), Error::<Test>::CannotTakeOffer);
 	});
 }
 
@@ -1162,7 +1162,7 @@ fn take_sell_offer_id_does_not_exist_shouldnt_work(){
 		let offer_id = GatedMarketplace::offers_by_item(0, 0).iter().next().unwrap().clone();
 		let offer_id2 = offer_id.using_encoded(blake2_256);
 
-		assert_noop!(GatedMarketplace::take_sell_offer(Origin::signed(2), offer_id2, m_id, 0, 0), Error::<Test>::OfferNotFound);
+		assert_noop!(GatedMarketplace::take_sell_offer(Origin::signed(2), offer_id2), Error::<Test>::OfferNotFound);
 	});
 }
 
@@ -1183,7 +1183,7 @@ fn take_sell_offer_buyer_does_not_have_enough_balance_shouldnt_work(){
 		assert_ok!(GatedMarketplace::enlist_sell_offer(Origin::signed(1), m_id, 0, 0, 1200)); 
 		let offer_id = GatedMarketplace::offers_by_item(0, 0).iter().next().unwrap().clone();
 
-		assert_noop!(GatedMarketplace::take_sell_offer(Origin::signed(2), offer_id, m_id, 0, 0), Error::<Test>::NotEnoughBalance);
+		assert_noop!(GatedMarketplace::take_sell_offer(Origin::signed(2), offer_id), Error::<Test>::NotEnoughBalance);
 	});
 }
 
@@ -1208,7 +1208,7 @@ fn take_buy_offer_works(){
 		let offer_id2 = GatedMarketplace::offers_by_account(2).iter().next().unwrap().clone();
 		assert_eq!(GatedMarketplace::offers_info(offer_id2).unwrap().offer_type, OfferType::BuyOrder);
 
-		assert_ok!(GatedMarketplace::take_buy_offer(Origin::signed(1), offer_id2, m_id, 0, 0));
+		assert_ok!(GatedMarketplace::take_buy_offer(Origin::signed(1), offer_id2));
 		assert_eq!(GatedMarketplace::offers_by_item(0, 0).len(), 0);
 		assert_eq!(GatedMarketplace::offers_info(offer_id).unwrap().status, OfferStatus::Closed);
 	});
@@ -1236,7 +1236,7 @@ fn take_buy_offer_only_owner_can_accept_buy_offers_shouldnt_work(){
 		let offer_id2 = GatedMarketplace::offers_by_account(2).iter().next().unwrap().clone();
 		assert_eq!(GatedMarketplace::offers_info(offer_id2).unwrap().offer_type, OfferType::BuyOrder);
 
-		assert_noop!(GatedMarketplace::take_buy_offer(Origin::signed(2), offer_id2, m_id, 0, 0), Error::<Test>::NotOwner);
+		assert_noop!(GatedMarketplace::take_buy_offer(Origin::signed(2), offer_id2), Error::<Test>::NotOwner);
 	});
 }
 
@@ -1262,7 +1262,7 @@ fn take_buy_offer_id_does_not_exist_shouldnt_work(){
 		assert_eq!(GatedMarketplace::offers_info(offer_id2).unwrap().offer_type, OfferType::BuyOrder);
 
 		let offer_id3 = offer_id2.using_encoded(blake2_256);
-		assert_noop!(GatedMarketplace::take_buy_offer(Origin::signed(1), offer_id3, m_id, 0, 0), Error::<Test>::OfferNotFound);
+		assert_noop!(GatedMarketplace::take_buy_offer(Origin::signed(1), offer_id3), Error::<Test>::OfferNotFound);
 
 	});
 }
@@ -1289,7 +1289,7 @@ fn take_buy_offer_user_does_not_have_enough_balance_shouldnt_work(){
 		assert_eq!(GatedMarketplace::offers_info(offer_id2).unwrap().offer_type, OfferType::BuyOrder);
 
 		Balances::make_free_balance_be(&2, 0);
-		assert_noop!(GatedMarketplace::take_buy_offer(Origin::signed(1), offer_id2, m_id, 0, 0), Error::<Test>::NotEnoughBalance);
+		assert_noop!(GatedMarketplace::take_buy_offer(Origin::signed(1), offer_id2), Error::<Test>::NotEnoughBalance);
 	});
 }
 
@@ -1310,7 +1310,7 @@ fn remove_sell_offer_works(){
 		let offer_id = GatedMarketplace::offers_by_account(1).iter().next().unwrap().clone();
 		assert!(GatedMarketplace::offers_info(offer_id).is_some());
 
-		assert_ok!(GatedMarketplace::remove_offer(Origin::signed(1), offer_id, m_id, 0, 0));
+		assert_ok!(GatedMarketplace::remove_offer(Origin::signed(1), offer_id));
 		assert_eq!(GatedMarketplace::offers_by_account(1).len(), 0);
 		assert!(GatedMarketplace::offers_info(offer_id).is_none());
 	});
@@ -1337,7 +1337,7 @@ fn remove_buy_offer_works(){
 		let offer_id2 = GatedMarketplace::offers_by_account(2).iter().next().unwrap().clone();
 		assert!(GatedMarketplace::offers_info(offer_id2).is_some());
 
-		assert_ok!(GatedMarketplace::remove_offer(Origin::signed(2), offer_id2, m_id, 0, 0));
+		assert_ok!(GatedMarketplace::remove_offer(Origin::signed(2), offer_id2));
 		assert_eq!(GatedMarketplace::offers_by_account(2).len(), 0);
 		assert!(GatedMarketplace::offers_info(offer_id2).is_none());
 	});
@@ -1361,7 +1361,7 @@ fn remove_offer_id_does_not_exist_sholdnt_work(){
 		assert!(GatedMarketplace::offers_info(offer_id).is_some());
 
 		let offer_id2 = offer_id.using_encoded(blake2_256);
-		assert_noop!(GatedMarketplace::remove_offer(Origin::signed(2), offer_id2, m_id, 0, 0), Error::<Test>::OfferNotFound);
+		assert_noop!(GatedMarketplace::remove_offer(Origin::signed(2), offer_id2), Error::<Test>::OfferNotFound);
 	});
 }
 
@@ -1382,7 +1382,7 @@ fn remove_offer_creator_doesnt_match_sholdnt_work(){
 		let offer_id = GatedMarketplace::offers_by_account(1).iter().next().unwrap().clone();
 		assert!(GatedMarketplace::offers_info(offer_id).is_some());
 
-		assert_noop!(GatedMarketplace::remove_offer(Origin::signed(2), offer_id, m_id, 0, 0), Error::<Test>::CannotRemoveOffer);
+		assert_noop!(GatedMarketplace::remove_offer(Origin::signed(2), offer_id), Error::<Test>::CannotRemoveOffer);
 	});
 }
 
@@ -1407,11 +1407,11 @@ fn remove_offer_status_is_closed_shouldnt_work(){
 		let offer_id2 = GatedMarketplace::offers_by_account(2).iter().next().unwrap().clone();
 		assert_eq!(GatedMarketplace::offers_info(offer_id2).unwrap().offer_type, OfferType::BuyOrder);
 
-		assert_ok!(GatedMarketplace::take_buy_offer(Origin::signed(1), offer_id2, m_id, 0, 0));
+		assert_ok!(GatedMarketplace::take_buy_offer(Origin::signed(1), offer_id2));
 		assert_eq!(GatedMarketplace::offers_by_item(0, 0).len(), 0);
 		assert_eq!(GatedMarketplace::offers_info(offer_id).unwrap().status, OfferStatus::Closed);
 
-		assert_noop!(GatedMarketplace::remove_offer(Origin::signed(2), offer_id2, m_id, 0, 0), Error::<Test>::CannotDeleteOffer);
+		assert_noop!(GatedMarketplace::remove_offer(Origin::signed(2), offer_id2), Error::<Test>::CannotDeleteOffer);
 	});
 
 }