git.delta.rocks / unique-network / refs/commits / 5df49385ed2d

difftreelog

feat custom collection creation price

Yaroslav Bolyukin2021-03-12parent: #2d6d3d4.patch.diff
in: master

3 files changed

modifiedpallets/nft/src/lib.rsdiffbeforeafterboth
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -434,6 +434,8 @@
 
     /// Weight information for extrinsics in this pallet.
 	type WeightInfo: WeightInfo;
+
+    type CollectionCreationPrice: Get<BalanceOf<Self>>;
 }
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -2535,14 +2537,10 @@
 	> {
         let tip = self.0;
 
-        // Set fee based on call type. Creating collection costs 1 Unique.
-        // All other transactions have traditional fees so far
-        // let fee = match call.is_sub_type() {
-        //     Some(Call::create_collection(..)) => <BalanceOf<T>>::from(1_000_000_000),
-        //     _ => Self::traditional_fee(len, info, tip), // Flat fee model, use only for testing purposes
-        //                                                 // _ => <BalanceOf<T>>::from(100)
-        // };
-        let fee = Self::traditional_fee(len, info, tip);
+        let fee = match call.is_sub_type() {
+            Some(Call::create_collection(..)) => T::CollectionCreationPrice::get(),
+            _ => Self::traditional_fee(len, info, tip),
+        };
 
         // Only mess with balances if fee is not zero.
         if fee.is_zero() {
modifiedpallets/nft/src/mock.rsdiffbeforeafterboth
before · pallets/nft/src/mock.rs
1use crate as pallet_template;2use sp_core::H256;3use frame_support::{ 4	parameter_types,5	weights::IdentityFee,6};7use sp_runtime::{8	traits::{BlakeTwo256, IdentityLookup}, 9	testing::Header, 10	Perbill,11};12use pallet_transaction_payment::{ CurrencyAdapter};13use frame_system as system;1415type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;16type Block = frame_system::mocking::MockBlock<Test>; 1718// Configure a mock runtime to test the pallet.19frame_support::construct_runtime!(20	pub enum Test where21		Block = Block,22		NodeBlock = Block,23		UncheckedExtrinsic = UncheckedExtrinsic,24	{25		System: frame_system::{Module, Call, Config, Storage, Event<T>},26		TemplateModule: pallet_template::{Module, Call, Storage},27	}28);2930parameter_types! {31	pub const BlockHashCount: u64 = 250;32	pub const SS58Prefix: u8 = 42;33}3435impl system::Config for Test {36	type BaseCallFilter = ();37	type BlockWeights = ();38	type BlockLength = ();39	type DbWeight = ();40	type Origin = Origin;41	type Call = Call;42	type Index = u64;43	type BlockNumber = u64;44	type Hash = H256;45	type Hashing = BlakeTwo256;46	type AccountId = u64;47	type Lookup = IdentityLookup<Self::AccountId>;48	type Header = Header;49	type Event = ();50	type BlockHashCount = BlockHashCount;51	type Version = ();52	type PalletInfo = PalletInfo;53	type AccountData = pallet_balances::AccountData<u64>;54	type OnNewAccount = ();55	type OnKilledAccount = ();56	type SystemWeightInfo = ();57	type SS58Prefix = SS58Prefix;58}5960parameter_types! {61	pub const ExistentialDeposit: u64 = 1;62	pub const MaxLocks: u32 = 50;63}64//frame_system::Module<Test>;65impl pallet_balances::Config for Test {66    type AccountStore = System;67    type Balance = u64;68    type DustRemoval = ();69    type Event = ();70	type ExistentialDeposit = ExistentialDeposit;71	type WeightInfo = ();72	type MaxLocks = MaxLocks;73}7475parameter_types! {76	pub const TransactionByteFee: u64 = 1;77}7879impl pallet_transaction_payment::Config for Test {80	type OnChargeTransaction = CurrencyAdapter<pallet_balances::Module<Test>, ()>;81	type TransactionByteFee = TransactionByteFee;82	type WeightToFee = IdentityFee<u64>;83	type FeeMultiplierUpdate = ();84}8586parameter_types! {87	pub const MinimumPeriod: u64 = 1;88}89impl pallet_timestamp::Config for Test {90	type Moment = u64;91	type OnTimestampSet = ();92	type MinimumPeriod = MinimumPeriod;93	type WeightInfo = ();94}9596type Timestamp = pallet_timestamp::Module<Test>;97type Randomness = pallet_randomness_collective_flip::Module<Test>;9899parameter_types! {100	pub const TombstoneDeposit: u64 = 1;101	pub const DepositPerContract: u64 = 1;102	pub const DepositPerStorageByte: u64 = 1;103	pub const DepositPerStorageItem: u64 = 1;104	pub RentFraction: Perbill = Perbill::from_rational_approximation(1u32, 30 * 24 * 60 * 10);105	pub const SurchargeReward: u64 = 1;106	pub const SignedClaimHandicap: u32 = 2;107	pub const MaxDepth: u32 = 32;108	pub const MaxValueSize: u32 = 16 * 1024;109	pub DeletionWeightLimit: u64 = u64::MAX;//Perbill::from_percent(10);110	pub DeletionQueueDepth: u32 = 10;111}112113impl pallet_contracts::Config for Test {114	type Time = Timestamp;115	type Randomness = Randomness;116	type Currency = pallet_balances::Module<Test>;117	type Event = ();118	type RentPayment = ();119	type SignedClaimHandicap = SignedClaimHandicap;120	type TombstoneDeposit = TombstoneDeposit;121	type DepositPerContract = DepositPerContract;122	type DepositPerStorageByte = DepositPerStorageByte;123	type DepositPerStorageItem = DepositPerStorageItem;124	type RentFraction = RentFraction;125	type SurchargeReward = SurchargeReward;126	type DeletionWeightLimit = DeletionWeightLimit;127	type MaxDepth = MaxDepth;128	type DeletionQueueDepth = DeletionQueueDepth;129	type MaxValueSize = MaxValueSize;130	type ChainExtension = ();131	type MaxCodeSize = ();132	type WeightPrice = ();133	type WeightInfo = pallet_contracts::weights::SubstrateWeight<Self>;134}135136impl pallet_template::Config for Test {137	type Event = ();138	type WeightInfo = ();139}140141// Build genesis storage according to the mock runtime.142pub fn new_test_ext() -> sp_io::TestExternalities {143	system::GenesisConfig::default().build_storage::<Test>().unwrap().into()144}
modifiedruntime/src/lib.rsdiffbeforeafterboth
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -510,6 +510,7 @@
 
 parameter_types! {
 	pub const MinVestedTransfer: Balance = 10 * UNIQUE;
+	pub const CollectionCreationPrice: Balance = 100 * UNIQUE;
 }
 
 impl pallet_vesting::Config for Runtime {
@@ -524,6 +525,7 @@
 impl pallet_nft::Config for Runtime {
     type Event = Event;
     type WeightInfo = nft_weights::WeightInfo;
+	type CollectionCreationPrice = CollectionCreationPrice;
 }
 
 construct_runtime!(