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

--- a/pallets/nft/Cargo.toml
+++ b/pallets/nft/Cargo.toml
@@ -80,6 +80,27 @@
 branch = 'v2.0.0_release'
 version = '2.0.0'
 
+[dependencies.pallet-balances]
+default-features = false
+git = 'https://github.com/usetech-llc/substrate.git'
+package = 'pallet-balances'
+branch = 'v2.0.0_release'
+version = '2.0.0'
+
+[dependencies.pallet-timestamp]
+default-features = false
+git = 'https://github.com/usetech-llc/substrate.git'
+package = 'pallet-timestamp'
+branch = 'v2.0.0_release'
+version = '2.0.0'
+
+[dependencies.pallet-randomness-collective-flip]
+default-features = false
+git = 'https://github.com/usetech-llc/substrate.git'
+package = 'pallet-randomness-collective-flip'
+branch = 'v2.0.0_release'
+version = '2.0.0'
+
 [features]
 default = ['std']
 std = [
@@ -87,6 +108,9 @@
     "serde/std",
     'frame-support/std',
     'frame-system/std',
+    'pallet-balances/std',
+    'pallet-timestamp/std',
+    'pallet-randomness-collective-flip/std',
     'sp-std/std',
     'sp-runtime/std',
     'frame-benchmarking/std',

22
3use crate::{Module, Trait};3use crate::{Module, Trait};
4
5use pallet_contracts::{
6	ContractAddressFor, TrieId, TrieIdGenerator,
7};
8
4use frame_support::{9use frame_support::{
5    impl_outer_origin, parameter_types,10    impl_outer_origin, parameter_types,
6    weights::{11    weights::{
7        constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},12      //  constants::{BlockExecutionWeight, ExtrinsicBaseWeight, RocksDbWeight},
8        Weight,13        Weight, IdentityFee,
9    },14    },
10};15};
11use frame_system as system;16use frame_system as system;
17use transaction_payment;
12use sp_core::H256;18use sp_core::H256;
13use sp_runtime::{19use sp_runtime::{
14    testing::Header,20    testing::Header,
15    traits::{BlakeTwo256, IdentityLookup, Saturating},21    traits::{BlakeTwo256, IdentityLookup, Saturating},
16    Perbill,22    Perbill,
17};23};
24pub use pallet_balances;
1825
19impl_outer_origin! {26impl_outer_origin! {
20    pub enum Origin for Test {}27    pub enum Origin for Test {}
56	type AvailableBlockRatio = AvailableBlockRatio;63	type AvailableBlockRatio = AvailableBlockRatio;
57	type Version = ();64	type Version = ();
58	type PalletInfo = ();65	type PalletInfo = ();
59	type AccountData = ();66	type AccountData = pallet_balances::AccountData<u64>;
60	type OnNewAccount = ();67	type OnNewAccount = ();
61	type OnKilledAccount = ();68	type OnKilledAccount = ();
62	type SystemWeightInfo = ();69	type SystemWeightInfo = ();
63}70}
71
72parameter_types! {
73	pub const ExistentialDeposit: u64 = 1;
74	pub const MaxLocks: u32 = 50;
75}
76
77type System = frame_system::Module<Test>;
78impl pallet_balances::Trait for Test {
79    type AccountStore = System;
80    type Balance = u64;
81    type DustRemoval = ();
82    type Event = ();
83	type ExistentialDeposit = ExistentialDeposit;
84	type WeightInfo = ();
85	type MaxLocks = MaxLocks;
86}
87
88parameter_types! {
89	pub const TransactionByteFee: u64 = 1;
90}
91impl transaction_payment::Trait for Test {
92	type Currency = pallet_balances::Module<Test>;
93	type OnTransactionPayment = ();
94	type TransactionByteFee = TransactionByteFee;
95	type WeightToFee = IdentityFee<u64>;
96	type FeeMultiplierUpdate = ();
97}
98
99
100parameter_types! {
101	pub const MinimumPeriod: u64 = 1;
102}
103impl pallet_timestamp::Trait for Test {
104	type Moment = u64;
105	type OnTimestampSet = ();
106	type MinimumPeriod = MinimumPeriod;
107	type WeightInfo = ();
108}
109
110type Timestamp = pallet_timestamp::Module<Test>;
111type Randomness = pallet_randomness_collective_flip::Module<Test>;
112
113parameter_types! {
114	pub const TombstoneDeposit: u64 = 1;
115	pub const RentByteFee: u64 = 1;
116	pub const RentDepositOffset: u64 = 1;
117	pub const SurchargeReward: u64 = 1;
118}
119
120pub struct DummyTrieIdGenerator;
121impl TrieIdGenerator<u64> for DummyTrieIdGenerator {
122	fn trie_id(account_id: &u64) -> TrieId {
123		let new_seed = *account_id + 1;
124		let mut res = vec![];
125		res.extend_from_slice(&new_seed.to_le_bytes());
126		res.extend_from_slice(&account_id.to_le_bytes());
127		res
128	}
129}
130
131pub struct DummyContractAddressFor;
132impl ContractAddressFor<H256, u64> for DummyContractAddressFor {
133	fn contract_address_for(_code_hash: &H256, _data: &[u8], origin: &u64) -> u64 {
134		*origin + 1
135	}
136}
137
138impl pallet_contracts::Trait for Test {
139	type Time = Timestamp;
140	type Randomness = Randomness;
141	type Currency = pallet_balances::Module<Test>;
142	type Event = ();
143	type DetermineContractAddress = DummyContractAddressFor;
144	type TrieIdGenerator = DummyTrieIdGenerator;
145	type RentPayment = ();
146	type SignedClaimHandicap = pallet_contracts::DefaultSignedClaimHandicap;
147	type TombstoneDeposit = TombstoneDeposit;
148	type StorageSizeOffset = pallet_contracts::DefaultStorageSizeOffset;
149	type RentByteFee = RentByteFee;
150	type RentDepositOffset = RentDepositOffset;
151	type SurchargeReward = SurchargeReward;
152	type MaxDepth = pallet_contracts::DefaultMaxDepth;
153	type MaxValueSize = pallet_contracts::DefaultMaxValueSize;
154	type WeightPrice = ();
155}
156
64impl Trait for Test {157impl Trait for Test {
65    type Event = ();158	type Event = ();
159	type WeightInfo = ();
160
66}161}
67pub type TemplateModule = Module<Test>;162pub type TemplateModule = Module<Test>;

