difftreelog
Whitelist to allowlist renamed
in: master
9 files changed
pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -123,7 +123,7 @@
.checked_sub(amount)
.ok_or(<CommonError<T>>::TokenValueTooLow)?;
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
collection.check_allowlist(owner)?;
}
@@ -161,7 +161,7 @@
<CommonError<T>>::TransferNotAllowed
);
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
collection.check_allowlist(from)?;
collection.check_allowlist(to)?;
}
@@ -305,7 +305,7 @@
spender: &T::CrossAccountId,
amount: u128,
) -> DispatchResult {
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
collection.check_allowlist(&owner)?;
collection.check_allowlist(&spender)?;
}
@@ -333,7 +333,7 @@
if spender == from {
return Self::transfer(collection, from, to, amount);
}
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
// `from`, `to` checked in [`transfer`]
collection.check_allowlist(spender)?;
}
@@ -365,7 +365,7 @@
if spender == from {
return Self::burn(collection, from, amount);
}
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
// `from` checked in [`burn`]
collection.check_allowlist(spender)?;
}
pallets/nft/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nft/src/benchmarking.rs
+++ b/pallets/nft/src/benchmarking.rs
@@ -55,23 +55,23 @@
let collection = create_nft_collection::<T>(caller.clone())?;
}: _(RawOrigin::Signed(caller.clone()), collection)
- add_to_white_list {
+ add_to_allow_list {
let caller: T::AccountId = account("caller", 0, SEED);
let whitelist_account: T::AccountId = account("admin", 0, SEED);
let collection = create_nft_collection::<T>(caller.clone())?;
}: _(RawOrigin::Signed(caller.clone()), collection, T::CrossAccountId::from_sub(whitelist_account))
- remove_from_white_list {
+ remove_from_allow_list {
let caller: T::AccountId = account("caller", 0, SEED);
let whitelist_account: T::AccountId = account("admin", 0, SEED);
let collection = create_nft_collection::<T>(caller.clone())?;
- <Pallet<T>>::add_to_white_list(RawOrigin::Signed(caller.clone()).into(), collection, T::CrossAccountId::from_sub(whitelist_account.clone()))?;
+ <Pallet<T>>::add_to_allow_list(RawOrigin::Signed(caller.clone()).into(), collection, T::CrossAccountId::from_sub(whitelist_account.clone()))?;
}: _(RawOrigin::Signed(caller.clone()), collection, T::CrossAccountId::from_sub(whitelist_account))
set_public_access_mode {
let caller: T::AccountId = account("caller", 0, SEED);
let collection = create_nft_collection::<T>(caller.clone())?;
- }: _(RawOrigin::Signed(caller.clone()), collection, AccessMode::WhiteList)
+ }: _(RawOrigin::Signed(caller.clone()), collection, AccessMode::AllowList)
set_mint_permission {
let caller: T::AccountId = account("caller", 0, SEED);
pallets/nft/src/lib.rsdiffbeforeafterboth--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -274,9 +274,9 @@
/// * collection_id.
///
/// * address.
- #[weight = <SelfWeightOf<T>>::add_to_white_list()]
+ #[weight = <SelfWeightOf<T>>::add_to_allow_list()]
#[transactional]
- pub fn add_to_white_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{
+ pub fn add_to_allow_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
@@ -303,9 +303,9 @@
/// * collection_id.
///
/// * address.
- #[weight = <SelfWeightOf<T>>::remove_from_white_list()]
+ #[weight = <SelfWeightOf<T>>::remove_from_allow_list()]
#[transactional]
- pub fn remove_from_white_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{
+ pub fn remove_from_allow_list(origin, collection_id: CollectionId, address: T::CrossAccountId) -> DispatchResult{
let sender = T::CrossAccountId::from_sub(ensure_signed(origin)?);
let collection = <CollectionHandle<T>>::try_get(collection_id)?;
pallets/nft/src/tests.rsdiffbeforeafterboth--- a/pallets/nft/src/tests.rs
+++ b/pallets/nft/src/tests.rs
@@ -485,19 +485,19 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
1,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(1)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(2)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(3)
@@ -549,19 +549,19 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
1,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(1)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(2)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(3)
@@ -609,19 +609,19 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
1,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(1)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(2)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(3)
@@ -765,9 +765,9 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(1)
@@ -952,19 +952,19 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
1,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(1)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(2)
));
- assert_ok!(TemplateModule::add_to_white_list(origin1, 1, account(3)));
+ assert_ok!(TemplateModule::add_to_allow_list(origin1, 1, account(3)));
assert_ok!(TemplateModule::transfer_from(
origin2,
@@ -992,7 +992,7 @@
let collection_id = create_test_collection(&CollectionMode::NFT, 1);
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1,
collection_id,
account(2)
@@ -1013,7 +1013,7 @@
collection_id,
account(2)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin2,
collection_id,
account(3)
@@ -1029,7 +1029,7 @@
let origin2 = Origin::signed(2);
assert_noop!(
- TemplateModule::add_to_white_list(origin2, collection_id, account(3)),
+ TemplateModule::add_to_allow_list(origin2, collection_id, account(3)),
Error::<Test>::NoPermission
);
});
@@ -1041,7 +1041,7 @@
let origin1 = Origin::signed(1);
assert_noop!(
- TemplateModule::add_to_white_list(origin1, 1, account(2)),
+ TemplateModule::add_to_allow_list(origin1, 1, account(2)),
Error::<Test>::CollectionNotFound
);
});
@@ -1058,7 +1058,7 @@
collection_id
));
assert_noop!(
- TemplateModule::add_to_white_list(origin1, collection_id, account(2)),
+ TemplateModule::add_to_allow_list(origin1, collection_id, account(2)),
Error::<Test>::CollectionNotFound
);
});
@@ -1071,12 +1071,12 @@
let collection_id = create_test_collection(&CollectionMode::NFT, 1);
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(2)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1,
collection_id,
account(2)
@@ -1091,12 +1091,12 @@
let collection_id = create_test_collection(&CollectionMode::NFT, 1);
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(2)
));
- assert_ok!(TemplateModule::remove_from_white_list(
+ assert_ok!(TemplateModule::remove_from_allow_list(
origin1,
collection_id,
account(2)
@@ -1118,12 +1118,12 @@
account(2)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1,
collection_id,
account(3)
));
- assert_ok!(TemplateModule::remove_from_white_list(
+ assert_ok!(TemplateModule::remove_from_allow_list(
origin2,
collection_id,
account(3)
@@ -1139,13 +1139,13 @@
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1,
collection_id,
account(2)
));
assert_noop!(
- TemplateModule::remove_from_white_list(origin2, collection_id, account(2)),
+ TemplateModule::remove_from_allow_list(origin2, collection_id, account(2)),
Error::<Test>::NoPermission
);
assert!(TemplateModule::white_list(collection_id, 2));
@@ -1158,7 +1158,7 @@
let origin1 = Origin::signed(1);
assert_noop!(
- TemplateModule::remove_from_white_list(origin1, 1, account(2)),
+ TemplateModule::remove_from_allow_list(origin1, 1, account(2)),
Error::<Test>::CollectionNotFound
);
});
@@ -1171,14 +1171,14 @@
let origin1 = Origin::signed(1);
let origin2 = Origin::signed(2);
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(2)
));
assert_ok!(TemplateModule::destroy_collection(origin1, collection_id));
assert_noop!(
- TemplateModule::remove_from_white_list(origin2, collection_id, account(2)),
+ TemplateModule::remove_from_allow_list(origin2, collection_id, account(2)),
Error::<Test>::CollectionNotFound
);
assert!(!TemplateModule::white_list(collection_id, 2));
@@ -1192,17 +1192,17 @@
let collection_id = create_test_collection(&CollectionMode::NFT, 1);
let origin1 = Origin::signed(1);
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(2)
));
- assert_ok!(TemplateModule::remove_from_white_list(
+ assert_ok!(TemplateModule::remove_from_allow_list(
origin1.clone(),
collection_id,
account(2)
));
- assert_ok!(TemplateModule::remove_from_white_list(
+ assert_ok!(TemplateModule::remove_from_allow_list(
origin1,
collection_id,
account(2)
@@ -1225,9 +1225,9 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(2)
@@ -1252,14 +1252,14 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(1)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(2)
@@ -1275,7 +1275,7 @@
));
assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);
- assert_ok!(TemplateModule::remove_from_white_list(
+ assert_ok!(TemplateModule::remove_from_allow_list(
origin1.clone(),
1,
account(1)
@@ -1302,9 +1302,9 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
1,
account(1)
@@ -1330,14 +1330,14 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(1)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(2)
@@ -1353,7 +1353,7 @@
));
assert_eq!(TemplateModule::approved(1, (1, 1, 1)), 1);
- assert_ok!(TemplateModule::remove_from_white_list(
+ assert_ok!(TemplateModule::remove_from_allow_list(
origin1.clone(),
collection_id,
account(2)
@@ -1380,7 +1380,7 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_noop!(
TemplateModule::burn_item(origin1.clone(), 1, 1, 5),
@@ -1403,7 +1403,7 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
// do approve
@@ -1429,14 +1429,14 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(1)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(2)
@@ -1459,14 +1459,14 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(1)
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(2)
@@ -1503,7 +1503,7 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_ok!(TemplateModule::set_mint_permission(
origin1,
@@ -1528,7 +1528,7 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_ok!(TemplateModule::set_mint_permission(
origin1.clone(),
@@ -1563,14 +1563,14 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_ok!(TemplateModule::set_mint_permission(
origin1.clone(),
collection_id,
false
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1,
collection_id,
account(2)
@@ -1595,7 +1595,7 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_ok!(TemplateModule::set_mint_permission(
origin1,
@@ -1621,7 +1621,7 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_ok!(TemplateModule::set_mint_permission(
origin1,
@@ -1646,7 +1646,7 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_ok!(TemplateModule::set_mint_permission(
origin1.clone(),
@@ -1681,7 +1681,7 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_ok!(TemplateModule::set_mint_permission(
origin1,
@@ -1708,14 +1708,14 @@
assert_ok!(TemplateModule::set_public_access_mode(
origin1.clone(),
collection_id,
- AccessMode::WhiteList
+ AccessMode::AllowList
));
assert_ok!(TemplateModule::set_mint_permission(
origin1.clone(),
collection_id,
true
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1,
collection_id,
account(2)
@@ -2056,7 +2056,7 @@
collection_id,
true
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin1.clone(),
collection_id,
account(1)
@@ -2124,7 +2124,7 @@
collection_id,
true
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin2.clone(),
collection_id,
account(1)
@@ -2177,7 +2177,7 @@
collection_id,
true
));
- assert_ok!(TemplateModule::add_to_white_list(
+ assert_ok!(TemplateModule::add_to_allow_list(
origin2.clone(),
collection_id,
account(1)
pallets/nft/src/weights.rsdiffbeforeafterboth--- a/pallets/nft/src/weights.rs
+++ b/pallets/nft/src/weights.rs
@@ -33,8 +33,8 @@
pub trait WeightInfo {
fn create_collection() -> Weight;
fn destroy_collection() -> Weight;
- fn add_to_white_list() -> Weight;
- fn remove_from_white_list() -> Weight;
+ fn add_to_allow_list() -> Weight;
+ fn remove_from_allow_list() -> Weight;
fn set_public_access_mode() -> Weight;
fn set_mint_permission() -> Weight;
fn change_collection_owner() -> Weight;
@@ -75,14 +75,14 @@
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
- fn add_to_white_list() -> Weight {
+ fn add_to_allow_list() -> Weight {
(6_629_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
- fn remove_from_white_list() -> Weight {
+ fn remove_from_allow_list() -> Weight {
(6_596_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -205,14 +205,14 @@
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
- fn add_to_white_list() -> Weight {
+ fn add_to_allow_list() -> Weight {
(6_629_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Common CollectionById (r:1 w:0)
// Storage: Common Allowlist (r:0 w:1)
- fn remove_from_white_list() -> Weight {
+ fn remove_from_allow_list() -> Weight {
(6_596_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -169,7 +169,7 @@
<CommonError<T>>::NoPermission
);
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
collection.check_allowlist(sender)?;
}
@@ -227,7 +227,7 @@
<CommonError<T>>::NoPermission
);
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
collection.check_allowlist(from)?;
collection.check_allowlist(to)?;
}
@@ -445,7 +445,7 @@
token: TokenId,
spender: Option<&T::CrossAccountId>,
) -> DispatchResult {
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
collection.check_allowlist(&sender)?;
if let Some(spender) = spender {
collection.check_allowlist(&spender)?;
@@ -480,7 +480,7 @@
if spender == from {
return Self::transfer(collection, from, to, token);
}
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
// `from`, `to` checked in [`transfer`]
collection.check_allowlist(spender)?;
}
@@ -508,7 +508,7 @@
if spender == from {
return Self::burn(collection, from, token);
}
- if collection.access == AccessMode::WhiteList {
+ if collection.access == AccessMode::AllowList {
// `from` checked in [`burn`]
collection.check_allowlist(spender)?;
}
pallets/refungible/src/lib.rsdiffbeforeafterboth1#![cfg_attr(not(feature = "std"), no_std)]23use frame_support::{ensure, BoundedVec};4use nft_data_structs::{5 AccessMode, CUSTOM_DATA_LIMIT, Collection, CollectionId, CustomDataLimit,6 MAX_REFUNGIBLE_PIECES, TokenId,7};8use pallet_common::{9 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,10};11use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};12use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};13use core::ops::Deref;14use codec::{Encode, Decode};15use scale_info::TypeInfo;1617pub use pallet::*;18#[cfg(feature = "runtime-benchmarks")]19pub mod benchmarking;20pub mod common;21pub mod erc;22pub mod weights;23pub struct CreateItemData<T: Config> {24 pub const_data: BoundedVec<u8, CustomDataLimit>,25 pub variable_data: BoundedVec<u8, CustomDataLimit>,26 pub users: BTreeMap<T::CrossAccountId, u128>,27}28pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;2930#[derive(Encode, Decode, Default, TypeInfo)]31pub struct ItemData {32 pub const_data: Vec<u8>,33 pub variable_data: Vec<u8>,34}3536#[frame_support::pallet]37pub mod pallet {38 use super::*;39 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};40 use nft_data_structs::{CollectionId, TokenId};41 use super::weights::WeightInfo;4243 #[pallet::error]44 pub enum Error<T> {45 /// Not Refungible item data used to mint in Refungible collection.46 NotRefungibleDataUsedToMintFungibleCollectionToken,47 /// Maximum refungibility exceeded48 WrongRefungiblePieces,49 }5051 #[pallet::config]52 pub trait Config: frame_system::Config + pallet_common::Config {53 type WeightInfo: WeightInfo;54 }5556 #[pallet::pallet]57 #[pallet::generate_store(pub(super) trait Store)]58 pub struct Pallet<T>(_);5960 #[pallet::storage]61 pub(super) type TokensMinted<T: Config> =62 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;63 #[pallet::storage]64 pub(super) type TokensBurnt<T: Config> =65 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;6667 #[pallet::storage]68 pub(super) type TokenData<T: Config> = StorageNMap<69 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),70 Value = ItemData,71 QueryKind = ValueQuery,72 >;7374 #[pallet::storage]75 pub(super) type TotalSupply<T: Config> = StorageNMap<76 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),77 Value = u128,78 QueryKind = ValueQuery,79 >;8081 /// Used to enumerate tokens owned by account82 #[pallet::storage]83 pub(super) type Owned<T: Config> = StorageNMap<84 Key = (85 Key<Twox64Concat, CollectionId>,86 Key<Blake2_128Concat, T::AccountId>,87 Key<Twox64Concat, TokenId>,88 ),89 Value = bool,90 QueryKind = ValueQuery,91 >;9293 #[pallet::storage]94 pub(super) type AccountBalance<T: Config> = StorageNMap<95 Key = (96 Key<Twox64Concat, CollectionId>,97 // Owner98 Key<Blake2_128Concat, T::AccountId>,99 ),100 Value = u32,101 QueryKind = ValueQuery,102 >;103104 #[pallet::storage]105 pub(super) type Balance<T: Config> = StorageNMap<106 Key = (107 Key<Twox64Concat, CollectionId>,108 Key<Twox64Concat, TokenId>,109 // Owner110 Key<Blake2_128Concat, T::AccountId>,111 ),112 Value = u128,113 QueryKind = ValueQuery,114 >;115116 #[pallet::storage]117 pub(super) type Allowance<T: Config> = StorageNMap<118 Key = (119 Key<Twox64Concat, CollectionId>,120 Key<Twox64Concat, TokenId>,121 // Owner122 Key<Blake2_128, T::AccountId>,123 // Spender124 Key<Blake2_128Concat, T::CrossAccountId>,125 ),126 Value = u128,127 QueryKind = ValueQuery,128 >;129}130131pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);132impl<T: Config> RefungibleHandle<T> {133 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {134 Self(inner)135 }136 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {137 self.0138 }139}140impl<T: Config> Deref for RefungibleHandle<T> {141 type Target = pallet_common::CollectionHandle<T>;142143 fn deref(&self) -> &Self::Target {144 &self.0145 }146}147148impl<T: Config> Pallet<T> {149 pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {150 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)151 }152 pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {153 <TotalSupply<T>>::contains_key((collection.id, token))154 }155}156157// unchecked calls skips any permission checks158impl<T: Config> Pallet<T> {159 pub fn init_collection(data: Collection<T>) -> Result<CollectionId, DispatchError> {160 PalletCommon::init_collection(data)161 }162 pub fn destroy_collection(163 collection: RefungibleHandle<T>,164 sender: &T::CrossAccountId,165 ) -> DispatchResult {166 let id = collection.id;167168 // =========169170 PalletCommon::destroy_collection(collection.0, sender)?;171172 <TokensMinted<T>>::remove(id);173 <TokensBurnt<T>>::remove(id);174 <TokenData<T>>::remove_prefix((id,), None);175 <TotalSupply<T>>::remove_prefix((id,), None);176 <Balance<T>>::remove_prefix((id,), None);177 <Allowance<T>>::remove_prefix((id,), None);178 Ok(())179 }180181 pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {182 let burnt = <TokensBurnt<T>>::get(collection.id)183 .checked_add(1)184 .ok_or(ArithmeticError::Overflow)?;185186 <TokensBurnt<T>>::insert(collection.id, burnt);187 <TokenData<T>>::remove((collection.id, token_id));188 <TotalSupply<T>>::remove((collection.id, token_id));189 <Balance<T>>::remove_prefix((collection.id, token_id), None);190 <Allowance<T>>::remove_prefix((collection.id, token_id), None);191 // TODO: ERC721 transfer event192 return Ok(());193 }194195 pub fn burn(196 collection: &RefungibleHandle<T>,197 owner: &T::CrossAccountId,198 token: TokenId,199 amount: u128,200 ) -> DispatchResult {201 let total_supply = <TotalSupply<T>>::get((collection.id, token))202 .checked_sub(amount)203 .ok_or(<CommonError<T>>::TokenValueTooLow)?;204205 // This was probally last owner of this token?206 if total_supply == 0 {207 // Ensure user actually owns this amount208 ensure!(209 <Balance<T>>::get((collection.id, token, owner.as_sub())) == amount,210 <CommonError<T>>::TokenValueTooLow211 );212 let account_balance = <AccountBalance<T>>::get((collection.id, owner.as_sub()))213 .checked_sub(1)214 // Should not occur215 .ok_or(ArithmeticError::Underflow)?;216217 // =========218219 <Owned<T>>::remove((collection.id, owner.as_sub(), token));220 <AccountBalance<T>>::insert((collection.id, owner.as_sub()), account_balance);221 Self::burn_token(collection, token)?;222 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(223 collection.id,224 token,225 owner.clone(),226 amount,227 ));228 return Ok(());229 }230231 let balance = <Balance<T>>::get((collection.id, token, owner.as_sub()))232 .checked_sub(amount)233 .ok_or(<CommonError<T>>::TokenValueTooLow)?;234 let account_balance = if balance == 0 {235 <AccountBalance<T>>::get((collection.id, owner.as_sub()))236 .checked_sub(1)237 // Should not occur238 .ok_or(ArithmeticError::Underflow)?239 } else {240 0241 };242243 // =========244245 if balance == 0 {246 <Owned<T>>::remove((collection.id, owner.as_sub(), token));247 <Balance<T>>::remove((collection.id, token, owner.as_sub()));248 <AccountBalance<T>>::insert((collection.id, owner.as_sub()), account_balance);249 } else {250 <Balance<T>>::insert((collection.id, token, owner.as_sub()), balance);251 }252 <TotalSupply<T>>::insert((collection.id, token), total_supply);253 // TODO: ERC20 transfer event254 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(255 collection.id,256 token,257 owner.clone(),258 amount,259 ));260 Ok(())261 }262263 pub fn transfer(264 collection: &RefungibleHandle<T>,265 from: &T::CrossAccountId,266 to: &T::CrossAccountId,267 token: TokenId,268 amount: u128,269 ) -> DispatchResult {270 ensure!(271 collection.transfers_enabled,272 <CommonError<T>>::TransferNotAllowed273 );274275 if collection.access == AccessMode::WhiteList {276 collection.check_allowlist(from)?;277 collection.check_allowlist(to)?;278 }279 <PalletCommon<T>>::ensure_correct_receiver(to)?;280281 let balance_from = <Balance<T>>::get((collection.id, token, from.as_sub()))282 .checked_sub(amount)283 .ok_or(<CommonError<T>>::TokenValueTooLow)?;284 let mut create_target = false;285 let from_to_differ = from != to;286 let balance_to = if from != to {287 let old_balance = <Balance<T>>::get((collection.id, token, to.as_sub()));288 if old_balance == 0 {289 create_target = true;290 }291 Some(292 old_balance293 .checked_add(amount)294 .ok_or(ArithmeticError::Overflow)?,295 )296 } else {297 None298 };299300 let account_balance_from = if balance_from == 0 {301 Some(302 <AccountBalance<T>>::get((collection.id, from.as_sub()))303 .checked_sub(1)304 // Should not occur305 .ok_or(ArithmeticError::Underflow)?,306 )307 } else {308 None309 };310 // Account data is created in token, AccountBalance should be increased311 // But only if from != to as we shouldn't check overflow in this case312 let account_balance_to = if create_target && from_to_differ {313 let account_balance_to = <AccountBalance<T>>::get((collection.id, to.as_sub()))314 .checked_add(1)315 .ok_or(ArithmeticError::Overflow)?;316 ensure!(317 account_balance_to < collection.limits.account_token_ownership_limit(),318 <CommonError<T>>::AccountTokenLimitExceeded,319 );320321 Some(account_balance_to)322 } else {323 None324 };325326 // =========327328 if let Some(balance_to) = balance_to {329 // from != to330 if balance_from == 0 {331 <Balance<T>>::remove((collection.id, token, from.as_sub()));332 } else {333 <Balance<T>>::insert((collection.id, token, from.as_sub()), balance_from);334 }335 <Balance<T>>::insert((collection.id, token, to.as_sub()), balance_to);336 if let Some(account_balance_from) = account_balance_from {337 <AccountBalance<T>>::insert((collection.id, from.as_sub()), account_balance_from);338 <Owned<T>>::remove((collection.id, from.as_sub(), token));339 }340 if let Some(account_balance_to) = account_balance_to {341 <AccountBalance<T>>::insert((collection.id, to.as_sub()), account_balance_to);342 <Owned<T>>::insert((collection.id, to.as_sub(), token), true);343 }344 }345346 // TODO: ERC20 transfer event347 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(348 collection.id,349 token,350 from.clone(),351 to.clone(),352 amount,353 ));354 Ok(())355 }356357 pub fn create_multiple_items(358 collection: &RefungibleHandle<T>,359 sender: &T::CrossAccountId,360 data: Vec<CreateItemData<T>>,361 ) -> DispatchResult {362 let unrestricted_minting = collection.is_owner_or_admin(sender)?;363 if !unrestricted_minting {364 ensure!(365 collection.mint_mode,366 <CommonError<T>>::PublicMintingNotAllowed367 );368 collection.check_allowlist(sender)?;369370 for item in data.iter() {371 for (user, _) in &item.users {372 collection.check_allowlist(&user)?;373 }374 }375 }376377 for item in data.iter() {378 for (owner, _) in item.users.iter() {379 <PalletCommon<T>>::ensure_correct_receiver(owner)?;380 }381 }382383 // Total pieces per tokens384 let totals = data385 .iter()386 .map(|data| {387 Ok(data388 .users389 .iter()390 .map(|u| u.1)391 .try_fold(0u128, |acc, v| acc.checked_add(*v))392 .ok_or(ArithmeticError::Overflow)?)393 })394 .collect::<Result<Vec<_>, DispatchError>>()?;395 for total in &totals {396 ensure!(397 *total <= MAX_REFUNGIBLE_PIECES,398 <Error<T>>::WrongRefungiblePieces399 );400 }401402 let first_token_id = <TokensMinted<T>>::get(collection.id);403 let tokens_minted = first_token_id404 .checked_add(data.len() as u32)405 .ok_or(ArithmeticError::Overflow)?;406 ensure!(407 tokens_minted < collection.limits.token_limit,408 <CommonError<T>>::CollectionTokenLimitExceeded409 );410411 let mut balances = BTreeMap::new();412 for data in &data {413 for (owner, _) in &data.users {414 let balance = balances415 .entry(owner.as_sub())416 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner.as_sub())));417 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;418419 ensure!(420 *balance <= collection.limits.account_token_ownership_limit(),421 <CommonError<T>>::AccountTokenLimitExceeded,422 );423 }424 }425426 // =========427428 <TokensMinted<T>>::insert(collection.id, tokens_minted);429 for (account, balance) in balances {430 <AccountBalance<T>>::insert((collection.id, account), balance);431 }432 for (i, token) in data.into_iter().enumerate() {433 let token_id = first_token_id + i as u32 + 1;434 <TotalSupply<T>>::insert((collection.id, token_id), totals[i]);435436 <TokenData<T>>::insert(437 (collection.id, token_id),438 ItemData {439 const_data: token.const_data.into(),440 variable_data: token.variable_data.into(),441 },442 );443 for (user, amount) in token.users.into_iter() {444 if amount == 0 {445 continue;446 }447 <Balance<T>>::insert((collection.id, token_id, user.as_sub()), amount);448 <Owned<T>>::insert((collection.id, user.as_sub(), TokenId(token_id)), true);449 // TODO: ERC20 transfer event450 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(451 collection.id,452 TokenId(token_id),453 user,454 amount,455 ));456 }457 }458 Ok(())459 }460461 pub fn set_allowance_unchecked(462 collection: &RefungibleHandle<T>,463 sender: &T::CrossAccountId,464 spender: &T::CrossAccountId,465 token: TokenId,466 amount: u128,467 ) {468 <Allowance<T>>::insert((collection.id, token, sender.as_sub(), spender), amount);469 // TODO: ERC20 approval event470 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(471 collection.id,472 token,473 sender.clone(),474 spender.clone(),475 amount,476 ))477 }478479 pub fn set_allowance(480 collection: &RefungibleHandle<T>,481 sender: &T::CrossAccountId,482 spender: &T::CrossAccountId,483 token: TokenId,484 amount: u128,485 ) -> DispatchResult {486 if collection.access == AccessMode::WhiteList {487 collection.check_allowlist(&sender)?;488 collection.check_allowlist(&spender)?;489 }490491 <PalletCommon<T>>::ensure_correct_receiver(spender)?;492493 if <Balance<T>>::get((collection.id, token, sender.as_sub())) < amount {494 ensure!(495 collection.ignores_owned_amount(sender)?,496 <CommonError<T>>::CantApproveMoreThanOwned497 );498 }499500 // =========501502 Self::set_allowance_unchecked(collection, sender, spender, token, amount);503 Ok(())504 }505506 pub fn transfer_from(507 collection: &RefungibleHandle<T>,508 spender: &T::CrossAccountId,509 from: &T::CrossAccountId,510 to: &T::CrossAccountId,511 token: TokenId,512 amount: u128,513 ) -> DispatchResult {514 if spender == from {515 return Self::transfer(collection, from, to, token, amount);516 }517 if collection.access == AccessMode::WhiteList {518 // `from`, `to` checked in [`transfer`]519 collection.check_allowlist(spender)?;520 }521522 let allowance = <Allowance<T>>::get((collection.id, token, from.as_sub(), &spender))523 .checked_sub(amount);524 if allowance.is_none() {525 ensure!(526 collection.ignores_allowance(spender)?,527 <CommonError<T>>::TokenValueNotEnough528 );529 }530531 // =========532533 Self::transfer(collection, from, to, token, amount)?;534 if let Some(allowance) = allowance {535 Self::set_allowance_unchecked(collection, from, spender, token, allowance);536 }537 Ok(())538 }539540 pub fn burn_from(541 collection: &RefungibleHandle<T>,542 spender: &T::CrossAccountId,543 from: &T::CrossAccountId,544 token: TokenId,545 amount: u128,546 ) -> DispatchResult {547 if spender == from {548 return Self::burn(collection, from, token, amount);549 }550 if collection.access == AccessMode::WhiteList {551 // `from` checked in [`burn`]552 collection.check_allowlist(spender)?;553 }554555 let allowance = <Allowance<T>>::get((collection.id, token, from.as_sub(), &spender))556 .checked_sub(amount);557 if allowance.is_none() {558 ensure!(559 collection.ignores_allowance(spender)?,560 <CommonError<T>>::TokenValueNotEnough561 );562 }563564 // =========565566 Self::burn(collection, from, token, amount)?;567 if let Some(allowance) = allowance {568 Self::set_allowance_unchecked(collection, from, spender, token, allowance);569 }570 Ok(())571 }572573 pub fn set_variable_metadata(574 collection: &RefungibleHandle<T>,575 sender: &T::CrossAccountId,576 token: TokenId,577 data: Vec<u8>,578 ) -> DispatchResult {579 ensure!(580 data.len() as u32 <= CUSTOM_DATA_LIMIT,581 <CommonError<T>>::TokenVariableDataLimitExceeded582 );583 collection.check_can_update_meta(584 sender,585 &T::CrossAccountId::from_sub(collection.owner.clone()),586 )?;587588 collection.consume_sstore()?;589 let token_data = <TokenData<T>>::get((collection.id, token));590591 // =========592593 <TokenData<T>>::insert(594 (collection.id, token),595 ItemData {596 variable_data: data,597 ..token_data598 },599 );600 Ok(())601 }602603 /// Delegated to `create_multiple_items`604 pub fn create_item(605 collection: &RefungibleHandle<T>,606 sender: &T::CrossAccountId,607 data: CreateItemData<T>,608 ) -> DispatchResult {609 Self::create_multiple_items(collection, sender, vec![data])610 }611}1#![cfg_attr(not(feature = "std"), no_std)]23use frame_support::{ensure, BoundedVec};4use nft_data_structs::{5 AccessMode, CUSTOM_DATA_LIMIT, Collection, CollectionId, CustomDataLimit,6 MAX_REFUNGIBLE_PIECES, TokenId,7};8use pallet_common::{9 Error as CommonError, Event as CommonEvent, Pallet as PalletCommon, account::CrossAccountId,10};11use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};12use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};13use core::ops::Deref;14use codec::{Encode, Decode};15use scale_info::TypeInfo;1617pub use pallet::*;18#[cfg(feature = "runtime-benchmarks")]19pub mod benchmarking;20pub mod common;21pub mod erc;22pub mod weights;23pub struct CreateItemData<T: Config> {24 pub const_data: BoundedVec<u8, CustomDataLimit>,25 pub variable_data: BoundedVec<u8, CustomDataLimit>,26 pub users: BTreeMap<T::CrossAccountId, u128>,27}28pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;2930#[derive(Encode, Decode, Default, TypeInfo)]31pub struct ItemData {32 pub const_data: Vec<u8>,33 pub variable_data: Vec<u8>,34}3536#[frame_support::pallet]37pub mod pallet {38 use super::*;39 use frame_support::{Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key};40 use nft_data_structs::{CollectionId, TokenId};41 use super::weights::WeightInfo;4243 #[pallet::error]44 pub enum Error<T> {45 /// Not Refungible item data used to mint in Refungible collection.46 NotRefungibleDataUsedToMintFungibleCollectionToken,47 /// Maximum refungibility exceeded48 WrongRefungiblePieces,49 }5051 #[pallet::config]52 pub trait Config: frame_system::Config + pallet_common::Config {53 type WeightInfo: WeightInfo;54 }5556 #[pallet::pallet]57 #[pallet::generate_store(pub(super) trait Store)]58 pub struct Pallet<T>(_);5960 #[pallet::storage]61 pub(super) type TokensMinted<T: Config> =62 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;63 #[pallet::storage]64 pub(super) type TokensBurnt<T: Config> =65 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;6667 #[pallet::storage]68 pub(super) type TokenData<T: Config> = StorageNMap<69 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),70 Value = ItemData,71 QueryKind = ValueQuery,72 >;7374 #[pallet::storage]75 pub(super) type TotalSupply<T: Config> = StorageNMap<76 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),77 Value = u128,78 QueryKind = ValueQuery,79 >;8081 /// Used to enumerate tokens owned by account82 #[pallet::storage]83 pub(super) type Owned<T: Config> = StorageNMap<84 Key = (85 Key<Twox64Concat, CollectionId>,86 Key<Blake2_128Concat, T::AccountId>,87 Key<Twox64Concat, TokenId>,88 ),89 Value = bool,90 QueryKind = ValueQuery,91 >;9293 #[pallet::storage]94 pub(super) type AccountBalance<T: Config> = StorageNMap<95 Key = (96 Key<Twox64Concat, CollectionId>,97 // Owner98 Key<Blake2_128Concat, T::AccountId>,99 ),100 Value = u32,101 QueryKind = ValueQuery,102 >;103104 #[pallet::storage]105 pub(super) type Balance<T: Config> = StorageNMap<106 Key = (107 Key<Twox64Concat, CollectionId>,108 Key<Twox64Concat, TokenId>,109 // Owner110 Key<Blake2_128Concat, T::AccountId>,111 ),112 Value = u128,113 QueryKind = ValueQuery,114 >;115116 #[pallet::storage]117 pub(super) type Allowance<T: Config> = StorageNMap<118 Key = (119 Key<Twox64Concat, CollectionId>,120 Key<Twox64Concat, TokenId>,121 // Owner122 Key<Blake2_128, T::AccountId>,123 // Spender124 Key<Blake2_128Concat, T::CrossAccountId>,125 ),126 Value = u128,127 QueryKind = ValueQuery,128 >;129}130131pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);132impl<T: Config> RefungibleHandle<T> {133 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {134 Self(inner)135 }136 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {137 self.0138 }139}140impl<T: Config> Deref for RefungibleHandle<T> {141 type Target = pallet_common::CollectionHandle<T>;142143 fn deref(&self) -> &Self::Target {144 &self.0145 }146}147148impl<T: Config> Pallet<T> {149 pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {150 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)151 }152 pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {153 <TotalSupply<T>>::contains_key((collection.id, token))154 }155}156157// unchecked calls skips any permission checks158impl<T: Config> Pallet<T> {159 pub fn init_collection(data: Collection<T>) -> Result<CollectionId, DispatchError> {160 PalletCommon::init_collection(data)161 }162 pub fn destroy_collection(163 collection: RefungibleHandle<T>,164 sender: &T::CrossAccountId,165 ) -> DispatchResult {166 let id = collection.id;167168 // =========169170 PalletCommon::destroy_collection(collection.0, sender)?;171172 <TokensMinted<T>>::remove(id);173 <TokensBurnt<T>>::remove(id);174 <TokenData<T>>::remove_prefix((id,), None);175 <TotalSupply<T>>::remove_prefix((id,), None);176 <Balance<T>>::remove_prefix((id,), None);177 <Allowance<T>>::remove_prefix((id,), None);178 Ok(())179 }180181 pub fn burn_token(collection: &RefungibleHandle<T>, token_id: TokenId) -> DispatchResult {182 let burnt = <TokensBurnt<T>>::get(collection.id)183 .checked_add(1)184 .ok_or(ArithmeticError::Overflow)?;185186 <TokensBurnt<T>>::insert(collection.id, burnt);187 <TokenData<T>>::remove((collection.id, token_id));188 <TotalSupply<T>>::remove((collection.id, token_id));189 <Balance<T>>::remove_prefix((collection.id, token_id), None);190 <Allowance<T>>::remove_prefix((collection.id, token_id), None);191 // TODO: ERC721 transfer event192 return Ok(());193 }194195 pub fn burn(196 collection: &RefungibleHandle<T>,197 owner: &T::CrossAccountId,198 token: TokenId,199 amount: u128,200 ) -> DispatchResult {201 let total_supply = <TotalSupply<T>>::get((collection.id, token))202 .checked_sub(amount)203 .ok_or(<CommonError<T>>::TokenValueTooLow)?;204205 // This was probally last owner of this token?206 if total_supply == 0 {207 // Ensure user actually owns this amount208 ensure!(209 <Balance<T>>::get((collection.id, token, owner.as_sub())) == amount,210 <CommonError<T>>::TokenValueTooLow211 );212 let account_balance = <AccountBalance<T>>::get((collection.id, owner.as_sub()))213 .checked_sub(1)214 // Should not occur215 .ok_or(ArithmeticError::Underflow)?;216217 // =========218219 <Owned<T>>::remove((collection.id, owner.as_sub(), token));220 <AccountBalance<T>>::insert((collection.id, owner.as_sub()), account_balance);221 Self::burn_token(collection, token)?;222 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(223 collection.id,224 token,225 owner.clone(),226 amount,227 ));228 return Ok(());229 }230231 let balance = <Balance<T>>::get((collection.id, token, owner.as_sub()))232 .checked_sub(amount)233 .ok_or(<CommonError<T>>::TokenValueTooLow)?;234 let account_balance = if balance == 0 {235 <AccountBalance<T>>::get((collection.id, owner.as_sub()))236 .checked_sub(1)237 // Should not occur238 .ok_or(ArithmeticError::Underflow)?239 } else {240 0241 };242243 // =========244245 if balance == 0 {246 <Owned<T>>::remove((collection.id, owner.as_sub(), token));247 <Balance<T>>::remove((collection.id, token, owner.as_sub()));248 <AccountBalance<T>>::insert((collection.id, owner.as_sub()), account_balance);249 } else {250 <Balance<T>>::insert((collection.id, token, owner.as_sub()), balance);251 }252 <TotalSupply<T>>::insert((collection.id, token), total_supply);253 // TODO: ERC20 transfer event254 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(255 collection.id,256 token,257 owner.clone(),258 amount,259 ));260 Ok(())261 }262263 pub fn transfer(264 collection: &RefungibleHandle<T>,265 from: &T::CrossAccountId,266 to: &T::CrossAccountId,267 token: TokenId,268 amount: u128,269 ) -> DispatchResult {270 ensure!(271 collection.transfers_enabled,272 <CommonError<T>>::TransferNotAllowed273 );274275 if collection.access == AccessMode::AllowList {276 collection.check_allowlist(from)?;277 collection.check_allowlist(to)?;278 }279 <PalletCommon<T>>::ensure_correct_receiver(to)?;280281 let balance_from = <Balance<T>>::get((collection.id, token, from.as_sub()))282 .checked_sub(amount)283 .ok_or(<CommonError<T>>::TokenValueTooLow)?;284 let mut create_target = false;285 let from_to_differ = from != to;286 let balance_to = if from != to {287 let old_balance = <Balance<T>>::get((collection.id, token, to.as_sub()));288 if old_balance == 0 {289 create_target = true;290 }291 Some(292 old_balance293 .checked_add(amount)294 .ok_or(ArithmeticError::Overflow)?,295 )296 } else {297 None298 };299300 let account_balance_from = if balance_from == 0 {301 Some(302 <AccountBalance<T>>::get((collection.id, from.as_sub()))303 .checked_sub(1)304 // Should not occur305 .ok_or(ArithmeticError::Underflow)?,306 )307 } else {308 None309 };310 // Account data is created in token, AccountBalance should be increased311 // But only if from != to as we shouldn't check overflow in this case312 let account_balance_to = if create_target && from_to_differ {313 let account_balance_to = <AccountBalance<T>>::get((collection.id, to.as_sub()))314 .checked_add(1)315 .ok_or(ArithmeticError::Overflow)?;316 ensure!(317 account_balance_to < collection.limits.account_token_ownership_limit(),318 <CommonError<T>>::AccountTokenLimitExceeded,319 );320321 Some(account_balance_to)322 } else {323 None324 };325326 // =========327328 if let Some(balance_to) = balance_to {329 // from != to330 if balance_from == 0 {331 <Balance<T>>::remove((collection.id, token, from.as_sub()));332 } else {333 <Balance<T>>::insert((collection.id, token, from.as_sub()), balance_from);334 }335 <Balance<T>>::insert((collection.id, token, to.as_sub()), balance_to);336 if let Some(account_balance_from) = account_balance_from {337 <AccountBalance<T>>::insert((collection.id, from.as_sub()), account_balance_from);338 <Owned<T>>::remove((collection.id, from.as_sub(), token));339 }340 if let Some(account_balance_to) = account_balance_to {341 <AccountBalance<T>>::insert((collection.id, to.as_sub()), account_balance_to);342 <Owned<T>>::insert((collection.id, to.as_sub(), token), true);343 }344 }345346 // TODO: ERC20 transfer event347 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(348 collection.id,349 token,350 from.clone(),351 to.clone(),352 amount,353 ));354 Ok(())355 }356357 pub fn create_multiple_items(358 collection: &RefungibleHandle<T>,359 sender: &T::CrossAccountId,360 data: Vec<CreateItemData<T>>,361 ) -> DispatchResult {362 let unrestricted_minting = collection.is_owner_or_admin(sender)?;363 if !unrestricted_minting {364 ensure!(365 collection.mint_mode,366 <CommonError<T>>::PublicMintingNotAllowed367 );368 collection.check_allowlist(sender)?;369370 for item in data.iter() {371 for (user, _) in &item.users {372 collection.check_allowlist(&user)?;373 }374 }375 }376377 for item in data.iter() {378 for (owner, _) in item.users.iter() {379 <PalletCommon<T>>::ensure_correct_receiver(owner)?;380 }381 }382383 // Total pieces per tokens384 let totals = data385 .iter()386 .map(|data| {387 Ok(data388 .users389 .iter()390 .map(|u| u.1)391 .try_fold(0u128, |acc, v| acc.checked_add(*v))392 .ok_or(ArithmeticError::Overflow)?)393 })394 .collect::<Result<Vec<_>, DispatchError>>()?;395 for total in &totals {396 ensure!(397 *total <= MAX_REFUNGIBLE_PIECES,398 <Error<T>>::WrongRefungiblePieces399 );400 }401402 let first_token_id = <TokensMinted<T>>::get(collection.id);403 let tokens_minted = first_token_id404 .checked_add(data.len() as u32)405 .ok_or(ArithmeticError::Overflow)?;406 ensure!(407 tokens_minted < collection.limits.token_limit,408 <CommonError<T>>::CollectionTokenLimitExceeded409 );410411 let mut balances = BTreeMap::new();412 for data in &data {413 for (owner, _) in &data.users {414 let balance = balances415 .entry(owner.as_sub())416 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner.as_sub())));417 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;418419 ensure!(420 *balance <= collection.limits.account_token_ownership_limit(),421 <CommonError<T>>::AccountTokenLimitExceeded,422 );423 }424 }425426 // =========427428 <TokensMinted<T>>::insert(collection.id, tokens_minted);429 for (account, balance) in balances {430 <AccountBalance<T>>::insert((collection.id, account), balance);431 }432 for (i, token) in data.into_iter().enumerate() {433 let token_id = first_token_id + i as u32 + 1;434 <TotalSupply<T>>::insert((collection.id, token_id), totals[i]);435436 <TokenData<T>>::insert(437 (collection.id, token_id),438 ItemData {439 const_data: token.const_data.into(),440 variable_data: token.variable_data.into(),441 },442 );443 for (user, amount) in token.users.into_iter() {444 if amount == 0 {445 continue;446 }447 <Balance<T>>::insert((collection.id, token_id, user.as_sub()), amount);448 <Owned<T>>::insert((collection.id, user.as_sub(), TokenId(token_id)), true);449 // TODO: ERC20 transfer event450 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(451 collection.id,452 TokenId(token_id),453 user,454 amount,455 ));456 }457 }458 Ok(())459 }460461 pub fn set_allowance_unchecked(462 collection: &RefungibleHandle<T>,463 sender: &T::CrossAccountId,464 spender: &T::CrossAccountId,465 token: TokenId,466 amount: u128,467 ) {468 <Allowance<T>>::insert((collection.id, token, sender.as_sub(), spender), amount);469 // TODO: ERC20 approval event470 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(471 collection.id,472 token,473 sender.clone(),474 spender.clone(),475 amount,476 ))477 }478479 pub fn set_allowance(480 collection: &RefungibleHandle<T>,481 sender: &T::CrossAccountId,482 spender: &T::CrossAccountId,483 token: TokenId,484 amount: u128,485 ) -> DispatchResult {486 if collection.access == AccessMode::AllowList {487 collection.check_allowlist(&sender)?;488 collection.check_allowlist(&spender)?;489 }490491 <PalletCommon<T>>::ensure_correct_receiver(spender)?;492493 if <Balance<T>>::get((collection.id, token, sender.as_sub())) < amount {494 ensure!(495 collection.ignores_owned_amount(sender)?,496 <CommonError<T>>::CantApproveMoreThanOwned497 );498 }499500 // =========501502 Self::set_allowance_unchecked(collection, sender, spender, token, amount);503 Ok(())504 }505506 pub fn transfer_from(507 collection: &RefungibleHandle<T>,508 spender: &T::CrossAccountId,509 from: &T::CrossAccountId,510 to: &T::CrossAccountId,511 token: TokenId,512 amount: u128,513 ) -> DispatchResult {514 if spender == from {515 return Self::transfer(collection, from, to, token, amount);516 }517 if collection.access == AccessMode::AllowList {518 // `from`, `to` checked in [`transfer`]519 collection.check_allowlist(spender)?;520 }521522 let allowance = <Allowance<T>>::get((collection.id, token, from.as_sub(), &spender))523 .checked_sub(amount);524 if allowance.is_none() {525 ensure!(526 collection.ignores_allowance(spender)?,527 <CommonError<T>>::TokenValueNotEnough528 );529 }530531 // =========532533 Self::transfer(collection, from, to, token, amount)?;534 if let Some(allowance) = allowance {535 Self::set_allowance_unchecked(collection, from, spender, token, allowance);536 }537 Ok(())538 }539540 pub fn burn_from(541 collection: &RefungibleHandle<T>,542 spender: &T::CrossAccountId,543 from: &T::CrossAccountId,544 token: TokenId,545 amount: u128,546 ) -> DispatchResult {547 if spender == from {548 return Self::burn(collection, from, token, amount);549 }550 if collection.access == AccessMode::AllowList {551 // `from` checked in [`burn`]552 collection.check_allowlist(spender)?;553 }554555 let allowance = <Allowance<T>>::get((collection.id, token, from.as_sub(), &spender))556 .checked_sub(amount);557 if allowance.is_none() {558 ensure!(559 collection.ignores_allowance(spender)?,560 <CommonError<T>>::TokenValueNotEnough561 );562 }563564 // =========565566 Self::burn(collection, from, token, amount)?;567 if let Some(allowance) = allowance {568 Self::set_allowance_unchecked(collection, from, spender, token, allowance);569 }570 Ok(())571 }572573 pub fn set_variable_metadata(574 collection: &RefungibleHandle<T>,575 sender: &T::CrossAccountId,576 token: TokenId,577 data: Vec<u8>,578 ) -> DispatchResult {579 ensure!(580 data.len() as u32 <= CUSTOM_DATA_LIMIT,581 <CommonError<T>>::TokenVariableDataLimitExceeded582 );583 collection.check_can_update_meta(584 sender,585 &T::CrossAccountId::from_sub(collection.owner.clone()),586 )?;587588 collection.consume_sstore()?;589 let token_data = <TokenData<T>>::get((collection.id, token));590591 // =========592593 <TokenData<T>>::insert(594 (collection.id, token),595 ItemData {596 variable_data: data,597 ..token_data598 },599 );600 Ok(())601 }602603 /// Delegated to `create_multiple_items`604 pub fn create_item(605 collection: &RefungibleHandle<T>,606 sender: &T::CrossAccountId,607 data: CreateItemData<T>,608 ) -> DispatchResult {609 Self::create_multiple_items(collection, sender, vec![data])610 }611}primitives/nft/src/lib.rsdiffbeforeafterboth--- a/primitives/nft/src/lib.rs
+++ b/primitives/nft/src/lib.rs
@@ -141,7 +141,7 @@
#[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))]
pub enum AccessMode {
Normal,
- WhiteList,
+ AllowList,
}
impl Default for AccessMode {
fn default() -> Self {
runtime/src/chain_extension.rsdiffbeforeafterboth--- a/runtime/src/chain_extension.rs
+++ b/runtime/src/chain_extension.rs
@@ -75,10 +75,10 @@
}
#[derive(Debug, PartialEq, Encode, Decode, MaxEncodedLen)]
-pub struct NFTExtToggleWhiteList<AccountId> {
+pub struct NFTExtToggleAllowList<AccountId> {
pub collection_id: u32,
pub address: AccountId,
- pub whitelisted: bool,
+ pub allowlisted: bool,
}
/// The chain Extension of NFT pallet
@@ -213,8 +213,8 @@
6 => {
// Toggle whitelist
let mut env = env.buf_in_buf_out();
- let input: NFTExtToggleWhiteList<AccountIdOf<C>> = env.read_as()?;
- env.charge_weight(NftWeightInfoOf::<C>::add_to_white_list())?;
+ let input: NFTExtToggleAllowList<AccountIdOf<C>> = env.read_as()?;
+ env.charge_weight(NftWeightInfoOf::<C>::add_to_allow_list())?;
let collection = pallet_nft::Module::<C>::get_collection(input.collection_id)?;
@@ -222,7 +222,7 @@
&C::CrossAccountId::from_sub(env.ext().address().clone()),
&collection,
&C::CrossAccountId::from_sub(input.address),
- input.whitelisted,
+ input.allowlisted,
)?;
collection.submit_logs()?;