--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -394,6 +394,77 @@
         assert_eq!(TemplateModule::balance_count(1, 1), 1);
         assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
 
+        // neg transfer
+        assert_noop!(TemplateModule::transfer_from(
+            origin2.clone(),
+            1,
+            2,
+            1,
+            1,
+            1), "Only item owner, collection owner and admins can modify items");
+
+        // do approve
+        assert_ok!(TemplateModule::approve(origin1.clone(), 2, 1, 1));
+        assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 1);
+        assert_eq!(
+            TemplateModule::approved(1, (1, 1))[0],
+            ApprovePermissions {
+                approved: 2,
+                amount: 100000000
+            }
+        );
+
+        assert_ok!(TemplateModule::transfer_from(
+            origin2.clone(),
+            1,
+            2,
+            1,
+            1,
+            1
+        ));
+        assert_eq!(TemplateModule::approved(1, (1, 1)).len(), 0);
+    });
+}
+
+#[test]
+fn nft_approve_and_transfer_from_white_list() {
+    new_test_ext().execute_with(|| {
+        let col_name1: Vec<u16> = "Test1\0".encode_utf16().collect::<Vec<u16>>();
+        let col_desc1: Vec<u16> = "TestDescription1\0".encode_utf16().collect::<Vec<u16>>();
+        let token_prefix1: Vec<u8> = b"token_prefix1\0".to_vec();
+        let mode: CollectionMode = CollectionMode::NFT(2000);
+
+        assert_ok!(TemplateModule::set_chain_limits(RawOrigin::Root.into(), ChainLimits { 
+            collection_numbers_limit: 10,
+            account_token_ownership_limit: 10,
+            collections_admins_limit: 5,
+            custom_data_limit: 2048,
+            nft_sponsor_transfer_timeout: 15,
+            fungible_sponsor_transfer_timeout: 15,
+            refungible_sponsor_transfer_timeout: 15,          
+        }));
+
+        let origin1 = Origin::signed(1);
+        let origin2 = Origin::signed(2);
+        assert_ok!(TemplateModule::create_collection(
+            origin1.clone(),
+            col_name1.clone(),
+            col_desc1.clone(),
+            token_prefix1.clone(),
+            mode
+        ));
+        assert_eq!(TemplateModule::collection(1).owner, 1);
+
+        assert_ok!(TemplateModule::create_item(
+            origin1.clone(),
+            1,
+            [1, 2, 3].to_vec(),
+            1
+        ));
+        assert_eq!(TemplateModule::nft_item_id(1, 1).data, [1, 2, 3].to_vec());
+        assert_eq!(TemplateModule::balance_count(1, 1), 1);
+        assert_eq!(TemplateModule::address_tokens(1, 1), [1]);
+
         assert_ok!(TemplateModule::set_mint_permission(
             origin1.clone(),
             1,