difftreelog
feat(refungible-pallet) ERC 1633 implementation and `set_parent_nft` method
in: master
30 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -25,7 +25,8 @@
use pallet_evm_coder_substrate::dispatch_to_evm;
use sp_std::vec::Vec;
use up_data_structs::{
- Property, SponsoringRateLimit, OwnerRestrictedSet, AccessMode, CollectionPermissions,
+ AccessMode, CollectionMode, CollectionPermissions, OwnerRestrictedSet, Property,
+ SponsoringRateLimit,
};
use alloc::format;
@@ -408,6 +409,27 @@
save(self)
}
+
+ /// Check that account is the owner or admin of the collection
+ ///
+ /// @return "true" if account is the owner or admin
+ fn verify_owner_or_admin(&mut self, caller: caller) -> Result<bool> {
+ Ok(check_is_owner_or_admin(caller, self)
+ .map(|_| true)
+ .unwrap_or(false))
+ }
+
+ /// Returns collection type
+ ///
+ /// @return `Fungible` or `NFT` or `ReFungible`
+ fn unique_collection_type(&mut self) -> Result<string> {
+ let mode = match self.collection.mode {
+ CollectionMode::Fungible(_) => "Fungible",
+ CollectionMode::NFT => "NFT",
+ CollectionMode::ReFungible => "ReFungible",
+ };
+ Ok(mode.into())
+ }
}
fn check_is_owner_or_admin<T: Config>(
@@ -462,6 +484,11 @@
pub fn suffix() -> up_data_structs::PropertyKey {
property_key_from_bytes(b"suffix").expect(EXPECT_CONVERT_ERROR)
}
+
+ /// Key "parentNft".
+ pub fn parent_nft() -> up_data_structs::PropertyKey {
+ property_key_from_bytes(b"parentNft").expect(EXPECT_CONVERT_ERROR)
+ }
}
/// Values.
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -1112,6 +1112,26 @@
sender: &T::CrossAccountId,
property_permission: PropertyKeyPermission,
) -> DispatchResult {
+ Self::set_scoped_property_permission(
+ collection,
+ sender,
+ PropertyScope::None,
+ property_permission,
+ )
+ }
+
+ /// Set collection property permission with scope.
+ ///
+ /// * `collection` - Collection handler.
+ /// * `sender` - The owner or administrator of the collection.
+ /// * `scope` - Property scope.
+ /// * `property_permission` - Property permission.
+ pub fn set_scoped_property_permission(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ scope: PropertyScope,
+ property_permission: PropertyKeyPermission,
+ ) -> DispatchResult {
collection.check_is_owner_or_admin(sender)?;
let all_permissions = CollectionPropertyPermissions::<T>::get(collection.id);
@@ -1125,7 +1145,11 @@
CollectionPropertyPermissions::<T>::try_mutate(collection.id, |permissions| {
let property_permission = property_permission.clone();
- permissions.try_set(property_permission.key, property_permission.permission)
+ permissions.try_scoped_set(
+ scope,
+ property_permission.key,
+ property_permission.permission,
+ )
})
.map_err(<Error<T>>::from)?;
@@ -1148,8 +1172,29 @@
sender: &T::CrossAccountId,
property_permissions: Vec<PropertyKeyPermission>,
) -> DispatchResult {
+ Self::set_scoped_token_property_permissions(
+ collection,
+ sender,
+ PropertyScope::None,
+ property_permissions,
+ )
+ }
+
+ /// Set token property permission with scope.
+ ///
+ /// * `collection` - Collection handler.
+ /// * `sender` - The owner or administrator of the collection.
+ /// * `scope` - Property scope.
+ /// * `property_permissions` - Property permissions.
+ #[transactional]
+ pub fn set_scoped_token_property_permissions(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ scope: PropertyScope,
+ property_permissions: Vec<PropertyKeyPermission>,
+ ) -> DispatchResult {
for prop_pemission in property_permissions {
- Self::set_property_permission(collection, sender, prop_pemission)?;
+ Self::set_scoped_property_permission(collection, sender, scope, prop_pemission)?;
}
Ok(())
@@ -1429,6 +1474,9 @@
.saturating_mul(max_selfs.max(1) as u64)
.saturating_add(Self::burn_recursively_breadth_raw(max_breadth))
}
+
+ /// The price of retrieving token owner
+ fn token_owner() -> Weight;
}
/// Weight info extension trait for refungible pallet.
@@ -1567,7 +1615,7 @@
///
/// * `sender` - Must be either the owner of the token or its admin.
/// * `token_id` - The token for which the properties are being set.
- /// * `properties` - Properties to be set.
+ /// * `property_permissions` - Property permissions to be set.
/// * `budget` - Budget for setting properties.
fn set_token_property_permissions(
&self,
pallets/fungible/src/common.rsdiffbeforeafterboth--- a/pallets/fungible/src/common.rs
+++ b/pallets/fungible/src/common.rs
@@ -103,6 +103,10 @@
// Fungible tokens can't have children
0
}
+
+ fn token_owner() -> Weight {
+ 0
+ }
}
/// Implementation of `CommonCollectionOperations` for `FungibleHandle`. It wraps FungibleHandle Pallete
pallets/fungible/src/stubs/UniqueFungible.soldiffbeforeafterboth--- a/pallets/fungible/src/stubs/UniqueFungible.sol
+++ b/pallets/fungible/src/stubs/UniqueFungible.sol
@@ -43,7 +43,91 @@
}
}
-// Selector: 7d9262e6
+// Selector: 942e8b22
+contract ERC20 is Dummy, ERC165, ERC20Events {
+ // Selector: name() 06fdde03
+ function name() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
+ // Selector: symbol() 95d89b41
+ function symbol() public view returns (string memory) {
+ require(false, stub_error);
+ dummy;
+ return "";
+ }
+
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+
+ // Selector: decimals() 313ce567
+ function decimals() public view returns (uint8) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+
+ // Selector: balanceOf(address) 70a08231
+ function balanceOf(address owner) public view returns (uint256) {
+ require(false, stub_error);
+ owner;
+ dummy;
+ return 0;
+ }
+
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ to;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: transferFrom(address,address,uint256) 23b872dd
+ function transferFrom(
+ address from,
+ address to,
+ uint256 amount
+ ) public returns (bool) {
+ require(false, stub_error);
+ from;
+ to;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: approve(address,uint256) 095ea7b3
+ function approve(address spender, uint256 amount) public returns (bool) {
+ require(false, stub_error);
+ spender;
+ amount;
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: allowance(address,address) dd62ed3e
+ function allowance(address owner, address spender)
+ public
+ view
+ returns (uint256)
+ {
+ require(false, stub_error);
+ owner;
+ spender;
+ dummy;
+ return 0;
+ }
+}
+
+// Selector: aa7d570d
contract Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -267,90 +351,24 @@
require(false, stub_error);
mode;
dummy = 0;
- }
-}
-
-// Selector: 942e8b22
-contract ERC20 is Dummy, ERC165, ERC20Events {
- // Selector: name() 06fdde03
- function name() public view returns (string memory) {
- require(false, stub_error);
- dummy;
- return "";
}
- // Selector: symbol() 95d89b41
- function symbol() public view returns (string memory) {
- require(false, stub_error);
- dummy;
- return "";
- }
-
- // Selector: totalSupply() 18160ddd
- function totalSupply() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- // Selector: decimals() 313ce567
- function decimals() public view returns (uint8) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- // Selector: balanceOf(address) 70a08231
- function balanceOf(address owner) public view returns (uint256) {
- require(false, stub_error);
- owner;
- dummy;
- return 0;
- }
-
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 amount) public returns (bool) {
- require(false, stub_error);
- to;
- amount;
- dummy = 0;
- return false;
- }
-
- // Selector: transferFrom(address,address,uint256) 23b872dd
- function transferFrom(
- address from,
- address to,
- uint256 amount
- ) public returns (bool) {
+ // Check that account is the owner or admin of the collection
+ //
+ // @return "true" if account is the owner or admin
+ //
+ // Selector: verifyOwnerOrAdmin() 04a46053
+ function verifyOwnerOrAdmin() public returns (bool) {
require(false, stub_error);
- from;
- to;
- amount;
dummy = 0;
return false;
}
- // Selector: approve(address,uint256) 095ea7b3
- function approve(address spender, uint256 amount) public returns (bool) {
+ // Selector: uniqueCollectionType() d34b55b8
+ function uniqueCollectionType() public returns (string memory) {
require(false, stub_error);
- spender;
- amount;
dummy = 0;
- return false;
- }
-
- // Selector: allowance(address,address) dd62ed3e
- function allowance(address owner, address spender)
- public
- view
- returns (uint256)
- {
- require(false, stub_error);
- owner;
- spender;
- dummy;
- return 0;
+ return "";
}
}
pallets/nonfungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/benchmarking.rs
+++ b/pallets/nonfungible/src/benchmarking.rs
@@ -17,11 +17,14 @@
use super::*;
use crate::{Pallet, Config, NonfungibleHandle};
-use sp_std::prelude::*;
-use pallet_common::benchmarking::{create_collection_raw, property_key, property_value};
use frame_benchmarking::{benchmarks, account};
+use pallet_common::{
+ bench_init,
+ benchmarking::{create_collection_raw, property_key, property_value},
+ CommonCollectionOperations,
+};
+use sp_std::prelude::*;
use up_data_structs::{CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, budget::Unlimited};
-use pallet_common::bench_init;
const SEED: u32 = 1;
@@ -208,4 +211,13 @@
<Pallet<T>>::set_token_properties(&collection, &owner, item, props.into_iter(), false, &Unlimited)?;
let to_delete = (0..b).map(|k| property_key(k as usize)).collect::<Vec<_>>();
}: {<Pallet<T>>::delete_token_properties(&collection, &owner, item, to_delete.into_iter(), &Unlimited)?}
+
+ token_owner {
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ owner: cross_from_sub;
+ };
+ let item = create_max_item(&collection, &owner, owner.clone())?;
+
+ }: {collection.token_owner(item)}
}
pallets/nonfungible/src/common.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/common.rs
+++ b/pallets/nonfungible/src/common.rs
@@ -118,6 +118,10 @@
<SelfWeightOf<T>>::burn_recursively_breadth_plus_self_plus_self_per_each_raw(amount)
.saturating_sub(Self::burn_recursively_self_raw().saturating_mul(amount as u64 + 1))
}
+
+ fn token_owner() -> Weight {
+ 0 //<SelfWeightOf<T>>::token_owner()
+ }
}
fn map_create_data<T: Config>(
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -784,6 +784,23 @@
<PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)
}
+ /// Set property permissions for the token with scope.
+ ///
+ /// Sender should be the owner or admin of token's collection.
+ pub fn set_scoped_token_property_permissions(
+ collection: &CollectionHandle<T>,
+ sender: &T::CrossAccountId,
+ scope: PropertyScope,
+ property_permissions: Vec<PropertyKeyPermission>,
+ ) -> DispatchResult {
+ <PalletCommon<T>>::set_scoped_token_property_permissions(
+ collection,
+ sender,
+ scope,
+ property_permissions,
+ )
+ }
+
/// Set property permissions for the collection.
///
/// Sender should be the owner or admin of the collection.
pallets/nonfungible/src/stubs/UniqueNFT.soldiffbeforeafterboth--- a/pallets/nonfungible/src/stubs/UniqueNFT.sol
+++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol
@@ -415,7 +415,7 @@
}
}
-// Selector: 7d9262e6
+// Selector: aa7d570d
contract Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -640,6 +640,24 @@
mode;
dummy = 0;
}
+
+ // Check that account is the owner or admin of the collection
+ //
+ // @return "true" if account is the owner or admin
+ //
+ // Selector: verifyOwnerOrAdmin() 04a46053
+ function verifyOwnerOrAdmin() public returns (bool) {
+ require(false, stub_error);
+ dummy = 0;
+ return false;
+ }
+
+ // Selector: uniqueCollectionType() d34b55b8
+ function uniqueCollectionType() public returns (string memory) {
+ require(false, stub_error);
+ dummy = 0;
+ return "";
+ }
}
// Selector: d74d154f
pallets/nonfungible/src/weights.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/weights.rs
+++ b/pallets/nonfungible/src/weights.rs
@@ -3,7 +3,7 @@
//! Autogenerated weights for pallet_nonfungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-07-20, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-08-01, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
@@ -46,6 +46,7 @@
fn set_token_property_permissions(b: u32, ) -> Weight;
fn set_token_properties(b: u32, ) -> Weight;
fn delete_token_properties(b: u32, ) -> Weight;
+ fn token_owner() -> Weight;
}
/// Weights for pallet_nonfungible using the Substrate node and recommended hardware.
@@ -56,7 +57,7 @@
// Storage: Nonfungible TokenData (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (20_328_000 as Weight)
+ (20_909_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -65,9 +66,9 @@
// Storage: Nonfungible TokenData (r:0 w:4)
// Storage: Nonfungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (10_134_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((4_927_000 as Weight).saturating_mul(b as Weight))
+ (12_601_000 as Weight)
+ // Standard Error: 1_000
+ .saturating_add((4_920_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
@@ -77,9 +78,9 @@
// Storage: Nonfungible TokenData (r:0 w:4)
// Storage: Nonfungible Owned (r:0 w:4)
fn create_multiple_items_ex(b: u32, ) -> Weight {
- (5_710_000 as Weight)
- // Standard Error: 4_000
- .saturating_add((7_578_000 as Weight).saturating_mul(b as Weight))
+ (0 as Weight)
+ // Standard Error: 3_000
+ .saturating_add((7_734_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -93,7 +94,7 @@
// Storage: Nonfungible Owned (r:0 w:1)
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_item() -> Weight {
- (28_433_000 as Weight)
+ (29_746_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -105,7 +106,7 @@
// Storage: Nonfungible Owned (r:0 w:1)
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_recursively_self_raw() -> Weight {
- (34_435_000 as Weight)
+ (36_077_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -119,8 +120,8 @@
// Storage: Common CollectionById (r:1 w:0)
fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_539_000
- .saturating_add((304_456_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_605_000
+ .saturating_add((312_391_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(7 as Weight))
.saturating_add(T::DbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
@@ -131,14 +132,14 @@
// Storage: Nonfungible Allowance (r:1 w:0)
// Storage: Nonfungible Owned (r:0 w:2)
fn transfer() -> Weight {
- (24_376_000 as Weight)
+ (25_248_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
// Storage: Nonfungible TokenData (r:1 w:0)
// Storage: Nonfungible Allowance (r:1 w:1)
fn approve() -> Weight {
- (15_890_000 as Weight)
+ (16_321_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -147,7 +148,7 @@
// Storage: Nonfungible AccountBalance (r:2 w:2)
// Storage: Nonfungible Owned (r:0 w:2)
fn transfer_from() -> Weight {
- (28_634_000 as Weight)
+ (29_325_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
@@ -159,15 +160,15 @@
// Storage: Nonfungible Owned (r:0 w:1)
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_from() -> Weight {
- (32_201_000 as Weight)
+ (33_323_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionPropertyPermissions (r:1 w:1)
fn set_token_property_permissions(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 57_000
- .saturating_add((15_232_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 62_000
+ .saturating_add((16_222_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -175,8 +176,8 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_648_000
- .saturating_add((288_654_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_750_000
+ .saturating_add((304_476_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -184,11 +185,16 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_632_000
- .saturating_add((289_190_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_638_000
+ .saturating_add((294_096_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
+ // Storage: Nonfungible TokenData (r:1 w:0)
+ fn token_owner() -> Weight {
+ (2_986_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(1 as Weight))
+ }
}
// For backwards compatibility and tests
@@ -198,7 +204,7 @@
// Storage: Nonfungible TokenData (r:0 w:1)
// Storage: Nonfungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (20_328_000 as Weight)
+ (20_909_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -207,9 +213,9 @@
// Storage: Nonfungible TokenData (r:0 w:4)
// Storage: Nonfungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (10_134_000 as Weight)
- // Standard Error: 3_000
- .saturating_add((4_927_000 as Weight).saturating_mul(b as Weight))
+ (12_601_000 as Weight)
+ // Standard Error: 1_000
+ .saturating_add((4_920_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((2 as Weight).saturating_mul(b as Weight)))
@@ -219,9 +225,9 @@
// Storage: Nonfungible TokenData (r:0 w:4)
// Storage: Nonfungible Owned (r:0 w:4)
fn create_multiple_items_ex(b: u32, ) -> Weight {
- (5_710_000 as Weight)
- // Standard Error: 4_000
- .saturating_add((7_578_000 as Weight).saturating_mul(b as Weight))
+ (0 as Weight)
+ // Standard Error: 3_000
+ .saturating_add((7_734_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -235,7 +241,7 @@
// Storage: Nonfungible Owned (r:0 w:1)
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_item() -> Weight {
- (28_433_000 as Weight)
+ (29_746_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -247,7 +253,7 @@
// Storage: Nonfungible Owned (r:0 w:1)
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_recursively_self_raw() -> Weight {
- (34_435_000 as Weight)
+ (36_077_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -261,8 +267,8 @@
// Storage: Common CollectionById (r:1 w:0)
fn burn_recursively_breadth_plus_self_plus_self_per_each_raw(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_539_000
- .saturating_add((304_456_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_605_000
+ .saturating_add((312_391_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(7 as Weight))
.saturating_add(RocksDbWeight::get().reads((4 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
@@ -273,14 +279,14 @@
// Storage: Nonfungible Allowance (r:1 w:0)
// Storage: Nonfungible Owned (r:0 w:2)
fn transfer() -> Weight {
- (24_376_000 as Weight)
+ (25_248_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
// Storage: Nonfungible TokenData (r:1 w:0)
// Storage: Nonfungible Allowance (r:1 w:1)
fn approve() -> Weight {
- (15_890_000 as Weight)
+ (16_321_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -289,7 +295,7 @@
// Storage: Nonfungible AccountBalance (r:2 w:2)
// Storage: Nonfungible Owned (r:0 w:2)
fn transfer_from() -> Weight {
- (28_634_000 as Weight)
+ (29_325_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
@@ -301,15 +307,15 @@
// Storage: Nonfungible Owned (r:0 w:1)
// Storage: Nonfungible TokenProperties (r:0 w:1)
fn burn_from() -> Weight {
- (32_201_000 as Weight)
+ (33_323_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Common CollectionPropertyPermissions (r:1 w:1)
fn set_token_property_permissions(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 57_000
- .saturating_add((15_232_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 62_000
+ .saturating_add((16_222_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -317,8 +323,8 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_648_000
- .saturating_add((288_654_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_750_000
+ .saturating_add((304_476_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -326,9 +332,14 @@
// Storage: Nonfungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_632_000
- .saturating_add((289_190_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_638_000
+ .saturating_add((294_096_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
+ // Storage: Nonfungible TokenData (r:1 w:0)
+ fn token_owner() -> Weight {
+ (2_986_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(1 as Weight))
+ }
}
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -17,16 +17,19 @@
use super::*;
use crate::{Pallet, Config, RefungibleHandle};
-use sp_std::prelude::*;
-use pallet_common::benchmarking::{create_collection_raw, property_key, property_value, create_data};
+use core::convert::TryInto;
+use core::iter::IntoIterator;
use frame_benchmarking::{benchmarks, account};
+use pallet_common::{
+ bench_init,
+ benchmarking::{create_collection_raw, property_key, property_value, create_data},
+};
+use sp_core::H160;
+use sp_std::prelude::*;
use up_data_structs::{
CollectionMode, MAX_ITEMS_PER_BATCH, MAX_PROPERTIES_PER_ITEM, CUSTOM_DATA_LIMIT,
budget::Unlimited,
};
-use pallet_common::bench_init;
-use core::convert::TryInto;
-use core::iter::IntoIterator;
const SEED: u32 = 1;
@@ -44,6 +47,7 @@
properties: Default::default(),
}
}
+
fn create_max_item<T: Config>(
collection: &RefungibleHandle<T>,
sender: &T::CrossAccountId,
@@ -59,11 +63,12 @@
) -> Result<RefungibleHandle<T>, DispatchError> {
create_collection_raw(
owner,
- CollectionMode::NFT,
+ CollectionMode::ReFungible,
<Pallet<T>>::init_collection,
RefungibleHandle::cast,
)
}
+
benchmarks! {
create_item {
bench_init!{
@@ -277,4 +282,21 @@
};
let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;
}: {<Pallet<T>>::repartition(&collection, &owner, item, 200)?}
+
+ set_parent_nft_unchecked {
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ sender: cross_from_sub(owner); owner: cross_sub;
+ };
+ let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;
+
+ }: {<Pallet<T>>::set_parent_nft_unchecked(&collection, item, owner, T::CrossAccountId::from_eth(H160::default()))?}
+
+ token_owner {
+ bench_init!{
+ owner: sub; collection: collection(owner);
+ sender: cross_from_sub(owner); owner: cross_sub;
+ };
+ let item = create_max_item(&collection, &sender, [(owner.clone(), 100)])?;
+ }: {<Pallet<T>>::token_owner(collection.id, item)}
}
pallets/refungible/src/common.rsdiffbeforeafterboth--- a/pallets/refungible/src/common.rs
+++ b/pallets/refungible/src/common.rs
@@ -148,6 +148,10 @@
// Refungible token can't have children
0
}
+
+ fn token_owner() -> Weight {
+ 0 //<SelfWeightOf<T>>::token_owner()
+ }
}
fn map_create_data<T: Config>(
pallets/refungible/src/erc.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc.rs
+++ b/pallets/refungible/src/erc.rs
@@ -41,8 +41,8 @@
use sp_core::H160;
use sp_std::{collections::btree_map::BTreeMap, vec::Vec, vec};
use up_data_structs::{
- CollectionId, CollectionPropertiesVec, Property, PropertyKey, PropertyKeyPermission,
- PropertyPermission, TokenId,
+ CollectionId, CollectionPropertiesVec, mapping::TokenAddressMapping, Property, PropertyKey,
+ PropertyKeyPermission, PropertyPermission, TokenId,
};
use crate::{
@@ -413,7 +413,7 @@
}
/// Returns amount of pieces of `token` that `owner` have
-fn balance<T: Config>(
+pub fn balance<T: Config>(
collection: &RefungibleHandle<T>,
token: TokenId,
owner: &T::CrossAccountId,
@@ -424,7 +424,7 @@
}
/// Throws if `owner_balance` is lower than total amount of `token` pieces
-fn ensure_single_owner<T: Config>(
+pub fn ensure_single_owner<T: Config>(
collection: &RefungibleHandle<T>,
token: TokenId,
owner_balance: u128,
@@ -788,6 +788,16 @@
.map_err(dispatch_to_evm::<T>)?;
Ok(true)
}
+
+ /// Returns EVM address for refungible token
+ ///
+ /// @param token ID of the token
+ fn token_contract_address(&self, token: uint256) -> Result<address> {
+ Ok(T::EvmTokenAddressMapping::token_to_address(
+ self.id,
+ token.try_into().map_err(|_| "token id overflow")?,
+ ))
+ }
}
#[solidity_interface(
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -20,29 +20,89 @@
//! Method implementations are mostly doing parameter conversion and calling Nonfungible Pallet methods.
extern crate alloc;
+
+#[cfg(not(feature = "std"))]
+use alloc::format;
+
use core::{
char::{REPLACEMENT_CHARACTER, decode_utf16},
convert::TryInto,
ops::Deref,
};
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};
+use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
use pallet_common::{
CommonWeightInfo,
- erc::{CommonEvmHandler, PrecompileResult},
+ erc::{CommonEvmHandler, PrecompileResult, static_property::key},
+ eth::map_eth_to_id,
};
use pallet_evm::{account::CrossAccountId, PrecompileHandle};
use pallet_evm_coder_substrate::{call, dispatch_to_evm, WithRecorder};
use pallet_structure::{SelfWeightOf as StructureWeight, weights::WeightInfo as _};
+use sp_core::H160;
use sp_std::vec::Vec;
-use up_data_structs::TokenId;
+use up_data_structs::{mapping::TokenAddressMapping, PropertyScope, TokenId};
use crate::{
Allowance, Balance, common::CommonWeights, Config, Pallet, RefungibleHandle, SelfWeightOf,
- weights::WeightInfo, TotalSupply,
+ TokenProperties, TotalSupply, weights::WeightInfo,
};
pub struct RefungibleTokenHandle<T: Config>(pub RefungibleHandle<T>, pub TokenId);
+#[solidity_interface(name = "ERC1633")]
+impl<T: Config> RefungibleTokenHandle<T> {
+ fn parent_token(&self) -> Result<address> {
+ self.consume_store_reads(2)?;
+ let props = <TokenProperties<T>>::get((self.id, self.1));
+ let key = key::parent_nft();
+
+ let key_scoped = PropertyScope::Eth
+ .apply(key)
+ .expect("property key shouldn't exceed length limit");
+ let value = props.get(&key_scoped).ok_or("key not found")?;
+ Ok(H160::from_slice(value.as_slice()))
+ }
+
+ fn parent_token_id(&self) -> Result<uint256> {
+ self.consume_store_reads(2)?;
+ let props = <TokenProperties<T>>::get((self.id, self.1));
+ let key = key::parent_nft();
+
+ let key_scoped = PropertyScope::Eth
+ .apply(key)
+ .expect("property key shouldn't exceed length limit");
+ let value = props.get(&key_scoped).ok_or("key not found")?;
+ let nft_token_address = H160::from_slice(value.as_slice());
+ let nft_token_account = T::CrossAccountId::from_eth(nft_token_address);
+ let (_, token_id) = T::CrossTokenAddressMapping::address_to_token(&nft_token_account)
+ .ok_or("parent NFT should contain NFT token address")?;
+
+ Ok(token_id.into())
+ }
+}
+
+#[solidity_interface(name = "ERC1633UniqueExtensions")]
+impl<T: Config> RefungibleTokenHandle<T> {
+ #[solidity(rename_selector = "setParentNFT")]
+ #[weight(<CommonWeights<T>>::token_owner() + <SelfWeightOf<T>>::set_parent_nft_unchecked())]
+ fn set_parent_nft(
+ &mut self,
+ caller: caller,
+ collection: address,
+ nft_id: uint256,
+ ) -> Result<bool> {
+ self.consume_store_reads(1)?;
+ let caller = T::CrossAccountId::from_eth(caller);
+ let nft_collection = map_eth_to_id(&collection).ok_or("collection not found")?;
+ let nft_token = nft_id.try_into()?;
+
+ <Pallet<T>>::set_parent_nft(&self.0, self.1, caller, nft_collection, nft_token)
+ .map_err(dispatch_to_evm::<T>)?;
+
+ Ok(true)
+ }
+}
+
#[derive(ToLog)]
pub enum ERC20Events {
/// @dev This event is emitted when the amount of tokens (value) is sent
@@ -239,7 +299,10 @@
}
}
-#[solidity_interface(name = "UniqueRefungibleToken", is(ERC20, ERC20UniqueExtensions,))]
+#[solidity_interface(
+ name = "UniqueRefungibleToken",
+ is(ERC20, ERC20UniqueExtensions, ERC1633, ERC1633UniqueExtensions)
+)]
impl<T: Config> RefungibleTokenHandle<T> where T::AccountId: From<[u8; 32]> {}
generate_stubgen!(gen_impl, UniqueRefungibleTokenCall<()>, true);
pallets/refungible/src/lib.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet18//!19//! The Refungible pallet provides functionality for handling refungible collections and tokens.20//!21//! - [`Config`]22//! - [`RefungibleHandle`]23//! - [`Pallet`]24//! - [`CommonWeights`](common::CommonWeights)25//!26//! ## Overview27//!28//! The Refungible pallet provides functions for:29//!30//! - RFT collection creation and removal31//! - Minting and burning of RFT tokens32//! - Partition and repartition of RFT tokens33//! - Retrieving number of pieces of RFT token34//! - Retrieving account balances35//! - Transfering RFT token pieces36//! - Burning RFT token pieces37//! - Setting and checking allowance for RFT tokens38//!39//! ### Terminology40//!41//! - **RFT token:** Non fungible token that was partitioned to pieces. If an account owns all42//! of the RFT token pieces than it owns the RFT token and can repartition it.43//!44//! - **RFT Collection:** A collection of RFT tokens. All RFT tokens are part of a collection.45//! Each collection has its own settings and set of permissions.46//!47//! - **RFT token piece:** A fungible part of an RFT token.48//!49//! - **Balance:** RFT token pieces owned by an account50//!51//! - **Allowance:** Maximum number of RFT token pieces that one account is allowed to52//! transfer from the balance of another account53//!54//! - **Burning:** The process of “deleting” a token from a collection or removing token pieces from55//! an account balance.56//!57//! ### Implementations58//!59//! The Refungible pallet provides implementations for the following traits. If these traits provide60//! the functionality that you need, then you can avoid coupling with the Refungible pallet.61//!62//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight63//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing64//! with collections65//! - [`RefungibleExtensions`](pallet_common::RefungibleExtensions): Functions specific for refungible66//! collection67//!68//! ## Interface69//!70//! ### Dispatchable Functions71//!72//! - `init_collection` - Create RFT collection. RFT collection can be configured to allow or deny access for73//! some accounts.74//! - `destroy_collection` - Destroy exising RFT collection. There should be no tokens in the collection.75//! - `burn` - Burn some amount of RFT token pieces owned by account. Burns the RFT token if no pieces left.76//! - `transfer` - Transfer some amount of RFT token pieces. Transfers should be enabled for RFT collection.77//! Nests the RFT token if RFT token pieces are sent to another token.78//! - `create_item` - Mint RFT token in collection. Sender should have permission to mint tokens.79//! - `set_allowance` - Set allowance for another account to transfer balance from sender's account.80//! - `repartition` - Repartition token to selected number of pieces. Sender should own all existing pieces.81//!82//! ## Assumptions83//!84//! * Total number of pieces for one token shouldn't exceed `up_data_structs::MAX_REFUNGIBLE_PIECES`.85//! * Total number of tokens of all types shouldn't be greater than `up_data_structs::MAX_TOKEN_PREFIX_LENGTH`.86//! * Sender should be in collection's allow list to perform operations on tokens.8788#![cfg_attr(not(feature = "std"), no_std)]8990use crate::erc_token::ERC20Events;91use crate::erc::ERC721Events;9293use codec::{Encode, Decode, MaxEncodedLen};94use core::ops::Deref;95use evm_coder::ToLog;96use frame_support::{97 BoundedVec, ensure, fail, storage::with_transaction, transactional, pallet_prelude::ConstU32,98};99use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};100use pallet_evm_coder_substrate::WithRecorder;101use pallet_common::{102 CommonCollectionOperations, Error as CommonError, Event as CommonEvent,103 eth::collection_id_to_address, Pallet as PalletCommon,104};105use pallet_structure::Pallet as PalletStructure;106use scale_info::TypeInfo;107use sp_core::H160;108use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};109use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};110use up_data_structs::{111 AccessMode, budget::Budget, CollectionId, CreateCollectionData, CustomDataLimit,112 mapping::TokenAddressMapping, MAX_REFUNGIBLE_PIECES, MAX_ITEMS_PER_BATCH, TokenId, Property,113 PropertyKey, PropertyKeyPermission, PropertyPermission, PropertyScope, PropertyValue,114 TrySetProperty, CollectionPropertiesVec,115};116use frame_support::BoundedBTreeMap;117use derivative::Derivative;118119pub use pallet::*;120#[cfg(feature = "runtime-benchmarks")]121pub mod benchmarking;122pub mod common;123pub mod erc;124pub mod erc_token;125pub mod weights;126127#[derive(Derivative, Clone)]128pub struct CreateItemData<CrossAccountId> {129 #[derivative(Debug(format_with = "bounded::map_debug"))]130 pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,131 #[derivative(Debug(format_with = "bounded::vec_debug"))]132 pub properties: CollectionPropertiesVec,133}134pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;135136/// Token data, stored independently from other data used to describe it137/// for the convenience of database access. Notably contains the token metadata.138#[struct_versioning::versioned(version = 2, upper)]139#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]140#[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]141pub struct ItemData {142 pub const_data: BoundedVec<u8, CustomDataLimit>,143144 #[version(..2)]145 pub variable_data: BoundedVec<u8, CustomDataLimit>,146}147148#[frame_support::pallet]149pub mod pallet {150 use super::*;151 use frame_support::{152 Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key,153 traits::StorageVersion,154 };155 use frame_system::pallet_prelude::*;156 use up_data_structs::{CollectionId, TokenId};157 use super::weights::WeightInfo;158159 #[pallet::error]160 pub enum Error<T> {161 /// Not Refungible item data used to mint in Refungible collection.162 NotRefungibleDataUsedToMintFungibleCollectionToken,163 /// Maximum refungibility exceeded.164 WrongRefungiblePieces,165 /// Refungible token can't be repartitioned by user who isn't owns all pieces.166 RepartitionWhileNotOwningAllPieces,167 /// Refungible token can't nest other tokens.168 RefungibleDisallowsNesting,169 /// Setting item properties is not allowed.170 SettingPropertiesNotAllowed,171 }172173 #[pallet::config]174 pub trait Config:175 frame_system::Config + pallet_common::Config + pallet_structure::Config176 {177 type WeightInfo: WeightInfo;178 }179180 const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);181182 #[pallet::pallet]183 #[pallet::storage_version(STORAGE_VERSION)]184 #[pallet::generate_store(pub(super) trait Store)]185 pub struct Pallet<T>(_);186187 /// Total amount of minted tokens in a collection.188 #[pallet::storage]189 pub type TokensMinted<T: Config> =190 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;191192 /// Amount of tokens burnt in a collection.193 #[pallet::storage]194 pub type TokensBurnt<T: Config> =195 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;196197 /// Token data, used to partially describe a token.198 // TODO: remove199 #[pallet::storage]200 #[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]201 pub type TokenData<T: Config> = StorageNMap<202 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),203 Value = ItemData,204 QueryKind = ValueQuery,205 >;206207 /// Amount of pieces a refungible token is split into.208 #[pallet::storage]209 #[pallet::getter(fn token_properties)]210 pub type TokenProperties<T: Config> = StorageNMap<211 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),212 Value = up_data_structs::Properties,213 QueryKind = ValueQuery,214 OnEmpty = up_data_structs::TokenProperties,215 >;216217 /// Total amount of pieces for token218 #[pallet::storage]219 pub type TotalSupply<T: Config> = StorageNMap<220 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),221 Value = u128,222 QueryKind = ValueQuery,223 >;224225 /// Used to enumerate tokens owned by account.226 #[pallet::storage]227 pub type Owned<T: Config> = StorageNMap<228 Key = (229 Key<Twox64Concat, CollectionId>,230 Key<Blake2_128Concat, T::CrossAccountId>,231 Key<Twox64Concat, TokenId>,232 ),233 Value = bool,234 QueryKind = ValueQuery,235 >;236237 /// Amount of tokens (not pieces) partially owned by an account within a collection.238 #[pallet::storage]239 pub type AccountBalance<T: Config> = StorageNMap<240 Key = (241 Key<Twox64Concat, CollectionId>,242 // Owner243 Key<Blake2_128Concat, T::CrossAccountId>,244 ),245 Value = u32,246 QueryKind = ValueQuery,247 >;248249 /// Amount of token pieces owned by account.250 #[pallet::storage]251 pub type Balance<T: Config> = StorageNMap<252 Key = (253 Key<Twox64Concat, CollectionId>,254 Key<Twox64Concat, TokenId>,255 // Owner256 Key<Blake2_128Concat, T::CrossAccountId>,257 ),258 Value = u128,259 QueryKind = ValueQuery,260 >;261262 /// Allowance set by a token owner for another user to perform one of certain transactions on a number of pieces of a token.263 #[pallet::storage]264 pub type Allowance<T: Config> = StorageNMap<265 Key = (266 Key<Twox64Concat, CollectionId>,267 Key<Twox64Concat, TokenId>,268 // Owner269 Key<Blake2_128, T::CrossAccountId>,270 // Spender271 Key<Blake2_128Concat, T::CrossAccountId>,272 ),273 Value = u128,274 QueryKind = ValueQuery,275 >;276277 #[pallet::hooks]278 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {279 fn on_runtime_upgrade() -> Weight {280 let storage_version = StorageVersion::get::<Pallet<T>>();281 if storage_version < StorageVersion::new(2) {282 <TokenData<T>>::remove_all(None);283 }284 StorageVersion::new(2).put::<Pallet<T>>();285286 0287 }288 }289}290291pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);292impl<T: Config> RefungibleHandle<T> {293 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {294 Self(inner)295 }296 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {297 self.0298 }299 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {300 &mut self.0301 }302}303304impl<T: Config> Deref for RefungibleHandle<T> {305 type Target = pallet_common::CollectionHandle<T>;306307 fn deref(&self) -> &Self::Target {308 &self.0309 }310}311312impl<T: Config> WithRecorder<T> for RefungibleHandle<T> {313 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {314 self.0.recorder()315 }316 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {317 self.0.into_recorder()318 }319}320321impl<T: Config> Pallet<T> {322 /// Get number of RFT tokens in collection323 pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {324 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)325 }326327 /// Check that RFT token exists328 ///329 /// - `token`: Token ID.330 pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {331 <TotalSupply<T>>::contains_key((collection.id, token))332 }333334 pub fn set_scoped_token_property(335 collection_id: CollectionId,336 token_id: TokenId,337 scope: PropertyScope,338 property: Property,339 ) -> DispatchResult {340 TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {341 properties.try_scoped_set(scope, property.key, property.value)342 })343 .map_err(<CommonError<T>>::from)?;344345 Ok(())346 }347348 pub fn set_scoped_token_properties(349 collection_id: CollectionId,350 token_id: TokenId,351 scope: PropertyScope,352 properties: impl Iterator<Item = Property>,353 ) -> DispatchResult {354 TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {355 stored_properties.try_scoped_set_from_iter(scope, properties)356 })357 .map_err(<CommonError<T>>::from)?;358359 Ok(())360 }361}362363// unchecked calls skips any permission checks364impl<T: Config> Pallet<T> {365 /// Create RFT collection366 ///367 /// `init_collection` will take non-refundable deposit for collection creation.368 ///369 /// - `data`: Contains settings for collection limits and permissions.370 pub fn init_collection(371 owner: T::CrossAccountId,372 data: CreateCollectionData<T::AccountId>,373 ) -> Result<CollectionId, DispatchError> {374 <PalletCommon<T>>::init_collection(owner, data, false)375 }376377 /// Destroy RFT collection378 ///379 /// `destroy_collection` will throw error if collection contains any tokens.380 /// Only owner can destroy collection.381 pub fn destroy_collection(382 collection: RefungibleHandle<T>,383 sender: &T::CrossAccountId,384 ) -> DispatchResult {385 let id = collection.id;386387 if Self::collection_has_tokens(id) {388 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());389 }390391 // =========392393 PalletCommon::destroy_collection(collection.0, sender)?;394395 <TokensMinted<T>>::remove(id);396 <TokensBurnt<T>>::remove(id);397 <TotalSupply<T>>::remove_prefix((id,), None);398 <Balance<T>>::remove_prefix((id,), None);399 <Allowance<T>>::remove_prefix((id,), None);400 <Owned<T>>::remove_prefix((id,), None);401 <AccountBalance<T>>::remove_prefix((id,), None);402 Ok(())403 }404405 fn collection_has_tokens(collection_id: CollectionId) -> bool {406 <TotalSupply<T>>::iter_prefix((collection_id,))407 .next()408 .is_some()409 }410411 pub fn burn_token_unchecked(412 collection: &RefungibleHandle<T>,413 owner: &T::CrossAccountId,414 token_id: TokenId,415 ) -> DispatchResult {416 let burnt = <TokensBurnt<T>>::get(collection.id)417 .checked_add(1)418 .ok_or(ArithmeticError::Overflow)?;419420 <TokensBurnt<T>>::insert(collection.id, burnt);421 <TokenProperties<T>>::remove((collection.id, token_id));422 <TotalSupply<T>>::remove((collection.id, token_id));423 <Balance<T>>::remove_prefix((collection.id, token_id), None);424 <Allowance<T>>::remove_prefix((collection.id, token_id), None);425426 <PalletEvm<T>>::deposit_log(427 ERC721Events::Transfer {428 from: *owner.as_eth(),429 to: H160::default(),430 token_id: token_id.into(),431 }432 .to_log(collection_id_to_address(collection.id)),433 );434 Ok(())435 }436437 /// Burn RFT token pieces438 ///439 /// `burn` will decrease total amount of token pieces and amount owned by sender.440 /// `burn` can be called even if there are multiple owners of the RFT token.441 /// If sender wouldn't have any pieces left after `burn` than she will stop being442 /// one of the owners of the token. If there is no account that owns any pieces of443 /// the token than token will be burned too.444 ///445 /// - `amount`: Amount of token pieces to burn.446 /// - `token`: Token who's pieces should be burned447 /// - `collection`: Collection that contains the token448 pub fn burn(449 collection: &RefungibleHandle<T>,450 owner: &T::CrossAccountId,451 token: TokenId,452 amount: u128,453 ) -> DispatchResult {454 let total_supply = <TotalSupply<T>>::get((collection.id, token))455 .checked_sub(amount)456 .ok_or(<CommonError<T>>::TokenValueTooLow)?;457458 // This was probally last owner of this token?459 if total_supply == 0 {460 // Ensure user actually owns this amount461 ensure!(462 <Balance<T>>::get((collection.id, token, owner)) == amount,463 <CommonError<T>>::TokenValueTooLow464 );465 let account_balance = <AccountBalance<T>>::get((collection.id, owner))466 .checked_sub(1)467 // Should not occur468 .ok_or(ArithmeticError::Underflow)?;469470 // =========471472 <Owned<T>>::remove((collection.id, owner, token));473 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);474 <AccountBalance<T>>::insert((collection.id, owner), account_balance);475 Self::burn_token_unchecked(collection, owner, token)?;476 <PalletEvm<T>>::deposit_log(477 ERC20Events::Transfer {478 from: *owner.as_eth(),479 to: H160::default(),480 value: amount.into(),481 }482 .to_log(collection_id_to_address(collection.id)),483 );484 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(485 collection.id,486 token,487 owner.clone(),488 amount,489 ));490 return Ok(());491 }492493 let balance = <Balance<T>>::get((collection.id, token, owner))494 .checked_sub(amount)495 .ok_or(<CommonError<T>>::TokenValueTooLow)?;496 let account_balance = if balance == 0 {497 <AccountBalance<T>>::get((collection.id, owner))498 .checked_sub(1)499 // Should not occur500 .ok_or(ArithmeticError::Underflow)?501 } else {502 0503 };504505 // =========506507 if balance == 0 {508 <Owned<T>>::remove((collection.id, owner, token));509 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);510 <Balance<T>>::remove((collection.id, token, owner));511 <AccountBalance<T>>::insert((collection.id, owner), account_balance);512513 if let Some(user) = Self::token_owner(collection.id, token) {514 <PalletEvm<T>>::deposit_log(515 ERC721Events::Transfer {516 from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,517 to: *user.as_eth(),518 token_id: token.into(),519 }520 .to_log(collection_id_to_address(collection.id)),521 );522 }523 } else {524 <Balance<T>>::insert((collection.id, token, owner), balance);525 }526 <TotalSupply<T>>::insert((collection.id, token), total_supply);527528 <PalletEvm<T>>::deposit_log(529 ERC20Events::Transfer {530 from: *owner.as_eth(),531 to: H160::default(),532 value: amount.into(),533 }534 .to_log(T::EvmTokenAddressMapping::token_to_address(535 collection.id,536 token,537 )),538 );539 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(540 collection.id,541 token,542 owner.clone(),543 amount,544 ));545 Ok(())546 }547548 #[transactional]549 fn modify_token_properties(550 collection: &RefungibleHandle<T>,551 sender: &T::CrossAccountId,552 token_id: TokenId,553 properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,554 is_token_create: bool,555 nesting_budget: &dyn Budget,556 ) -> DispatchResult {557 let is_collection_admin = || collection.is_owner_or_admin(sender);558 let is_token_owner = || -> Result<bool, DispatchError> {559 let balance = collection.balance(sender.clone(), token_id);560 let total_pieces: u128 =561 Self::total_pieces(collection.id, token_id).unwrap_or(u128::MAX);562 if balance != total_pieces {563 return Ok(false);564 }565566 let is_bundle_owner = <PalletStructure<T>>::check_indirectly_owned(567 sender.clone(),568 collection.id,569 token_id,570 None,571 nesting_budget,572 )?;573574 Ok(is_bundle_owner)575 };576577 for (key, value) in properties {578 let permission = <PalletCommon<T>>::property_permissions(collection.id)579 .get(&key)580 .cloned()581 .unwrap_or_else(PropertyPermission::none);582583 let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))584 .get(&key)585 .is_some();586587 match permission {588 PropertyPermission { mutable: false, .. } if is_property_exists => {589 return Err(<CommonError<T>>::NoPermission.into());590 }591592 PropertyPermission {593 collection_admin,594 token_owner,595 ..596 } => {597 //TODO: investigate threats during public minting.598 let is_token_create =599 is_token_create && (collection_admin || token_owner) && value.is_some();600 if !(is_token_create601 || (collection_admin && is_collection_admin())602 || (token_owner && is_token_owner()?))603 {604 fail!(<CommonError<T>>::NoPermission);605 }606 }607 }608609 match value {610 Some(value) => {611 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {612 properties.try_set(key.clone(), value)613 })614 .map_err(<CommonError<T>>::from)?;615616 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(617 collection.id,618 token_id,619 key,620 ));621 }622 None => {623 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {624 properties.remove(&key)625 })626 .map_err(<CommonError<T>>::from)?;627628 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(629 collection.id,630 token_id,631 key,632 ));633 }634 }635 }636637 Ok(())638 }639640 pub fn set_token_properties(641 collection: &RefungibleHandle<T>,642 sender: &T::CrossAccountId,643 token_id: TokenId,644 properties: impl Iterator<Item = Property>,645 is_token_create: bool,646 nesting_budget: &dyn Budget,647 ) -> DispatchResult {648 Self::modify_token_properties(649 collection,650 sender,651 token_id,652 properties.map(|p| (p.key, Some(p.value))),653 is_token_create,654 nesting_budget,655 )656 }657658 pub fn set_token_property(659 collection: &RefungibleHandle<T>,660 sender: &T::CrossAccountId,661 token_id: TokenId,662 property: Property,663 nesting_budget: &dyn Budget,664 ) -> DispatchResult {665 let is_token_create = false;666667 Self::set_token_properties(668 collection,669 sender,670 token_id,671 [property].into_iter(),672 is_token_create,673 nesting_budget,674 )675 }676677 pub fn delete_token_properties(678 collection: &RefungibleHandle<T>,679 sender: &T::CrossAccountId,680 token_id: TokenId,681 property_keys: impl Iterator<Item = PropertyKey>,682 nesting_budget: &dyn Budget,683 ) -> DispatchResult {684 let is_token_create = false;685686 Self::modify_token_properties(687 collection,688 sender,689 token_id,690 property_keys.into_iter().map(|key| (key, None)),691 is_token_create,692 nesting_budget,693 )694 }695696 pub fn delete_token_property(697 collection: &RefungibleHandle<T>,698 sender: &T::CrossAccountId,699 token_id: TokenId,700 property_key: PropertyKey,701 nesting_budget: &dyn Budget,702 ) -> DispatchResult {703 Self::delete_token_properties(704 collection,705 sender,706 token_id,707 [property_key].into_iter(),708 nesting_budget,709 )710 }711712 /// Transfer RFT token pieces from one account to another.713 ///714 /// If the sender is no longer owns any pieces after the `transfer` than she stops being an owner of the token.715 ///716 /// - `from`: Owner of token pieces to transfer.717 /// - `to`: Recepient of transfered token pieces.718 /// - `amount`: Amount of token pieces to transfer.719 /// - `token`: Token whos pieces should be transfered720 /// - `collection`: Collection that contains the token721 pub fn transfer(722 collection: &RefungibleHandle<T>,723 from: &T::CrossAccountId,724 to: &T::CrossAccountId,725 token: TokenId,726 amount: u128,727 nesting_budget: &dyn Budget,728 ) -> DispatchResult {729 ensure!(730 collection.limits.transfers_enabled(),731 <CommonError<T>>::TransferNotAllowed732 );733734 if collection.permissions.access() == AccessMode::AllowList {735 collection.check_allowlist(from)?;736 collection.check_allowlist(to)?;737 }738 <PalletCommon<T>>::ensure_correct_receiver(to)?;739740 let initial_balance_from = <Balance<T>>::get((collection.id, token, from));741 let updated_balance_from = initial_balance_from742 .checked_sub(amount)743 .ok_or(<CommonError<T>>::TokenValueTooLow)?;744 let mut create_target = false;745 let from_to_differ = from != to;746 let updated_balance_to = if from != to {747 let old_balance = <Balance<T>>::get((collection.id, token, to));748 if old_balance == 0 {749 create_target = true;750 }751 Some(752 old_balance753 .checked_add(amount)754 .ok_or(ArithmeticError::Overflow)?,755 )756 } else {757 None758 };759760 let account_balance_from = if updated_balance_from == 0 {761 Some(762 <AccountBalance<T>>::get((collection.id, from))763 .checked_sub(1)764 // Should not occur765 .ok_or(ArithmeticError::Underflow)?,766 )767 } else {768 None769 };770 // Account data is created in token, AccountBalance should be increased771 // But only if from != to as we shouldn't check overflow in this case772 let account_balance_to = if create_target && from_to_differ {773 let account_balance_to = <AccountBalance<T>>::get((collection.id, to))774 .checked_add(1)775 .ok_or(ArithmeticError::Overflow)?;776 ensure!(777 account_balance_to < collection.limits.account_token_ownership_limit(),778 <CommonError<T>>::AccountTokenLimitExceeded,779 );780781 Some(account_balance_to)782 } else {783 None784 };785786 // =========787788 <PalletStructure<T>>::nest_if_sent_to_token(789 from.clone(),790 to,791 collection.id,792 token,793 nesting_budget,794 )?;795796 if let Some(updated_balance_to) = updated_balance_to {797 // from != to798 if updated_balance_from == 0 {799 <Balance<T>>::remove((collection.id, token, from));800 <PalletStructure<T>>::unnest_if_nested(from, collection.id, token);801 } else {802 <Balance<T>>::insert((collection.id, token, from), updated_balance_from);803 }804 <Balance<T>>::insert((collection.id, token, to), updated_balance_to);805 if let Some(account_balance_from) = account_balance_from {806 <AccountBalance<T>>::insert((collection.id, from), account_balance_from);807 <Owned<T>>::remove((collection.id, from, token));808 }809 if let Some(account_balance_to) = account_balance_to {810 <AccountBalance<T>>::insert((collection.id, to), account_balance_to);811 <Owned<T>>::insert((collection.id, to, token), true);812 }813 }814815 <PalletEvm<T>>::deposit_log(816 ERC20Events::Transfer {817 from: *from.as_eth(),818 to: *to.as_eth(),819 value: amount.into(),820 }821 .to_log(T::EvmTokenAddressMapping::token_to_address(822 collection.id,823 token,824 )),825 );826827 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(828 collection.id,829 token,830 from.clone(),831 to.clone(),832 amount,833 ));834835 let total_supply = <TotalSupply<T>>::get((collection.id, token));836837 if amount == total_supply {838 // if token was fully owned by `from` and will be fully owned by `to` after transfer839 <PalletEvm<T>>::deposit_log(840 ERC721Events::Transfer {841 from: *from.as_eth(),842 to: *to.as_eth(),843 token_id: token.into(),844 }845 .to_log(collection_id_to_address(collection.id)),846 );847 } else if let Some(updated_balance_to) = updated_balance_to {848 // if `from` not equals `to`. This condition is needed to avoid sending event849 // when `from` fully owns token and sends part of token pieces to itself.850 if initial_balance_from == total_supply {851 // if token was fully owned by `from` and will be only partially owned by `to`852 // and `from` after transfer853 <PalletEvm<T>>::deposit_log(854 ERC721Events::Transfer {855 from: *from.as_eth(),856 to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,857 token_id: token.into(),858 }859 .to_log(collection_id_to_address(collection.id)),860 );861 } else if updated_balance_to == total_supply {862 // if token was partially owned by `from` and will be fully owned by `to` after transfer863 <PalletEvm<T>>::deposit_log(864 ERC721Events::Transfer {865 from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,866 to: *to.as_eth(),867 token_id: token.into(),868 }869 .to_log(collection_id_to_address(collection.id)),870 );871 }872 }873874 Ok(())875 }876877 /// Batched operation to create multiple RFT tokens.878 ///879 /// Same as `create_item` but creates multiple tokens.880 ///881 /// - `data`: Same as 'data` in `create_item` but contains data for multiple tokens.882 pub fn create_multiple_items(883 collection: &RefungibleHandle<T>,884 sender: &T::CrossAccountId,885 data: Vec<CreateItemData<T::CrossAccountId>>,886 nesting_budget: &dyn Budget,887 ) -> DispatchResult {888 if !collection.is_owner_or_admin(sender) {889 ensure!(890 collection.permissions.mint_mode(),891 <CommonError<T>>::PublicMintingNotAllowed892 );893 collection.check_allowlist(sender)?;894895 for item in data.iter() {896 for user in item.users.keys() {897 collection.check_allowlist(user)?;898 }899 }900 }901902 for item in data.iter() {903 for (owner, _) in item.users.iter() {904 <PalletCommon<T>>::ensure_correct_receiver(owner)?;905 }906 }907908 // Total pieces per tokens909 let totals = data910 .iter()911 .map(|data| {912 Ok(data913 .users914 .iter()915 .map(|u| u.1)916 .try_fold(0u128, |acc, v| acc.checked_add(*v))917 .ok_or(ArithmeticError::Overflow)?)918 })919 .collect::<Result<Vec<_>, DispatchError>>()?;920 for total in &totals {921 ensure!(922 *total <= MAX_REFUNGIBLE_PIECES,923 <Error<T>>::WrongRefungiblePieces924 );925 }926927 let first_token_id = <TokensMinted<T>>::get(collection.id);928 let tokens_minted = first_token_id929 .checked_add(data.len() as u32)930 .ok_or(ArithmeticError::Overflow)?;931 ensure!(932 tokens_minted < collection.limits.token_limit(),933 <CommonError<T>>::CollectionTokenLimitExceeded934 );935936 let mut balances = BTreeMap::new();937 for data in &data {938 for owner in data.users.keys() {939 let balance = balances940 .entry(owner)941 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner)));942 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;943944 ensure!(945 *balance <= collection.limits.account_token_ownership_limit(),946 <CommonError<T>>::AccountTokenLimitExceeded,947 );948 }949 }950951 for (i, token) in data.iter().enumerate() {952 let token_id = TokenId(first_token_id + i as u32 + 1);953 for (to, _) in token.users.iter() {954 <PalletStructure<T>>::check_nesting(955 sender.clone(),956 to,957 collection.id,958 token_id,959 nesting_budget,960 )?;961 }962 }963964 // =========965966 with_transaction(|| {967 for (i, data) in data.iter().enumerate() {968 let token_id = first_token_id + i as u32 + 1;969 <TotalSupply<T>>::insert((collection.id, token_id), totals[i]);970971 for (user, amount) in data.users.iter() {972 if *amount == 0 {973 continue;974 }975 <Balance<T>>::insert((collection.id, token_id, &user), amount);976 <Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);977 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(978 user,979 collection.id,980 TokenId(token_id),981 );982 }983984 if let Err(e) = Self::set_token_properties(985 collection,986 sender,987 TokenId(token_id),988 data.properties.clone().into_iter(),989 true,990 nesting_budget,991 ) {992 return TransactionOutcome::Rollback(Err(e));993 }994 }995 TransactionOutcome::Commit(Ok(()))996 })?;997998 <TokensMinted<T>>::insert(collection.id, tokens_minted);9991000 for (account, balance) in balances {1001 <AccountBalance<T>>::insert((collection.id, account), balance);1002 }10031004 for (i, token) in data.into_iter().enumerate() {1005 let token_id = first_token_id + i as u32 + 1;10061007 let receivers = token1008 .users1009 .into_iter()1010 .filter(|(_, amount)| *amount > 0)1011 .collect::<Vec<_>>();10121013 if let [(user, _)] = receivers.as_slice() {1014 // if there is exactly one receiver1015 <PalletEvm<T>>::deposit_log(1016 ERC721Events::Transfer {1017 from: H160::default(),1018 to: *user.as_eth(),1019 token_id: token_id.into(),1020 }1021 .to_log(collection_id_to_address(collection.id)),1022 );1023 } else if let [_, ..] = receivers.as_slice() {1024 // if there is more than one receiver1025 <PalletEvm<T>>::deposit_log(1026 ERC721Events::Transfer {1027 from: H160::default(),1028 to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,1029 token_id: token_id.into(),1030 }1031 .to_log(collection_id_to_address(collection.id)),1032 );1033 }10341035 for (user, amount) in receivers.into_iter() {1036 <PalletEvm<T>>::deposit_log(1037 ERC20Events::Transfer {1038 from: H160::default(),1039 to: *user.as_eth(),1040 value: amount.into(),1041 }1042 .to_log(T::EvmTokenAddressMapping::token_to_address(1043 collection.id,1044 TokenId(token_id),1045 )),1046 );1047 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1048 collection.id,1049 TokenId(token_id),1050 user,1051 amount,1052 ));1053 }1054 }1055 Ok(())1056 }10571058 pub fn set_allowance_unchecked(1059 collection: &RefungibleHandle<T>,1060 sender: &T::CrossAccountId,1061 spender: &T::CrossAccountId,1062 token: TokenId,1063 amount: u128,1064 ) {1065 if amount == 0 {1066 <Allowance<T>>::remove((collection.id, token, sender, spender));1067 } else {1068 <Allowance<T>>::insert((collection.id, token, sender, spender), amount);1069 }10701071 <PalletEvm<T>>::deposit_log(1072 ERC20Events::Approval {1073 owner: *sender.as_eth(),1074 spender: *spender.as_eth(),1075 value: amount.into(),1076 }1077 .to_log(T::EvmTokenAddressMapping::token_to_address(1078 collection.id,1079 token,1080 )),1081 );1082 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1083 collection.id,1084 token,1085 sender.clone(),1086 spender.clone(),1087 amount,1088 ))1089 }10901091 /// Set allowance for the spender to `transfer` or `burn` sender's token pieces.1092 ///1093 /// - `amount`: Amount of token pieces the spender is allowed to `transfer` or `burn.1094 pub fn set_allowance(1095 collection: &RefungibleHandle<T>,1096 sender: &T::CrossAccountId,1097 spender: &T::CrossAccountId,1098 token: TokenId,1099 amount: u128,1100 ) -> DispatchResult {1101 if collection.permissions.access() == AccessMode::AllowList {1102 collection.check_allowlist(sender)?;1103 collection.check_allowlist(spender)?;1104 }11051106 <PalletCommon<T>>::ensure_correct_receiver(spender)?;11071108 if <Balance<T>>::get((collection.id, token, sender)) < amount {1109 ensure!(1110 collection.ignores_owned_amount(sender) && Self::token_exists(collection, token),1111 <CommonError<T>>::CantApproveMoreThanOwned1112 );1113 }11141115 // =========11161117 Self::set_allowance_unchecked(collection, sender, spender, token, amount);1118 Ok(())1119 }11201121 /// Returns allowance, which should be set after transaction1122 fn check_allowed(1123 collection: &RefungibleHandle<T>,1124 spender: &T::CrossAccountId,1125 from: &T::CrossAccountId,1126 token: TokenId,1127 amount: u128,1128 nesting_budget: &dyn Budget,1129 ) -> Result<Option<u128>, DispatchError> {1130 if spender.conv_eq(from) {1131 return Ok(None);1132 }1133 if collection.permissions.access() == AccessMode::AllowList {1134 // `from`, `to` checked in [`transfer`]1135 collection.check_allowlist(spender)?;1136 }1137 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {1138 // TODO: should collection owner be allowed to perform this transfer?1139 ensure!(1140 <PalletStructure<T>>::check_indirectly_owned(1141 spender.clone(),1142 source.0,1143 source.1,1144 None,1145 nesting_budget1146 )?,1147 <CommonError<T>>::ApprovedValueTooLow,1148 );1149 return Ok(None);1150 }1151 let allowance =1152 <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);1153 if allowance.is_none() {1154 ensure!(1155 collection.ignores_allowance(spender),1156 <CommonError<T>>::ApprovedValueTooLow1157 );1158 }1159 Ok(allowance)1160 }11611162 /// Transfer RFT token pieces from one account to another.1163 ///1164 /// Same as the [`transfer`] but spender doesn't needs to be an owner of the token pieces.1165 /// The owner should set allowance for the spender to transfer pieces.1166 ///1167 /// [`transfer`]: struct.Pallet.html#method.transfer1168 pub fn transfer_from(1169 collection: &RefungibleHandle<T>,1170 spender: &T::CrossAccountId,1171 from: &T::CrossAccountId,1172 to: &T::CrossAccountId,1173 token: TokenId,1174 amount: u128,1175 nesting_budget: &dyn Budget,1176 ) -> DispatchResult {1177 let allowance =1178 Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;11791180 // =========11811182 Self::transfer(collection, from, to, token, amount, nesting_budget)?;1183 if let Some(allowance) = allowance {1184 Self::set_allowance_unchecked(collection, from, spender, token, allowance);1185 }1186 Ok(())1187 }11881189 /// Burn RFT token pieces from the account.1190 ///1191 /// Same as the [`burn`] but spender doesn't need to be an owner of the token pieces. The owner should1192 /// set allowance for the spender to burn pieces1193 ///1194 /// [`burn`]: struct.Pallet.html#method.burn1195 pub fn burn_from(1196 collection: &RefungibleHandle<T>,1197 spender: &T::CrossAccountId,1198 from: &T::CrossAccountId,1199 token: TokenId,1200 amount: u128,1201 nesting_budget: &dyn Budget,1202 ) -> DispatchResult {1203 let allowance =1204 Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;12051206 // =========12071208 Self::burn(collection, from, token, amount)?;1209 if let Some(allowance) = allowance {1210 Self::set_allowance_unchecked(collection, from, spender, token, allowance);1211 }1212 Ok(())1213 }12141215 /// Create RFT token.1216 ///1217 /// The sender should be the owner/admin of the collection or collection should be configured1218 /// to allow public minting.1219 ///1220 /// - `data`: Contains list of users who will become the owners of the token pieces and amount1221 /// of token pieces they will receive.1222 pub fn create_item(1223 collection: &RefungibleHandle<T>,1224 sender: &T::CrossAccountId,1225 data: CreateItemData<T::CrossAccountId>,1226 nesting_budget: &dyn Budget,1227 ) -> DispatchResult {1228 Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1229 }12301231 /// Repartition RFT token.1232 ///1233 /// `repartition` will set token balance of the sender and total amount of token pieces.1234 /// Sender should own all of the token pieces. `repartition' could be done even if some1235 /// token pieces were burned before.1236 ///1237 /// - `amount`: Total amount of token pieces that the token will have after `repartition`.1238 pub fn repartition(1239 collection: &RefungibleHandle<T>,1240 owner: &T::CrossAccountId,1241 token: TokenId,1242 amount: u128,1243 ) -> DispatchResult {1244 ensure!(1245 amount <= MAX_REFUNGIBLE_PIECES,1246 <Error<T>>::WrongRefungiblePieces1247 );1248 ensure!(amount > 0, <CommonError<T>>::TokenValueTooLow);1249 // Ensure user owns all pieces1250 let total_pieces = Self::total_pieces(collection.id, token).unwrap_or(u128::MAX);1251 let balance = <Balance<T>>::get((collection.id, token, owner));1252 ensure!(1253 total_pieces == balance,1254 <Error<T>>::RepartitionWhileNotOwningAllPieces1255 );12561257 <Balance<T>>::insert((collection.id, token, owner), amount);1258 <TotalSupply<T>>::insert((collection.id, token), amount);12591260 if amount > total_pieces {1261 let mint_amount = amount - total_pieces;1262 <PalletEvm<T>>::deposit_log(1263 ERC20Events::Transfer {1264 from: H160::default(),1265 to: *owner.as_eth(),1266 value: mint_amount.into(),1267 }1268 .to_log(T::EvmTokenAddressMapping::token_to_address(1269 collection.id,1270 token,1271 )),1272 );1273 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1274 collection.id,1275 token,1276 owner.clone(),1277 mint_amount,1278 ));1279 } else if total_pieces > amount {1280 let burn_amount = total_pieces - amount;1281 <PalletEvm<T>>::deposit_log(1282 ERC20Events::Transfer {1283 from: *owner.as_eth(),1284 to: H160::default(),1285 value: burn_amount.into(),1286 }1287 .to_log(T::EvmTokenAddressMapping::token_to_address(1288 collection.id,1289 token,1290 )),1291 );1292 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(1293 collection.id,1294 token,1295 owner.clone(),1296 burn_amount,1297 ));1298 }12991300 Ok(())1301 }13021303 fn token_owner(collection_id: CollectionId, token_id: TokenId) -> Option<T::CrossAccountId> {1304 let mut owner = None;1305 let mut count = 0;1306 for key in Balance::<T>::iter_key_prefix((collection_id, token_id)) {1307 count += 1;1308 if count > 1 {1309 return None;1310 }1311 owner = Some(key);1312 }1313 owner1314 }13151316 fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128> {1317 <TotalSupply<T>>::try_get((collection_id, token_id)).ok()1318 }13191320 pub fn set_collection_properties(1321 collection: &RefungibleHandle<T>,1322 sender: &T::CrossAccountId,1323 properties: Vec<Property>,1324 ) -> DispatchResult {1325 <PalletCommon<T>>::set_collection_properties(collection, sender, properties)1326 }13271328 pub fn delete_collection_properties(1329 collection: &RefungibleHandle<T>,1330 sender: &T::CrossAccountId,1331 property_keys: Vec<PropertyKey>,1332 ) -> DispatchResult {1333 <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)1334 }13351336 pub fn set_token_property_permissions(1337 collection: &RefungibleHandle<T>,1338 sender: &T::CrossAccountId,1339 property_permissions: Vec<PropertyKeyPermission>,1340 ) -> DispatchResult {1341 <PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)1342 }13431344 /// Returns 10 token in no particular order.1345 ///1346 /// There is no direct way to get token holders in ascending order,1347 /// since `iter_prefix` returns values in no particular order.1348 /// Therefore, getting the 10 largest holders with a large value of holders1349 /// can lead to impact memory allocation + sorting with `n * log (n)`.1350 pub fn token_owners(1351 collection_id: CollectionId,1352 token: TokenId,1353 ) -> Option<Vec<T::CrossAccountId>> {1354 let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection_id, token))1355 .map(|(owner, _amount)| owner)1356 .take(10)1357 .collect();13581359 if res.is_empty() {1360 None1361 } else {1362 Some(res)1363 }1364 }1365}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617//! # Refungible Pallet18//!19//! The Refungible pallet provides functionality for handling refungible collections and tokens.20//!21//! - [`Config`]22//! - [`RefungibleHandle`]23//! - [`Pallet`]24//! - [`CommonWeights`](common::CommonWeights)25//!26//! ## Overview27//!28//! The Refungible pallet provides functions for:29//!30//! - RFT collection creation and removal31//! - Minting and burning of RFT tokens32//! - Partition and repartition of RFT tokens33//! - Retrieving number of pieces of RFT token34//! - Retrieving account balances35//! - Transfering RFT token pieces36//! - Burning RFT token pieces37//! - Setting and checking allowance for RFT tokens38//!39//! ### Terminology40//!41//! - **RFT token:** Non fungible token that was partitioned to pieces. If an account owns all42//! of the RFT token pieces than it owns the RFT token and can repartition it.43//!44//! - **RFT Collection:** A collection of RFT tokens. All RFT tokens are part of a collection.45//! Each collection has its own settings and set of permissions.46//!47//! - **RFT token piece:** A fungible part of an RFT token.48//!49//! - **Balance:** RFT token pieces owned by an account50//!51//! - **Allowance:** Maximum number of RFT token pieces that one account is allowed to52//! transfer from the balance of another account53//!54//! - **Burning:** The process of “deleting” a token from a collection or removing token pieces from55//! an account balance.56//!57//! ### Implementations58//!59//! The Refungible pallet provides implementations for the following traits. If these traits provide60//! the functionality that you need, then you can avoid coupling with the Refungible pallet.61//!62//! - [`CommonWeightInfo`](pallet_common::CommonWeightInfo): Functions for retrieval of transaction weight63//! - [`CommonCollectionOperations`](pallet_common::CommonCollectionOperations): Functions for dealing64//! with collections65//! - [`RefungibleExtensions`](pallet_common::RefungibleExtensions): Functions specific for refungible66//! collection67//!68//! ## Interface69//!70//! ### Dispatchable Functions71//!72//! - `init_collection` - Create RFT collection. RFT collection can be configured to allow or deny access for73//! some accounts.74//! - `destroy_collection` - Destroy exising RFT collection. There should be no tokens in the collection.75//! - `burn` - Burn some amount of RFT token pieces owned by account. Burns the RFT token if no pieces left.76//! - `transfer` - Transfer some amount of RFT token pieces. Transfers should be enabled for RFT collection.77//! Nests the RFT token if RFT token pieces are sent to another token.78//! - `create_item` - Mint RFT token in collection. Sender should have permission to mint tokens.79//! - `set_allowance` - Set allowance for another account to transfer balance from sender's account.80//! - `repartition` - Repartition token to selected number of pieces. Sender should own all existing pieces.81//!82//! ## Assumptions83//!84//! * Total number of pieces for one token shouldn't exceed `up_data_structs::MAX_REFUNGIBLE_PIECES`.85//! * Total number of tokens of all types shouldn't be greater than `up_data_structs::MAX_TOKEN_PREFIX_LENGTH`.86//! * Sender should be in collection's allow list to perform operations on tokens.8788#![cfg_attr(not(feature = "std"), no_std)]8990use crate::erc_token::ERC20Events;91use crate::erc::ERC721Events;9293use codec::{Encode, Decode, MaxEncodedLen};94use core::ops::Deref;95use evm_coder::ToLog;96use frame_support::{97 BoundedVec, ensure, fail, storage::with_transaction, transactional, pallet_prelude::ConstU32,98};99use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};100use pallet_evm_coder_substrate::WithRecorder;101use pallet_common::{102 CollectionHandle, CommonCollectionOperations,103 dispatch::CollectionDispatch,104 erc::static_property::{key, property_value_from_bytes},105 Error as CommonError,106 eth::collection_id_to_address,107 Event as CommonEvent, Pallet as PalletCommon,108};109use pallet_structure::Pallet as PalletStructure;110use scale_info::TypeInfo;111use sp_core::H160;112use sp_runtime::{ArithmeticError, DispatchError, DispatchResult, TransactionOutcome};113use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};114use up_data_structs::{115 AccessMode, budget::Budget, CollectionId, CollectionMode, CollectionPropertiesVec, CreateCollectionData, CustomDataLimit,116 mapping::TokenAddressMapping, MAX_ITEMS_PER_BATCH, MAX_REFUNGIBLE_PIECES, Property,117 PropertyKey, PropertyKeyPermission, PropertyPermission, PropertyScope, PropertyValue,118 TokenId, TrySetProperty,119};120use frame_support::BoundedBTreeMap;121use derivative::Derivative;122123pub use pallet::*;124#[cfg(feature = "runtime-benchmarks")]125pub mod benchmarking;126pub mod common;127pub mod erc;128pub mod erc_token;129pub mod weights;130131#[derive(Derivative, Clone)]132pub struct CreateItemData<CrossAccountId> {133 #[derivative(Debug(format_with = "bounded::map_debug"))]134 pub users: BoundedBTreeMap<CrossAccountId, u128, ConstU32<MAX_ITEMS_PER_BATCH>>,135 #[derivative(Debug(format_with = "bounded::vec_debug"))]136 pub properties: CollectionPropertiesVec,137}138pub(crate) type SelfWeightOf<T> = <T as Config>::WeightInfo;139140/// Token data, stored independently from other data used to describe it141/// for the convenience of database access. Notably contains the token metadata.142#[struct_versioning::versioned(version = 2, upper)]143#[derive(Encode, Decode, Default, TypeInfo, MaxEncodedLen)]144#[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]145pub struct ItemData {146 pub const_data: BoundedVec<u8, CustomDataLimit>,147148 #[version(..2)]149 pub variable_data: BoundedVec<u8, CustomDataLimit>,150}151152#[frame_support::pallet]153pub mod pallet {154 use super::*;155 use frame_support::{156 Blake2_128, Blake2_128Concat, Twox64Concat, pallet_prelude::*, storage::Key,157 traits::StorageVersion,158 };159 use frame_system::pallet_prelude::*;160 use up_data_structs::{CollectionId, TokenId};161 use super::weights::WeightInfo;162163 #[pallet::error]164 pub enum Error<T> {165 /// Not Refungible item data used to mint in Refungible collection.166 NotRefungibleDataUsedToMintFungibleCollectionToken,167 /// Maximum refungibility exceeded.168 WrongRefungiblePieces,169 /// Refungible token can't be repartitioned by user who isn't owns all pieces.170 RepartitionWhileNotOwningAllPieces,171 /// Refungible token can't nest other tokens.172 RefungibleDisallowsNesting,173 /// Setting item properties is not allowed.174 SettingPropertiesNotAllowed,175 }176177 #[pallet::config]178 pub trait Config:179 frame_system::Config + pallet_common::Config + pallet_structure::Config180 {181 type WeightInfo: WeightInfo;182 }183184 const STORAGE_VERSION: StorageVersion = StorageVersion::new(2);185186 #[pallet::pallet]187 #[pallet::storage_version(STORAGE_VERSION)]188 #[pallet::generate_store(pub(super) trait Store)]189 pub struct Pallet<T>(_);190191 /// Total amount of minted tokens in a collection.192 #[pallet::storage]193 pub type TokensMinted<T: Config> =194 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;195196 /// Amount of tokens burnt in a collection.197 #[pallet::storage]198 pub type TokensBurnt<T: Config> =199 StorageMap<Hasher = Twox64Concat, Key = CollectionId, Value = u32, QueryKind = ValueQuery>;200201 /// Token data, used to partially describe a token.202 // TODO: remove203 #[pallet::storage]204 #[deprecated(since = "0.2.0", note = "ItemData is no more contains usefull data")]205 pub type TokenData<T: Config> = StorageNMap<206 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),207 Value = ItemData,208 QueryKind = ValueQuery,209 >;210211 /// Amount of pieces a refungible token is split into.212 #[pallet::storage]213 #[pallet::getter(fn token_properties)]214 pub type TokenProperties<T: Config> = StorageNMap<215 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),216 Value = up_data_structs::Properties,217 QueryKind = ValueQuery,218 OnEmpty = up_data_structs::TokenProperties,219 >;220221 /// Total amount of pieces for token222 #[pallet::storage]223 pub type TotalSupply<T: Config> = StorageNMap<224 Key = (Key<Twox64Concat, CollectionId>, Key<Twox64Concat, TokenId>),225 Value = u128,226 QueryKind = ValueQuery,227 >;228229 /// Used to enumerate tokens owned by account.230 #[pallet::storage]231 pub type Owned<T: Config> = StorageNMap<232 Key = (233 Key<Twox64Concat, CollectionId>,234 Key<Blake2_128Concat, T::CrossAccountId>,235 Key<Twox64Concat, TokenId>,236 ),237 Value = bool,238 QueryKind = ValueQuery,239 >;240241 /// Amount of tokens (not pieces) partially owned by an account within a collection.242 #[pallet::storage]243 pub type AccountBalance<T: Config> = StorageNMap<244 Key = (245 Key<Twox64Concat, CollectionId>,246 // Owner247 Key<Blake2_128Concat, T::CrossAccountId>,248 ),249 Value = u32,250 QueryKind = ValueQuery,251 >;252253 /// Amount of token pieces owned by account.254 #[pallet::storage]255 pub type Balance<T: Config> = StorageNMap<256 Key = (257 Key<Twox64Concat, CollectionId>,258 Key<Twox64Concat, TokenId>,259 // Owner260 Key<Blake2_128Concat, T::CrossAccountId>,261 ),262 Value = u128,263 QueryKind = ValueQuery,264 >;265266 /// Allowance set by a token owner for another user to perform one of certain transactions on a number of pieces of a token.267 #[pallet::storage]268 pub type Allowance<T: Config> = StorageNMap<269 Key = (270 Key<Twox64Concat, CollectionId>,271 Key<Twox64Concat, TokenId>,272 // Owner273 Key<Blake2_128, T::CrossAccountId>,274 // Spender275 Key<Blake2_128Concat, T::CrossAccountId>,276 ),277 Value = u128,278 QueryKind = ValueQuery,279 >;280281 #[pallet::hooks]282 impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {283 fn on_runtime_upgrade() -> Weight {284 let storage_version = StorageVersion::get::<Pallet<T>>();285 if storage_version < StorageVersion::new(2) {286 <TokenData<T>>::remove_all(None);287 }288 StorageVersion::new(2).put::<Pallet<T>>();289290 0291 }292 }293}294295pub struct RefungibleHandle<T: Config>(pallet_common::CollectionHandle<T>);296impl<T: Config> RefungibleHandle<T> {297 pub fn cast(inner: pallet_common::CollectionHandle<T>) -> Self {298 Self(inner)299 }300 pub fn into_inner(self) -> pallet_common::CollectionHandle<T> {301 self.0302 }303 pub fn common_mut(&mut self) -> &mut pallet_common::CollectionHandle<T> {304 &mut self.0305 }306}307308impl<T: Config> Deref for RefungibleHandle<T> {309 type Target = pallet_common::CollectionHandle<T>;310311 fn deref(&self) -> &Self::Target {312 &self.0313 }314}315316impl<T: Config> WithRecorder<T> for RefungibleHandle<T> {317 fn recorder(&self) -> &pallet_evm_coder_substrate::SubstrateRecorder<T> {318 self.0.recorder()319 }320 fn into_recorder(self) -> pallet_evm_coder_substrate::SubstrateRecorder<T> {321 self.0.into_recorder()322 }323}324325impl<T: Config> Pallet<T> {326 /// Get number of RFT tokens in collection327 pub fn total_supply(collection: &RefungibleHandle<T>) -> u32 {328 <TokensMinted<T>>::get(collection.id) - <TokensBurnt<T>>::get(collection.id)329 }330331 /// Check that RFT token exists332 ///333 /// - `token`: Token ID.334 pub fn token_exists(collection: &RefungibleHandle<T>, token: TokenId) -> bool {335 <TotalSupply<T>>::contains_key((collection.id, token))336 }337338 pub fn set_scoped_token_property(339 collection_id: CollectionId,340 token_id: TokenId,341 scope: PropertyScope,342 property: Property,343 ) -> DispatchResult {344 TokenProperties::<T>::try_mutate((collection_id, token_id), |properties| {345 properties.try_scoped_set(scope, property.key, property.value)346 })347 .map_err(<CommonError<T>>::from)?;348349 Ok(())350 }351352 pub fn set_scoped_token_properties(353 collection_id: CollectionId,354 token_id: TokenId,355 scope: PropertyScope,356 properties: impl Iterator<Item = Property>,357 ) -> DispatchResult {358 TokenProperties::<T>::try_mutate((collection_id, token_id), |stored_properties| {359 stored_properties.try_scoped_set_from_iter(scope, properties)360 })361 .map_err(<CommonError<T>>::from)?;362363 Ok(())364 }365}366367// unchecked calls skips any permission checks368impl<T: Config> Pallet<T> {369 /// Create RFT collection370 ///371 /// `init_collection` will take non-refundable deposit for collection creation.372 ///373 /// - `data`: Contains settings for collection limits and permissions.374 pub fn init_collection(375 owner: T::CrossAccountId,376 data: CreateCollectionData<T::AccountId>,377 ) -> Result<CollectionId, DispatchError> {378 <PalletCommon<T>>::init_collection(owner, data, false)379 }380381 /// Destroy RFT collection382 ///383 /// `destroy_collection` will throw error if collection contains any tokens.384 /// Only owner can destroy collection.385 pub fn destroy_collection(386 collection: RefungibleHandle<T>,387 sender: &T::CrossAccountId,388 ) -> DispatchResult {389 let id = collection.id;390391 if Self::collection_has_tokens(id) {392 return Err(<CommonError<T>>::CantDestroyNotEmptyCollection.into());393 }394395 // =========396397 PalletCommon::destroy_collection(collection.0, sender)?;398399 <TokensMinted<T>>::remove(id);400 <TokensBurnt<T>>::remove(id);401 <TotalSupply<T>>::remove_prefix((id,), None);402 <Balance<T>>::remove_prefix((id,), None);403 <Allowance<T>>::remove_prefix((id,), None);404 <Owned<T>>::remove_prefix((id,), None);405 <AccountBalance<T>>::remove_prefix((id,), None);406 Ok(())407 }408409 fn collection_has_tokens(collection_id: CollectionId) -> bool {410 <TotalSupply<T>>::iter_prefix((collection_id,))411 .next()412 .is_some()413 }414415 pub fn burn_token_unchecked(416 collection: &RefungibleHandle<T>,417 owner: &T::CrossAccountId,418 token_id: TokenId,419 ) -> DispatchResult {420 let burnt = <TokensBurnt<T>>::get(collection.id)421 .checked_add(1)422 .ok_or(ArithmeticError::Overflow)?;423424 <TokensBurnt<T>>::insert(collection.id, burnt);425 <TokenProperties<T>>::remove((collection.id, token_id));426 <TotalSupply<T>>::remove((collection.id, token_id));427 <Balance<T>>::remove_prefix((collection.id, token_id), None);428 <Allowance<T>>::remove_prefix((collection.id, token_id), None);429430 <PalletEvm<T>>::deposit_log(431 ERC721Events::Transfer {432 from: *owner.as_eth(),433 to: H160::default(),434 token_id: token_id.into(),435 }436 .to_log(collection_id_to_address(collection.id)),437 );438 Ok(())439 }440441 /// Burn RFT token pieces442 ///443 /// `burn` will decrease total amount of token pieces and amount owned by sender.444 /// `burn` can be called even if there are multiple owners of the RFT token.445 /// If sender wouldn't have any pieces left after `burn` than she will stop being446 /// one of the owners of the token. If there is no account that owns any pieces of447 /// the token than token will be burned too.448 ///449 /// - `amount`: Amount of token pieces to burn.450 /// - `token`: Token who's pieces should be burned451 /// - `collection`: Collection that contains the token452 pub fn burn(453 collection: &RefungibleHandle<T>,454 owner: &T::CrossAccountId,455 token: TokenId,456 amount: u128,457 ) -> DispatchResult {458 let total_supply = <TotalSupply<T>>::get((collection.id, token))459 .checked_sub(amount)460 .ok_or(<CommonError<T>>::TokenValueTooLow)?;461462 // This was probally last owner of this token?463 if total_supply == 0 {464 // Ensure user actually owns this amount465 ensure!(466 <Balance<T>>::get((collection.id, token, owner)) == amount,467 <CommonError<T>>::TokenValueTooLow468 );469 let account_balance = <AccountBalance<T>>::get((collection.id, owner))470 .checked_sub(1)471 // Should not occur472 .ok_or(ArithmeticError::Underflow)?;473474 // =========475476 <Owned<T>>::remove((collection.id, owner, token));477 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);478 <AccountBalance<T>>::insert((collection.id, owner), account_balance);479 Self::burn_token_unchecked(collection, owner, token)?;480 <PalletEvm<T>>::deposit_log(481 ERC20Events::Transfer {482 from: *owner.as_eth(),483 to: H160::default(),484 value: amount.into(),485 }486 .to_log(collection_id_to_address(collection.id)),487 );488 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(489 collection.id,490 token,491 owner.clone(),492 amount,493 ));494 return Ok(());495 }496497 let balance = <Balance<T>>::get((collection.id, token, owner))498 .checked_sub(amount)499 .ok_or(<CommonError<T>>::TokenValueTooLow)?;500 let account_balance = if balance == 0 {501 <AccountBalance<T>>::get((collection.id, owner))502 .checked_sub(1)503 // Should not occur504 .ok_or(ArithmeticError::Underflow)?505 } else {506 0507 };508509 // =========510511 if balance == 0 {512 <Owned<T>>::remove((collection.id, owner, token));513 <PalletStructure<T>>::unnest_if_nested(owner, collection.id, token);514 <Balance<T>>::remove((collection.id, token, owner));515 <AccountBalance<T>>::insert((collection.id, owner), account_balance);516517 if let Some(user) = Self::token_owner(collection.id, token) {518 <PalletEvm<T>>::deposit_log(519 ERC721Events::Transfer {520 from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,521 to: *user.as_eth(),522 token_id: token.into(),523 }524 .to_log(collection_id_to_address(collection.id)),525 );526 }527 } else {528 <Balance<T>>::insert((collection.id, token, owner), balance);529 }530 <TotalSupply<T>>::insert((collection.id, token), total_supply);531532 <PalletEvm<T>>::deposit_log(533 ERC20Events::Transfer {534 from: *owner.as_eth(),535 to: H160::default(),536 value: amount.into(),537 }538 .to_log(T::EvmTokenAddressMapping::token_to_address(539 collection.id,540 token,541 )),542 );543 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(544 collection.id,545 token,546 owner.clone(),547 amount,548 ));549 Ok(())550 }551552 #[transactional]553 fn modify_token_properties(554 collection: &RefungibleHandle<T>,555 sender: &T::CrossAccountId,556 token_id: TokenId,557 properties: impl Iterator<Item = (PropertyKey, Option<PropertyValue>)>,558 is_token_create: bool,559 nesting_budget: &dyn Budget,560 ) -> DispatchResult {561 let is_collection_admin = || collection.is_owner_or_admin(sender);562 let is_token_owner = || -> Result<bool, DispatchError> {563 let balance = collection.balance(sender.clone(), token_id);564 let total_pieces: u128 =565 Self::total_pieces(collection.id, token_id).unwrap_or(u128::MAX);566 if balance != total_pieces {567 return Ok(false);568 }569570 let is_bundle_owner = <PalletStructure<T>>::check_indirectly_owned(571 sender.clone(),572 collection.id,573 token_id,574 None,575 nesting_budget,576 )?;577578 Ok(is_bundle_owner)579 };580581 for (key, value) in properties {582 let permission = <PalletCommon<T>>::property_permissions(collection.id)583 .get(&key)584 .cloned()585 .unwrap_or_else(PropertyPermission::none);586587 let is_property_exists = TokenProperties::<T>::get((collection.id, token_id))588 .get(&key)589 .is_some();590591 match permission {592 PropertyPermission { mutable: false, .. } if is_property_exists => {593 return Err(<CommonError<T>>::NoPermission.into());594 }595596 PropertyPermission {597 collection_admin,598 token_owner,599 ..600 } => {601 //TODO: investigate threats during public minting.602 let is_token_create =603 is_token_create && (collection_admin || token_owner) && value.is_some();604 if !(is_token_create605 || (collection_admin && is_collection_admin())606 || (token_owner && is_token_owner()?))607 {608 fail!(<CommonError<T>>::NoPermission);609 }610 }611 }612613 match value {614 Some(value) => {615 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {616 properties.try_set(key.clone(), value)617 })618 .map_err(<CommonError<T>>::from)?;619620 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertySet(621 collection.id,622 token_id,623 key,624 ));625 }626 None => {627 <TokenProperties<T>>::try_mutate((collection.id, token_id), |properties| {628 properties.remove(&key)629 })630 .map_err(<CommonError<T>>::from)?;631632 <PalletCommon<T>>::deposit_event(CommonEvent::TokenPropertyDeleted(633 collection.id,634 token_id,635 key,636 ));637 }638 }639 }640641 Ok(())642 }643644 pub fn set_token_properties(645 collection: &RefungibleHandle<T>,646 sender: &T::CrossAccountId,647 token_id: TokenId,648 properties: impl Iterator<Item = Property>,649 is_token_create: bool,650 nesting_budget: &dyn Budget,651 ) -> DispatchResult {652 Self::modify_token_properties(653 collection,654 sender,655 token_id,656 properties.map(|p| (p.key, Some(p.value))),657 is_token_create,658 nesting_budget,659 )660 }661662 pub fn set_token_property(663 collection: &RefungibleHandle<T>,664 sender: &T::CrossAccountId,665 token_id: TokenId,666 property: Property,667 nesting_budget: &dyn Budget,668 ) -> DispatchResult {669 let is_token_create = false;670671 Self::set_token_properties(672 collection,673 sender,674 token_id,675 [property].into_iter(),676 is_token_create,677 nesting_budget,678 )679 }680681 pub fn delete_token_properties(682 collection: &RefungibleHandle<T>,683 sender: &T::CrossAccountId,684 token_id: TokenId,685 property_keys: impl Iterator<Item = PropertyKey>,686 nesting_budget: &dyn Budget,687 ) -> DispatchResult {688 let is_token_create = false;689690 Self::modify_token_properties(691 collection,692 sender,693 token_id,694 property_keys.into_iter().map(|key| (key, None)),695 is_token_create,696 nesting_budget,697 )698 }699700 pub fn delete_token_property(701 collection: &RefungibleHandle<T>,702 sender: &T::CrossAccountId,703 token_id: TokenId,704 property_key: PropertyKey,705 nesting_budget: &dyn Budget,706 ) -> DispatchResult {707 Self::delete_token_properties(708 collection,709 sender,710 token_id,711 [property_key].into_iter(),712 nesting_budget,713 )714 }715716 /// Transfer RFT token pieces from one account to another.717 ///718 /// If the sender is no longer owns any pieces after the `transfer` than she stops being an owner of the token.719 ///720 /// - `from`: Owner of token pieces to transfer.721 /// - `to`: Recepient of transfered token pieces.722 /// - `amount`: Amount of token pieces to transfer.723 /// - `token`: Token whos pieces should be transfered724 /// - `collection`: Collection that contains the token725 pub fn transfer(726 collection: &RefungibleHandle<T>,727 from: &T::CrossAccountId,728 to: &T::CrossAccountId,729 token: TokenId,730 amount: u128,731 nesting_budget: &dyn Budget,732 ) -> DispatchResult {733 ensure!(734 collection.limits.transfers_enabled(),735 <CommonError<T>>::TransferNotAllowed736 );737738 if collection.permissions.access() == AccessMode::AllowList {739 collection.check_allowlist(from)?;740 collection.check_allowlist(to)?;741 }742 <PalletCommon<T>>::ensure_correct_receiver(to)?;743744 let initial_balance_from = <Balance<T>>::get((collection.id, token, from));745 let updated_balance_from = initial_balance_from746 .checked_sub(amount)747 .ok_or(<CommonError<T>>::TokenValueTooLow)?;748 let mut create_target = false;749 let from_to_differ = from != to;750 let updated_balance_to = if from != to {751 let old_balance = <Balance<T>>::get((collection.id, token, to));752 if old_balance == 0 {753 create_target = true;754 }755 Some(756 old_balance757 .checked_add(amount)758 .ok_or(ArithmeticError::Overflow)?,759 )760 } else {761 None762 };763764 let account_balance_from = if updated_balance_from == 0 {765 Some(766 <AccountBalance<T>>::get((collection.id, from))767 .checked_sub(1)768 // Should not occur769 .ok_or(ArithmeticError::Underflow)?,770 )771 } else {772 None773 };774 // Account data is created in token, AccountBalance should be increased775 // But only if from != to as we shouldn't check overflow in this case776 let account_balance_to = if create_target && from_to_differ {777 let account_balance_to = <AccountBalance<T>>::get((collection.id, to))778 .checked_add(1)779 .ok_or(ArithmeticError::Overflow)?;780 ensure!(781 account_balance_to < collection.limits.account_token_ownership_limit(),782 <CommonError<T>>::AccountTokenLimitExceeded,783 );784785 Some(account_balance_to)786 } else {787 None788 };789790 // =========791792 <PalletStructure<T>>::nest_if_sent_to_token(793 from.clone(),794 to,795 collection.id,796 token,797 nesting_budget,798 )?;799800 if let Some(updated_balance_to) = updated_balance_to {801 // from != to802 if updated_balance_from == 0 {803 <Balance<T>>::remove((collection.id, token, from));804 <PalletStructure<T>>::unnest_if_nested(from, collection.id, token);805 } else {806 <Balance<T>>::insert((collection.id, token, from), updated_balance_from);807 }808 <Balance<T>>::insert((collection.id, token, to), updated_balance_to);809 if let Some(account_balance_from) = account_balance_from {810 <AccountBalance<T>>::insert((collection.id, from), account_balance_from);811 <Owned<T>>::remove((collection.id, from, token));812 }813 if let Some(account_balance_to) = account_balance_to {814 <AccountBalance<T>>::insert((collection.id, to), account_balance_to);815 <Owned<T>>::insert((collection.id, to, token), true);816 }817 }818819 <PalletEvm<T>>::deposit_log(820 ERC20Events::Transfer {821 from: *from.as_eth(),822 to: *to.as_eth(),823 value: amount.into(),824 }825 .to_log(T::EvmTokenAddressMapping::token_to_address(826 collection.id,827 token,828 )),829 );830831 <PalletCommon<T>>::deposit_event(CommonEvent::Transfer(832 collection.id,833 token,834 from.clone(),835 to.clone(),836 amount,837 ));838839 let total_supply = <TotalSupply<T>>::get((collection.id, token));840841 if amount == total_supply {842 // if token was fully owned by `from` and will be fully owned by `to` after transfer843 <PalletEvm<T>>::deposit_log(844 ERC721Events::Transfer {845 from: *from.as_eth(),846 to: *to.as_eth(),847 token_id: token.into(),848 }849 .to_log(collection_id_to_address(collection.id)),850 );851 } else if let Some(updated_balance_to) = updated_balance_to {852 // if `from` not equals `to`. This condition is needed to avoid sending event853 // when `from` fully owns token and sends part of token pieces to itself.854 if initial_balance_from == total_supply {855 // if token was fully owned by `from` and will be only partially owned by `to`856 // and `from` after transfer857 <PalletEvm<T>>::deposit_log(858 ERC721Events::Transfer {859 from: *from.as_eth(),860 to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,861 token_id: token.into(),862 }863 .to_log(collection_id_to_address(collection.id)),864 );865 } else if updated_balance_to == total_supply {866 // if token was partially owned by `from` and will be fully owned by `to` after transfer867 <PalletEvm<T>>::deposit_log(868 ERC721Events::Transfer {869 from: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,870 to: *to.as_eth(),871 token_id: token.into(),872 }873 .to_log(collection_id_to_address(collection.id)),874 );875 }876 }877878 Ok(())879 }880881 /// Batched operation to create multiple RFT tokens.882 ///883 /// Same as `create_item` but creates multiple tokens.884 ///885 /// - `data`: Same as 'data` in `create_item` but contains data for multiple tokens.886 pub fn create_multiple_items(887 collection: &RefungibleHandle<T>,888 sender: &T::CrossAccountId,889 data: Vec<CreateItemData<T::CrossAccountId>>,890 nesting_budget: &dyn Budget,891 ) -> DispatchResult {892 if !collection.is_owner_or_admin(sender) {893 ensure!(894 collection.permissions.mint_mode(),895 <CommonError<T>>::PublicMintingNotAllowed896 );897 collection.check_allowlist(sender)?;898899 for item in data.iter() {900 for user in item.users.keys() {901 collection.check_allowlist(user)?;902 }903 }904 }905906 for item in data.iter() {907 for (owner, _) in item.users.iter() {908 <PalletCommon<T>>::ensure_correct_receiver(owner)?;909 }910 }911912 // Total pieces per tokens913 let totals = data914 .iter()915 .map(|data| {916 Ok(data917 .users918 .iter()919 .map(|u| u.1)920 .try_fold(0u128, |acc, v| acc.checked_add(*v))921 .ok_or(ArithmeticError::Overflow)?)922 })923 .collect::<Result<Vec<_>, DispatchError>>()?;924 for total in &totals {925 ensure!(926 *total <= MAX_REFUNGIBLE_PIECES,927 <Error<T>>::WrongRefungiblePieces928 );929 }930931 let first_token_id = <TokensMinted<T>>::get(collection.id);932 let tokens_minted = first_token_id933 .checked_add(data.len() as u32)934 .ok_or(ArithmeticError::Overflow)?;935 ensure!(936 tokens_minted < collection.limits.token_limit(),937 <CommonError<T>>::CollectionTokenLimitExceeded938 );939940 let mut balances = BTreeMap::new();941 for data in &data {942 for owner in data.users.keys() {943 let balance = balances944 .entry(owner)945 .or_insert_with(|| <AccountBalance<T>>::get((collection.id, owner)));946 *balance = balance.checked_add(1).ok_or(ArithmeticError::Overflow)?;947948 ensure!(949 *balance <= collection.limits.account_token_ownership_limit(),950 <CommonError<T>>::AccountTokenLimitExceeded,951 );952 }953 }954955 for (i, token) in data.iter().enumerate() {956 let token_id = TokenId(first_token_id + i as u32 + 1);957 for (to, _) in token.users.iter() {958 <PalletStructure<T>>::check_nesting(959 sender.clone(),960 to,961 collection.id,962 token_id,963 nesting_budget,964 )?;965 }966 }967968 // =========969970 with_transaction(|| {971 for (i, data) in data.iter().enumerate() {972 let token_id = first_token_id + i as u32 + 1;973 <TotalSupply<T>>::insert((collection.id, token_id), totals[i]);974975 for (user, amount) in data.users.iter() {976 if *amount == 0 {977 continue;978 }979 <Balance<T>>::insert((collection.id, token_id, &user), amount);980 <Owned<T>>::insert((collection.id, &user, TokenId(token_id)), true);981 <PalletStructure<T>>::nest_if_sent_to_token_unchecked(982 user,983 collection.id,984 TokenId(token_id),985 );986 }987988 if let Err(e) = Self::set_token_properties(989 collection,990 sender,991 TokenId(token_id),992 data.properties.clone().into_iter(),993 true,994 nesting_budget,995 ) {996 return TransactionOutcome::Rollback(Err(e));997 }998 }999 TransactionOutcome::Commit(Ok(()))1000 })?;10011002 <TokensMinted<T>>::insert(collection.id, tokens_minted);10031004 for (account, balance) in balances {1005 <AccountBalance<T>>::insert((collection.id, account), balance);1006 }10071008 for (i, token) in data.into_iter().enumerate() {1009 let token_id = first_token_id + i as u32 + 1;10101011 let receivers = token1012 .users1013 .into_iter()1014 .filter(|(_, amount)| *amount > 0)1015 .collect::<Vec<_>>();10161017 if let [(user, _)] = receivers.as_slice() {1018 // if there is exactly one receiver1019 <PalletEvm<T>>::deposit_log(1020 ERC721Events::Transfer {1021 from: H160::default(),1022 to: *user.as_eth(),1023 token_id: token_id.into(),1024 }1025 .to_log(collection_id_to_address(collection.id)),1026 );1027 } else if let [_, ..] = receivers.as_slice() {1028 // if there is more than one receiver1029 <PalletEvm<T>>::deposit_log(1030 ERC721Events::Transfer {1031 from: H160::default(),1032 to: erc::ADDRESS_FOR_PARTIALLY_OWNED_TOKENS,1033 token_id: token_id.into(),1034 }1035 .to_log(collection_id_to_address(collection.id)),1036 );1037 }10381039 for (user, amount) in receivers.into_iter() {1040 <PalletEvm<T>>::deposit_log(1041 ERC20Events::Transfer {1042 from: H160::default(),1043 to: *user.as_eth(),1044 value: amount.into(),1045 }1046 .to_log(T::EvmTokenAddressMapping::token_to_address(1047 collection.id,1048 TokenId(token_id),1049 )),1050 );1051 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1052 collection.id,1053 TokenId(token_id),1054 user,1055 amount,1056 ));1057 }1058 }1059 Ok(())1060 }10611062 pub fn set_allowance_unchecked(1063 collection: &RefungibleHandle<T>,1064 sender: &T::CrossAccountId,1065 spender: &T::CrossAccountId,1066 token: TokenId,1067 amount: u128,1068 ) {1069 if amount == 0 {1070 <Allowance<T>>::remove((collection.id, token, sender, spender));1071 } else {1072 <Allowance<T>>::insert((collection.id, token, sender, spender), amount);1073 }10741075 <PalletEvm<T>>::deposit_log(1076 ERC20Events::Approval {1077 owner: *sender.as_eth(),1078 spender: *spender.as_eth(),1079 value: amount.into(),1080 }1081 .to_log(T::EvmTokenAddressMapping::token_to_address(1082 collection.id,1083 token,1084 )),1085 );1086 <PalletCommon<T>>::deposit_event(CommonEvent::Approved(1087 collection.id,1088 token,1089 sender.clone(),1090 spender.clone(),1091 amount,1092 ))1093 }10941095 /// Set allowance for the spender to `transfer` or `burn` sender's token pieces.1096 ///1097 /// - `amount`: Amount of token pieces the spender is allowed to `transfer` or `burn.1098 pub fn set_allowance(1099 collection: &RefungibleHandle<T>,1100 sender: &T::CrossAccountId,1101 spender: &T::CrossAccountId,1102 token: TokenId,1103 amount: u128,1104 ) -> DispatchResult {1105 if collection.permissions.access() == AccessMode::AllowList {1106 collection.check_allowlist(sender)?;1107 collection.check_allowlist(spender)?;1108 }11091110 <PalletCommon<T>>::ensure_correct_receiver(spender)?;11111112 if <Balance<T>>::get((collection.id, token, sender)) < amount {1113 ensure!(1114 collection.ignores_owned_amount(sender) && Self::token_exists(collection, token),1115 <CommonError<T>>::CantApproveMoreThanOwned1116 );1117 }11181119 // =========11201121 Self::set_allowance_unchecked(collection, sender, spender, token, amount);1122 Ok(())1123 }11241125 /// Returns allowance, which should be set after transaction1126 fn check_allowed(1127 collection: &RefungibleHandle<T>,1128 spender: &T::CrossAccountId,1129 from: &T::CrossAccountId,1130 token: TokenId,1131 amount: u128,1132 nesting_budget: &dyn Budget,1133 ) -> Result<Option<u128>, DispatchError> {1134 if spender.conv_eq(from) {1135 return Ok(None);1136 }1137 if collection.permissions.access() == AccessMode::AllowList {1138 // `from`, `to` checked in [`transfer`]1139 collection.check_allowlist(spender)?;1140 }1141 if let Some(source) = T::CrossTokenAddressMapping::address_to_token(from) {1142 // TODO: should collection owner be allowed to perform this transfer?1143 ensure!(1144 <PalletStructure<T>>::check_indirectly_owned(1145 spender.clone(),1146 source.0,1147 source.1,1148 None,1149 nesting_budget1150 )?,1151 <CommonError<T>>::ApprovedValueTooLow,1152 );1153 return Ok(None);1154 }1155 let allowance =1156 <Allowance<T>>::get((collection.id, token, from, &spender)).checked_sub(amount);1157 if allowance.is_none() {1158 ensure!(1159 collection.ignores_allowance(spender),1160 <CommonError<T>>::ApprovedValueTooLow1161 );1162 }1163 Ok(allowance)1164 }11651166 /// Transfer RFT token pieces from one account to another.1167 ///1168 /// Same as the [`transfer`] but spender doesn't needs to be an owner of the token pieces.1169 /// The owner should set allowance for the spender to transfer pieces.1170 ///1171 /// [`transfer`]: struct.Pallet.html#method.transfer1172 pub fn transfer_from(1173 collection: &RefungibleHandle<T>,1174 spender: &T::CrossAccountId,1175 from: &T::CrossAccountId,1176 to: &T::CrossAccountId,1177 token: TokenId,1178 amount: u128,1179 nesting_budget: &dyn Budget,1180 ) -> DispatchResult {1181 let allowance =1182 Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;11831184 // =========11851186 Self::transfer(collection, from, to, token, amount, nesting_budget)?;1187 if let Some(allowance) = allowance {1188 Self::set_allowance_unchecked(collection, from, spender, token, allowance);1189 }1190 Ok(())1191 }11921193 /// Burn RFT token pieces from the account.1194 ///1195 /// Same as the [`burn`] but spender doesn't need to be an owner of the token pieces. The owner should1196 /// set allowance for the spender to burn pieces1197 ///1198 /// [`burn`]: struct.Pallet.html#method.burn1199 pub fn burn_from(1200 collection: &RefungibleHandle<T>,1201 spender: &T::CrossAccountId,1202 from: &T::CrossAccountId,1203 token: TokenId,1204 amount: u128,1205 nesting_budget: &dyn Budget,1206 ) -> DispatchResult {1207 let allowance =1208 Self::check_allowed(collection, spender, from, token, amount, nesting_budget)?;12091210 // =========12111212 Self::burn(collection, from, token, amount)?;1213 if let Some(allowance) = allowance {1214 Self::set_allowance_unchecked(collection, from, spender, token, allowance);1215 }1216 Ok(())1217 }12181219 /// Create RFT token.1220 ///1221 /// The sender should be the owner/admin of the collection or collection should be configured1222 /// to allow public minting.1223 ///1224 /// - `data`: Contains list of users who will become the owners of the token pieces and amount1225 /// of token pieces they will receive.1226 pub fn create_item(1227 collection: &RefungibleHandle<T>,1228 sender: &T::CrossAccountId,1229 data: CreateItemData<T::CrossAccountId>,1230 nesting_budget: &dyn Budget,1231 ) -> DispatchResult {1232 Self::create_multiple_items(collection, sender, vec![data], nesting_budget)1233 }12341235 /// Repartition RFT token.1236 ///1237 /// `repartition` will set token balance of the sender and total amount of token pieces.1238 /// Sender should own all of the token pieces. `repartition' could be done even if some1239 /// token pieces were burned before.1240 ///1241 /// - `amount`: Total amount of token pieces that the token will have after `repartition`.1242 pub fn repartition(1243 collection: &RefungibleHandle<T>,1244 owner: &T::CrossAccountId,1245 token: TokenId,1246 amount: u128,1247 ) -> DispatchResult {1248 ensure!(1249 amount <= MAX_REFUNGIBLE_PIECES,1250 <Error<T>>::WrongRefungiblePieces1251 );1252 ensure!(amount > 0, <CommonError<T>>::TokenValueTooLow);1253 // Ensure user owns all pieces1254 let total_pieces = Self::total_pieces(collection.id, token).unwrap_or(u128::MAX);1255 let balance = <Balance<T>>::get((collection.id, token, owner));1256 ensure!(1257 total_pieces == balance,1258 <Error<T>>::RepartitionWhileNotOwningAllPieces1259 );12601261 <Balance<T>>::insert((collection.id, token, owner), amount);1262 <TotalSupply<T>>::insert((collection.id, token), amount);12631264 if amount > total_pieces {1265 let mint_amount = amount - total_pieces;1266 <PalletEvm<T>>::deposit_log(1267 ERC20Events::Transfer {1268 from: H160::default(),1269 to: *owner.as_eth(),1270 value: mint_amount.into(),1271 }1272 .to_log(T::EvmTokenAddressMapping::token_to_address(1273 collection.id,1274 token,1275 )),1276 );1277 <PalletCommon<T>>::deposit_event(CommonEvent::ItemCreated(1278 collection.id,1279 token,1280 owner.clone(),1281 mint_amount,1282 ));1283 } else if total_pieces > amount {1284 let burn_amount = total_pieces - amount;1285 <PalletEvm<T>>::deposit_log(1286 ERC20Events::Transfer {1287 from: *owner.as_eth(),1288 to: H160::default(),1289 value: burn_amount.into(),1290 }1291 .to_log(T::EvmTokenAddressMapping::token_to_address(1292 collection.id,1293 token,1294 )),1295 );1296 <PalletCommon<T>>::deposit_event(CommonEvent::ItemDestroyed(1297 collection.id,1298 token,1299 owner.clone(),1300 burn_amount,1301 ));1302 }13031304 Ok(())1305 }13061307 fn token_owner(collection_id: CollectionId, token_id: TokenId) -> Option<T::CrossAccountId> {1308 let mut owner = None;1309 let mut count = 0;1310 for key in Balance::<T>::iter_key_prefix((collection_id, token_id)) {1311 count += 1;1312 if count > 1 {1313 return None;1314 }1315 owner = Some(key);1316 }1317 owner1318 }13191320 fn total_pieces(collection_id: CollectionId, token_id: TokenId) -> Option<u128> {1321 <TotalSupply<T>>::try_get((collection_id, token_id)).ok()1322 }13231324 pub fn set_collection_properties(1325 collection: &RefungibleHandle<T>,1326 sender: &T::CrossAccountId,1327 properties: Vec<Property>,1328 ) -> DispatchResult {1329 <PalletCommon<T>>::set_collection_properties(collection, sender, properties)1330 }13311332 pub fn delete_collection_properties(1333 collection: &RefungibleHandle<T>,1334 sender: &T::CrossAccountId,1335 property_keys: Vec<PropertyKey>,1336 ) -> DispatchResult {1337 <PalletCommon<T>>::delete_collection_properties(collection, sender, property_keys)1338 }13391340 pub fn set_token_property_permissions(1341 collection: &RefungibleHandle<T>,1342 sender: &T::CrossAccountId,1343 property_permissions: Vec<PropertyKeyPermission>,1344 ) -> DispatchResult {1345 <PalletCommon<T>>::set_token_property_permissions(collection, sender, property_permissions)1346 }13471348 pub fn set_scoped_token_property_permissions(1349 collection: &RefungibleHandle<T>,1350 sender: &T::CrossAccountId,1351 scope: PropertyScope,1352 property_permissions: Vec<PropertyKeyPermission>,1353 ) -> DispatchResult {1354 <PalletCommon<T>>::set_scoped_token_property_permissions(1355 collection,1356 sender,1357 scope,1358 property_permissions,1359 )1360 }13611362 /// Returns 10 token in no particular order.1363 ///1364 /// There is no direct way to get token holders in ascending order,1365 /// since `iter_prefix` returns values in no particular order.1366 /// Therefore, getting the 10 largest holders with a large value of holders1367 /// can lead to impact memory allocation + sorting with `n * log (n)`.1368 pub fn token_owners(1369 collection_id: CollectionId,1370 token: TokenId,1371 ) -> Option<Vec<T::CrossAccountId>> {1372 let res: Vec<T::CrossAccountId> = <Balance<T>>::iter_prefix((collection_id, token))1373 .map(|(owner, _amount)| owner)1374 .take(10)1375 .collect();13761377 if res.is_empty() {1378 None1379 } else {1380 Some(res)1381 }1382 }13831384 /// Sets the NFT token as a parent for the RFT token1385 ///1386 /// Throws if `sender` is not the owner of the NFT token.1387 /// Throws if `sender` is not the owner of all of the RFT token pieces.1388 pub fn set_parent_nft(1389 collection: &RefungibleHandle<T>,1390 rft_token_id: TokenId,1391 sender: T::CrossAccountId,1392 nft_collection: CollectionId,1393 nft_token: TokenId,1394 ) -> DispatchResult {1395 let handle = <CollectionHandle<T>>::try_get(nft_collection)?;1396 if handle.mode != CollectionMode::NFT {1397 return Err("Only NFT token could be parent to RFT".into());1398 }1399 let dispatch = T::CollectionDispatch::dispatch(handle);1400 let dispatch = dispatch.as_dyn();14011402 let owner = dispatch.token_owner(nft_token).ok_or("owner not found")?;1403 if owner != sender {1404 return Err("Only owned token could be set as parent".into());1405 }14061407 let nft_token_address =1408 T::CrossTokenAddressMapping::token_to_address(nft_collection, nft_token);14091410 Self::set_parent_nft_unchecked(collection, rft_token_id, sender, nft_token_address)1411 }14121413 /// Sets the NFT token as a parent for the RFT token1414 ///1415 /// `sender` should be the owner of the NFT token.1416 /// Throws if `sender` is not the owner of all of the RFT token pieces.1417 pub fn set_parent_nft_unchecked(1418 collection: &RefungibleHandle<T>,1419 rft_token_id: TokenId,1420 sender: T::CrossAccountId,1421 nft_token_address: T::CrossAccountId,1422 ) -> DispatchResult {1423 let owner_balance = <Balance<T>>::get((collection.id, rft_token_id, &sender));1424 let total_supply = <TotalSupply<T>>::get((collection.id, rft_token_id));1425 if total_supply != owner_balance {1426 return Err("token has multiple owners".into());1427 }14281429 let parent_nft_property_key = key::parent_nft();14301431 let parent_nft_property_value =1432 property_value_from_bytes(&nft_token_address.as_eth().to_fixed_bytes())1433 .expect("address should fit in value length limit");14341435 <Pallet<T>>::set_scoped_token_property(1436 collection.id,1437 rft_token_id,1438 PropertyScope::Eth,1439 Property {1440 key: parent_nft_property_key,1441 value: parent_nft_property_value,1442 },1443 )?;14441445 Ok(())1446 }1447}pallets/refungible/src/stubs/UniqueRefungible.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungible.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungible.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungible.sol
@@ -413,7 +413,100 @@
}
}
-// Selector: 7d9262e6
+// Selector: 7c3bef89
+contract ERC721UniqueExtensions is Dummy, ERC165 {
+ // @notice Transfer ownership of an RFT
+ // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ // is the zero address. Throws if `tokenId` is not a valid RFT.
+ // Throws if RFT pieces have multiple owners.
+ // @param to The new owner
+ // @param tokenId The RFT to transfer
+ // @param _value Not used for an RFT
+ //
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 tokenId) public {
+ require(false, stub_error);
+ to;
+ tokenId;
+ dummy = 0;
+ }
+
+ // @notice Burns a specific ERC721 token.
+ // @dev Throws unless `msg.sender` is the current owner or an authorized
+ // operator for this RFT. Throws if `from` is not the current owner. Throws
+ // if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
+ // Throws if RFT pieces have multiple owners.
+ // @param from The current owner of the RFT
+ // @param tokenId The RFT to transfer
+ // @param _value Not used for an RFT
+ //
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 tokenId) public {
+ require(false, stub_error);
+ from;
+ tokenId;
+ dummy = 0;
+ }
+
+ // @notice Returns next free RFT ID.
+ //
+ // Selector: nextTokenId() 75794a3c
+ function nextTokenId() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+
+ // @notice Function to mint multiple tokens.
+ // @dev `tokenIds` should be an array of consecutive numbers and first number
+ // should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokenIds IDs of the minted RFTs
+ //
+ // Selector: mintBulk(address,uint256[]) 44a9945e
+ function mintBulk(address to, uint256[] memory tokenIds)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ to;
+ tokenIds;
+ dummy = 0;
+ return false;
+ }
+
+ // @notice Function to mint multiple tokens with the given tokenUris.
+ // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+ // numbers and first number should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokens array of pairs of token ID and token URI for minted tokens
+ //
+ // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
+ function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ to;
+ tokens;
+ dummy = 0;
+ return false;
+ }
+
+ // Returns EVM address for refungible token
+ //
+ // @param token ID of the token
+ //
+ // Selector: tokenContractAddress(uint256) ab76fac6
+ function tokenContractAddress(uint256 token) public view returns (address) {
+ require(false, stub_error);
+ token;
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
+}
+
+// Selector: aa7d570d
contract Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -636,88 +729,29 @@
function setCollectionMintMode(bool mode) public {
require(false, stub_error);
mode;
- dummy = 0;
- }
-}
-
-// Selector: d74d154f
-contract ERC721UniqueExtensions is Dummy, ERC165 {
- // @notice Transfer ownership of an RFT
- // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
- // is the zero address. Throws if `tokenId` is not a valid RFT.
- // Throws if RFT pieces have multiple owners.
- // @param to The new owner
- // @param tokenId The RFT to transfer
- // @param _value Not used for an RFT
- //
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 tokenId) public {
- require(false, stub_error);
- to;
- tokenId;
- dummy = 0;
- }
-
- // @notice Burns a specific ERC721 token.
- // @dev Throws unless `msg.sender` is the current owner or an authorized
- // operator for this RFT. Throws if `from` is not the current owner. Throws
- // if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
- // Throws if RFT pieces have multiple owners.
- // @param from The current owner of the RFT
- // @param tokenId The RFT to transfer
- // @param _value Not used for an RFT
- //
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 tokenId) public {
- require(false, stub_error);
- from;
- tokenId;
dummy = 0;
}
- // @notice Returns next free RFT ID.
+ // Check that account is the owner or admin of the collection
//
- // Selector: nextTokenId() 75794a3c
- function nextTokenId() public view returns (uint256) {
- require(false, stub_error);
- dummy;
- return 0;
- }
-
- // @notice Function to mint multiple tokens.
- // @dev `tokenIds` should be an array of consecutive numbers and first number
- // should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokenIds IDs of the minted RFTs
+ // @return "true" if account is the owner or admin
//
- // Selector: mintBulk(address,uint256[]) 44a9945e
- function mintBulk(address to, uint256[] memory tokenIds)
- public
- returns (bool)
- {
+ // Selector: verifyOwnerOrAdmin() 04a46053
+ function verifyOwnerOrAdmin() public returns (bool) {
require(false, stub_error);
- to;
- tokenIds;
dummy = 0;
return false;
}
- // @notice Function to mint multiple tokens with the given tokenUris.
- // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
- // numbers and first number should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokens array of pairs of token ID and token URI for minted tokens
+ // Returns collection type
//
- // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
- function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
- public
- returns (bool)
- {
+ // @return `Fungible` or `NFT` or `ReFungible`
+ //
+ // Selector: uniqueCollectionType() d34b55b8
+ function uniqueCollectionType() public returns (string memory) {
require(false, stub_error);
- to;
- tokens;
dummy = 0;
- return false;
+ return "";
}
}
pallets/refungible/src/stubs/UniqueRefungibleToken.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
@@ -31,6 +31,38 @@
);
}
+// Selector: 042f1106
+contract ERC1633UniqueExtensions is Dummy, ERC165 {
+ // Selector: setParentNFT(address,uint256) 042f1106
+ function setParentNFT(address collection, uint256 nftId)
+ public
+ returns (bool)
+ {
+ require(false, stub_error);
+ collection;
+ nftId;
+ dummy = 0;
+ return false;
+ }
+}
+
+// Selector: 5755c3f2
+contract ERC1633 is Dummy, ERC165 {
+ // Selector: parentToken() 80a54001
+ function parentToken() public view returns (address) {
+ require(false, stub_error);
+ dummy;
+ return 0x0000000000000000000000000000000000000000;
+ }
+
+ // Selector: parentTokenId() d7f083f3
+ function parentTokenId() public view returns (uint256) {
+ require(false, stub_error);
+ dummy;
+ return 0;
+ }
+}
+
// Selector: 942e8b22
contract ERC20 is Dummy, ERC165, ERC20Events {
// @return the name of the token.
@@ -178,4 +210,11 @@
}
}
-contract UniqueRefungibleToken is Dummy, ERC165, ERC20, ERC20UniqueExtensions {}
+contract UniqueRefungibleToken is
+ Dummy,
+ ERC165,
+ ERC20,
+ ERC20UniqueExtensions,
+ ERC1633,
+ ERC1633UniqueExtensions
+{}
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -3,7 +3,7 @@
//! Autogenerated weights for pallet_refungible
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2022-07-20, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2022-08-01, STEPS: `50`, REPEAT: 80, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! EXECUTION: None, WASM-EXECUTION: Compiled, CHAIN: None, DB CACHE: 1024
// Executed Command:
@@ -53,6 +53,8 @@
fn set_token_properties(b: u32, ) -> Weight;
fn delete_token_properties(b: u32, ) -> Weight;
fn repartition_item() -> Weight;
+ fn set_parent_nft_unchecked() -> Weight;
+ fn token_owner() -> Weight;
}
/// Weights for pallet_refungible using the Substrate node and recommended hardware.
@@ -65,7 +67,7 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (21_310_000 as Weight)
+ (25_197_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
@@ -76,9 +78,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (9_552_000 as Weight)
+ (10_852_000 as Weight)
// Standard Error: 2_000
- .saturating_add((7_056_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((8_087_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
.saturating_add(T::DbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
@@ -90,9 +92,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
- (4_857_000 as Weight)
+ (9_978_000 as Weight)
// Standard Error: 2_000
- .saturating_add((9_838_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((10_848_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
@@ -105,9 +107,9 @@
// Storage: Refungible Balance (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
- (11_335_000 as Weight)
+ (15_419_000 as Weight)
// Standard Error: 2_000
- .saturating_add((6_784_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((7_813_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
@@ -118,7 +120,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_partial() -> Weight {
- (21_239_000 as Weight)
+ (25_578_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -130,13 +132,13 @@
// Storage: Refungible Owned (r:0 w:1)
// Storage: Refungible TokenProperties (r:0 w:1)
fn burn_item_fully() -> Weight {
- (29_426_000 as Weight)
+ (33_593_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(7 as Weight))
}
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
- (17_743_000 as Weight)
+ (21_049_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
@@ -144,7 +146,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_creating() -> Weight {
- (20_699_000 as Weight)
+ (24_646_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -152,7 +154,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_removing() -> Weight {
- (22_833_000 as Weight)
+ (26_570_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(4 as Weight))
}
@@ -160,21 +162,21 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_creating_removing() -> Weight {
- (24_936_000 as Weight)
+ (28_906_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(6 as Weight))
}
// Storage: Refungible Balance (r:1 w:0)
// Storage: Refungible Allowance (r:0 w:1)
fn approve() -> Weight {
- (13_446_000 as Weight)
+ (16_451_000 as Weight)
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Refungible Allowance (r:1 w:1)
// Storage: Refungible Balance (r:2 w:2)
fn transfer_from_normal() -> Weight {
- (24_777_000 as Weight)
+ (29_545_000 as Weight)
.saturating_add(T::DbWeight::get().reads(3 as Weight))
.saturating_add(T::DbWeight::get().writes(3 as Weight))
}
@@ -183,7 +185,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_creating() -> Weight {
- (28_483_000 as Weight)
+ (33_392_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -192,7 +194,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_removing() -> Weight {
- (29_896_000 as Weight)
+ (35_446_000 as Weight)
.saturating_add(T::DbWeight::get().reads(4 as Weight))
.saturating_add(T::DbWeight::get().writes(5 as Weight))
}
@@ -201,7 +203,7 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_from_creating_removing() -> Weight {
- (32_070_000 as Weight)
+ (37_762_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(7 as Weight))
}
@@ -214,15 +216,15 @@
// Storage: Refungible Owned (r:0 w:1)
// Storage: Refungible TokenProperties (r:0 w:1)
fn burn_from() -> Weight {
- (36_789_000 as Weight)
+ (42_620_000 as Weight)
.saturating_add(T::DbWeight::get().reads(5 as Weight))
.saturating_add(T::DbWeight::get().writes(8 as Weight))
}
// Storage: Common CollectionPropertyPermissions (r:1 w:1)
fn set_token_property_permissions(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 62_000
- .saturating_add((15_803_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 65_000
+ .saturating_add((16_513_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(1 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -230,8 +232,8 @@
// Storage: Refungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_668_000
- .saturating_add((302_308_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_583_000
+ .saturating_add((291_392_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
@@ -239,18 +241,31 @@
// Storage: Refungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_619_000
- .saturating_add((294_574_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_699_000
+ .saturating_add((293_270_000 as Weight).saturating_mul(b as Weight))
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(1 as Weight))
}
// Storage: Refungible TotalSupply (r:1 w:1)
// Storage: Refungible Balance (r:1 w:1)
fn repartition_item() -> Weight {
- (8_325_000 as Weight)
+ (19_206_000 as Weight)
.saturating_add(T::DbWeight::get().reads(2 as Weight))
.saturating_add(T::DbWeight::get().writes(2 as Weight))
}
+ // Storage: Refungible Balance (r:1 w:0)
+ // Storage: Refungible TotalSupply (r:1 w:0)
+ // Storage: Refungible TokenProperties (r:1 w:1)
+ fn set_parent_nft_unchecked() -> Weight {
+ (10_189_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(3 as Weight))
+ .saturating_add(T::DbWeight::get().writes(1 as Weight))
+ }
+ // Storage: Refungible Balance (r:2 w:0)
+ fn token_owner() -> Weight {
+ (8_205_000 as Weight)
+ .saturating_add(T::DbWeight::get().reads(2 as Weight))
+ }
}
// For backwards compatibility and tests
@@ -262,7 +277,7 @@
// Storage: Refungible TokenData (r:0 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn create_item() -> Weight {
- (21_310_000 as Weight)
+ (25_197_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
@@ -273,9 +288,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items(b: u32, ) -> Weight {
- (9_552_000 as Weight)
+ (10_852_000 as Weight)
// Standard Error: 2_000
- .saturating_add((7_056_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((8_087_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
.saturating_add(RocksDbWeight::get().writes((4 as Weight).saturating_mul(b as Weight)))
@@ -287,9 +302,9 @@
// Storage: Refungible TokenData (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_items(b: u32, ) -> Weight {
- (4_857_000 as Weight)
+ (9_978_000 as Weight)
// Standard Error: 2_000
- .saturating_add((9_838_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((10_848_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
@@ -302,9 +317,9 @@
// Storage: Refungible Balance (r:0 w:4)
// Storage: Refungible Owned (r:0 w:4)
fn create_multiple_items_ex_multiple_owners(b: u32, ) -> Weight {
- (11_335_000 as Weight)
+ (15_419_000 as Weight)
// Standard Error: 2_000
- .saturating_add((6_784_000 as Weight).saturating_mul(b as Weight))
+ .saturating_add((7_813_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().reads((1 as Weight).saturating_mul(b as Weight)))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
@@ -315,7 +330,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn burn_item_partial() -> Weight {
- (21_239_000 as Weight)
+ (25_578_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -327,13 +342,13 @@
// Storage: Refungible Owned (r:0 w:1)
// Storage: Refungible TokenProperties (r:0 w:1)
fn burn_item_fully() -> Weight {
- (29_426_000 as Weight)
+ (33_593_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(7 as Weight))
}
// Storage: Refungible Balance (r:2 w:2)
fn transfer_normal() -> Weight {
- (17_743_000 as Weight)
+ (21_049_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
@@ -341,7 +356,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_creating() -> Weight {
- (20_699_000 as Weight)
+ (24_646_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -349,7 +364,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_removing() -> Weight {
- (22_833_000 as Weight)
+ (26_570_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(4 as Weight))
}
@@ -357,21 +372,21 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_creating_removing() -> Weight {
- (24_936_000 as Weight)
+ (28_906_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(6 as Weight))
}
// Storage: Refungible Balance (r:1 w:0)
// Storage: Refungible Allowance (r:0 w:1)
fn approve() -> Weight {
- (13_446_000 as Weight)
+ (16_451_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Refungible Allowance (r:1 w:1)
// Storage: Refungible Balance (r:2 w:2)
fn transfer_from_normal() -> Weight {
- (24_777_000 as Weight)
+ (29_545_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(3 as Weight))
.saturating_add(RocksDbWeight::get().writes(3 as Weight))
}
@@ -380,7 +395,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_creating() -> Weight {
- (28_483_000 as Weight)
+ (33_392_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -389,7 +404,7 @@
// Storage: Refungible AccountBalance (r:1 w:1)
// Storage: Refungible Owned (r:0 w:1)
fn transfer_from_removing() -> Weight {
- (29_896_000 as Weight)
+ (35_446_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(4 as Weight))
.saturating_add(RocksDbWeight::get().writes(5 as Weight))
}
@@ -398,7 +413,7 @@
// Storage: Refungible AccountBalance (r:2 w:2)
// Storage: Refungible Owned (r:0 w:2)
fn transfer_from_creating_removing() -> Weight {
- (32_070_000 as Weight)
+ (37_762_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(7 as Weight))
}
@@ -411,15 +426,15 @@
// Storage: Refungible Owned (r:0 w:1)
// Storage: Refungible TokenProperties (r:0 w:1)
fn burn_from() -> Weight {
- (36_789_000 as Weight)
+ (42_620_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(5 as Weight))
.saturating_add(RocksDbWeight::get().writes(8 as Weight))
}
// Storage: Common CollectionPropertyPermissions (r:1 w:1)
fn set_token_property_permissions(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 62_000
- .saturating_add((15_803_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 65_000
+ .saturating_add((16_513_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(1 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -427,8 +442,8 @@
// Storage: Refungible TokenProperties (r:1 w:1)
fn set_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_668_000
- .saturating_add((302_308_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_583_000
+ .saturating_add((291_392_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
@@ -436,16 +451,29 @@
// Storage: Refungible TokenProperties (r:1 w:1)
fn delete_token_properties(b: u32, ) -> Weight {
(0 as Weight)
- // Standard Error: 1_619_000
- .saturating_add((294_574_000 as Weight).saturating_mul(b as Weight))
+ // Standard Error: 1_699_000
+ .saturating_add((293_270_000 as Weight).saturating_mul(b as Weight))
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(1 as Weight))
}
// Storage: Refungible TotalSupply (r:1 w:1)
// Storage: Refungible Balance (r:1 w:1)
fn repartition_item() -> Weight {
- (8_325_000 as Weight)
+ (19_206_000 as Weight)
.saturating_add(RocksDbWeight::get().reads(2 as Weight))
.saturating_add(RocksDbWeight::get().writes(2 as Weight))
}
+ // Storage: Refungible Balance (r:1 w:0)
+ // Storage: Refungible TotalSupply (r:1 w:0)
+ // Storage: Refungible TokenProperties (r:1 w:1)
+ fn set_parent_nft_unchecked() -> Weight {
+ (10_189_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(3 as Weight))
+ .saturating_add(RocksDbWeight::get().writes(1 as Weight))
+ }
+ // Storage: Refungible Balance (r:2 w:0)
+ fn token_owner() -> Weight {
+ (8_205_000 as Weight)
+ .saturating_add(RocksDbWeight::get().reads(2 as Weight))
+ }
}
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -17,26 +17,29 @@
//! Implementation of CollectionHelpers contract.
use core::marker::PhantomData;
-use evm_coder::{execution::*, generate_stubgen, solidity_interface, solidity, weight, types::*};
use ethereum as _;
-use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
-use pallet_evm::{OnMethodCall, PrecompileResult, account::CrossAccountId, PrecompileHandle};
-use up_data_structs::{
- CollectionName, CollectionDescription, CollectionTokenPrefix, CreateCollectionData,
- CollectionMode, PropertyValue,
-};
+use evm_coder::{execution::*, generate_stubgen, solidity_interface, solidity, weight, types::*};
use frame_support::traits::Get;
use pallet_common::{
- CollectionById,
+ CollectionById, CollectionHandle,
+ dispatch::CollectionDispatch,
erc::{
+ CollectionHelpersEvents,
static_property::{key, value as property_value},
- CollectionHelpersEvents,
},
- dispatch::CollectionDispatch,
+ Pallet as PalletCommon,
};
-use crate::{SelfWeightOf, Config, weights::WeightInfo};
+use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
+use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
+use pallet_evm_coder_substrate::dispatch_to_evm;
+use up_data_structs::{
+ CollectionName, CollectionDescription, CollectionTokenPrefix, CreateCollectionData,
+ CollectionMode, PropertyKeyPermission, PropertyPermission, PropertyScope, PropertyValue,
+};
+
+use crate::{Config, SelfWeightOf, weights::WeightInfo};
-use sp_std::vec::Vec;
+use sp_std::{vec, vec::Vec};
use alloc::format;
/// See [`CollectionHelpersCall`]
@@ -151,6 +154,54 @@
Ok(data)
}
+fn parent_nft_property_permissions() -> PropertyKeyPermission {
+ PropertyKeyPermission {
+ key: key::parent_nft(),
+ permission: PropertyPermission {
+ mutable: false,
+ collection_admin: false,
+ token_owner: true,
+ },
+ }
+}
+
+fn create_refungible_collection_internal<
+ T: Config + pallet_nonfungible::Config + pallet_refungible::Config,
+>(
+ caller: caller,
+ name: string,
+ description: string,
+ token_prefix: string,
+ base_uri: string,
+ add_properties: bool,
+) -> Result<address> {
+ let (caller, name, description, token_prefix, base_uri_value) =
+ convert_data::<T>(caller, name, description, token_prefix, base_uri)?;
+ let data = make_data::<T>(
+ name,
+ CollectionMode::ReFungible,
+ description,
+ token_prefix,
+ base_uri_value,
+ add_properties,
+ )?;
+
+ let collection_id = T::CollectionDispatch::create(caller.clone(), data)
+ .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
+
+ let handle = <CollectionHandle<T>>::try_get(collection_id).map_err(dispatch_to_evm::<T>)?;
+ <PalletCommon<T>>::set_scoped_token_property_permissions(
+ &handle,
+ &caller,
+ PropertyScope::Eth,
+ vec![parent_nft_property_permissions()],
+ )
+ .map_err(dispatch_to_evm::<T>)?;
+
+ let address = pallet_common::eth::collection_id_to_address(collection_id);
+ Ok(address)
+}
+
/// @title Contract, which allows users to operate with collections
#[solidity_interface(name = "CollectionHelpers", events(CollectionHelpersEvents))]
impl<T> EvmCollectionHelpers<T>
@@ -216,27 +267,20 @@
#[weight(<SelfWeightOf<T>>::create_collection())]
fn create_refungible_collection(
- &self,
+ &mut self,
caller: caller,
name: string,
description: string,
token_prefix: string,
) -> Result<address> {
- let (caller, name, description, token_prefix, _base_uri) =
- convert_data::<T>(caller, name, description, token_prefix, "".into())?;
- let data = make_data::<T>(
+ create_refungible_collection_internal::<T>(
+ caller,
name,
- CollectionMode::ReFungible,
description,
token_prefix,
Default::default(),
false,
- )?;
- let collection_id = T::CollectionDispatch::create(caller, data)
- .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
-
- let address = pallet_common::eth::collection_id_to_address(collection_id);
- Ok(address)
+ )
}
#[weight(<SelfWeightOf<T>>::create_collection())]
@@ -249,21 +293,14 @@
token_prefix: string,
base_uri: string,
) -> Result<address> {
- let (caller, name, description, token_prefix, base_uri_value) =
- convert_data::<T>(caller, name, description, token_prefix, base_uri)?;
- let data = make_data::<T>(
+ create_refungible_collection_internal::<T>(
+ caller,
name,
- CollectionMode::NFT,
description,
token_prefix,
- base_uri_value,
+ base_uri,
true,
- )?;
- let collection_id = T::CollectionDispatch::create(caller, data)
- .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
-
- let address = pallet_common::eth::collection_id_to_address(collection_id);
- Ok(address)
+ )
}
/// Check if a collection exists
pallets/unique/src/eth/stubs/CollectionHelpers.soldiffbeforeafterboth--- a/pallets/unique/src/eth/stubs/CollectionHelpers.sol
+++ b/pallets/unique/src/eth/stubs/CollectionHelpers.sol
@@ -72,12 +72,12 @@
string memory name,
string memory description,
string memory tokenPrefix
- ) public view returns (address) {
+ ) public returns (address) {
require(false, stub_error);
name;
description;
tokenPrefix;
- dummy;
+ dummy = 0;
return 0x0000000000000000000000000000000000000000;
}
@@ -96,7 +96,7 @@
dummy = 0;
return 0x0000000000000000000000000000000000000000;
}
-
+
// Check if a collection exists
// @param collection_address Address of the collection in question
// @return bool Does the collection exist?
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -1050,6 +1050,7 @@
pub enum PropertyScope {
None,
Rmrk,
+ Eth,
}
impl PropertyScope {
@@ -1058,6 +1059,7 @@
let scope_str: &[u8] = match self {
Self::None => return Ok(key),
Self::Rmrk => b"rmrk",
+ Self::Eth => b"eth",
};
[scope_str, b":", key.as_slice()]
runtime/common/src/weights.rsdiffbeforeafterboth--- a/runtime/common/src/weights.rs
+++ b/runtime/common/src/weights.rs
@@ -99,6 +99,10 @@
fn burn_recursively_breadth_raw(amount: u32) -> Weight {
max_weight_of!(burn_recursively_breadth_raw(amount))
}
+
+ fn token_owner() -> Weight {
+ max_weight_of!(token_owner())
+ }
}
impl<T> RefungibleExtensionsWeightInfo for CommonWeights<T>
tests/src/eth/api/CollectionHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/CollectionHelpers.sol
+++ b/tests/src/eth/api/CollectionHelpers.sol
@@ -48,7 +48,7 @@
string memory name,
string memory description,
string memory tokenPrefix
- ) external view returns (address);
+ ) external returns (address);
// Selector: createERC721MetadataCompatibleRFTCollection(string,string,string,string) a5596388
function createERC721MetadataCompatibleRFTCollection(
@@ -57,7 +57,7 @@
string memory tokenPrefix,
string memory baseUri
) external returns (address);
-
+
// Check if a collection exists
// @param collection_address Address of the collection in question
// @return bool Does the collection exist?
tests/src/eth/api/UniqueFungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueFungible.sol
+++ b/tests/src/eth/api/UniqueFungible.sol
@@ -28,7 +28,44 @@
function burnFrom(address from, uint256 amount) external returns (bool);
}
-// Selector: 7d9262e6
+// Selector: 942e8b22
+interface ERC20 is Dummy, ERC165, ERC20Events {
+ // Selector: name() 06fdde03
+ function name() external view returns (string memory);
+
+ // Selector: symbol() 95d89b41
+ function symbol() external view returns (string memory);
+
+ // Selector: totalSupply() 18160ddd
+ function totalSupply() external view returns (uint256);
+
+ // Selector: decimals() 313ce567
+ function decimals() external view returns (uint8);
+
+ // Selector: balanceOf(address) 70a08231
+ function balanceOf(address owner) external view returns (uint256);
+
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 amount) external returns (bool);
+
+ // Selector: transferFrom(address,address,uint256) 23b872dd
+ function transferFrom(
+ address from,
+ address to,
+ uint256 amount
+ ) external returns (bool);
+
+ // Selector: approve(address,uint256) 095ea7b3
+ function approve(address spender, uint256 amount) external returns (bool);
+
+ // Selector: allowance(address,address) dd62ed3e
+ function allowance(address owner, address spender)
+ external
+ view
+ returns (uint256);
+}
+
+// Selector: aa7d570d
interface Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -174,43 +211,16 @@
//
// Selector: setCollectionMintMode(bool) 00018e84
function setCollectionMintMode(bool mode) external;
-}
-// Selector: 942e8b22
-interface ERC20 is Dummy, ERC165, ERC20Events {
- // Selector: name() 06fdde03
- function name() external view returns (string memory);
-
- // Selector: symbol() 95d89b41
- function symbol() external view returns (string memory);
-
- // Selector: totalSupply() 18160ddd
- function totalSupply() external view returns (uint256);
-
- // Selector: decimals() 313ce567
- function decimals() external view returns (uint8);
-
- // Selector: balanceOf(address) 70a08231
- function balanceOf(address owner) external view returns (uint256);
-
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 amount) external returns (bool);
-
- // Selector: transferFrom(address,address,uint256) 23b872dd
- function transferFrom(
- address from,
- address to,
- uint256 amount
- ) external returns (bool);
+ // Check that account is the owner or admin of the collection
+ //
+ // @return "true" if account is the owner or admin
+ //
+ // Selector: verifyOwnerOrAdmin() 04a46053
+ function verifyOwnerOrAdmin() external returns (bool);
- // Selector: approve(address,uint256) 095ea7b3
- function approve(address spender, uint256 amount) external returns (bool);
-
- // Selector: allowance(address,address) dd62ed3e
- function allowance(address owner, address spender)
- external
- view
- returns (uint256);
+ // Selector: uniqueCollectionType() d34b55b8
+ function uniqueCollectionType() external returns (string memory);
}
interface UniqueFungible is
tests/src/eth/api/UniqueNFT.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueNFT.sol
+++ b/tests/src/eth/api/UniqueNFT.sol
@@ -276,7 +276,7 @@
function totalSupply() external view returns (uint256);
}
-// Selector: 7d9262e6
+// Selector: aa7d570d
interface Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -422,6 +422,16 @@
//
// Selector: setCollectionMintMode(bool) 00018e84
function setCollectionMintMode(bool mode) external;
+
+ // Check that account is the owner or admin of the collection
+ //
+ // @return "true" if account is the owner or admin
+ //
+ // Selector: verifyOwnerOrAdmin() 04a46053
+ function verifyOwnerOrAdmin() external returns (bool);
+
+ // Selector: uniqueCollectionType() d34b55b8
+ function uniqueCollectionType() external returns (string memory);
}
// Selector: d74d154f
tests/src/eth/api/UniqueRefungible.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungible.sol
+++ b/tests/src/eth/api/UniqueRefungible.sol
@@ -274,7 +274,70 @@
function totalSupply() external view returns (uint256);
}
-// Selector: 7d9262e6
+// Selector: 7c3bef89
+interface ERC721UniqueExtensions is Dummy, ERC165 {
+ // @notice Transfer ownership of an RFT
+ // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
+ // is the zero address. Throws if `tokenId` is not a valid RFT.
+ // Throws if RFT pieces have multiple owners.
+ // @param to The new owner
+ // @param tokenId The RFT to transfer
+ // @param _value Not used for an RFT
+ //
+ // Selector: transfer(address,uint256) a9059cbb
+ function transfer(address to, uint256 tokenId) external;
+
+ // @notice Burns a specific ERC721 token.
+ // @dev Throws unless `msg.sender` is the current owner or an authorized
+ // operator for this RFT. Throws if `from` is not the current owner. Throws
+ // if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
+ // Throws if RFT pieces have multiple owners.
+ // @param from The current owner of the RFT
+ // @param tokenId The RFT to transfer
+ // @param _value Not used for an RFT
+ //
+ // Selector: burnFrom(address,uint256) 79cc6790
+ function burnFrom(address from, uint256 tokenId) external;
+
+ // @notice Returns next free RFT ID.
+ //
+ // Selector: nextTokenId() 75794a3c
+ function nextTokenId() external view returns (uint256);
+
+ // @notice Function to mint multiple tokens.
+ // @dev `tokenIds` should be an array of consecutive numbers and first number
+ // should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokenIds IDs of the minted RFTs
+ //
+ // Selector: mintBulk(address,uint256[]) 44a9945e
+ function mintBulk(address to, uint256[] memory tokenIds)
+ external
+ returns (bool);
+
+ // @notice Function to mint multiple tokens with the given tokenUris.
+ // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
+ // numbers and first number should be obtained with `nextTokenId` method
+ // @param to The new owner
+ // @param tokens array of pairs of token ID and token URI for minted tokens
+ //
+ // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
+ function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
+ external
+ returns (bool);
+
+ // Returns EVM address for refungible token
+ //
+ // @param token ID of the token
+ //
+ // Selector: tokenContractAddress(uint256) ab76fac6
+ function tokenContractAddress(uint256 token)
+ external
+ view
+ returns (address);
+}
+
+// Selector: aa7d570d
interface Collection is Dummy, ERC165 {
// Set collection property.
//
@@ -420,59 +483,20 @@
//
// Selector: setCollectionMintMode(bool) 00018e84
function setCollectionMintMode(bool mode) external;
-}
-// Selector: d74d154f
-interface ERC721UniqueExtensions is Dummy, ERC165 {
- // @notice Transfer ownership of an RFT
- // @dev Throws unless `msg.sender` is the current owner. Throws if `to`
- // is the zero address. Throws if `tokenId` is not a valid RFT.
- // Throws if RFT pieces have multiple owners.
- // @param to The new owner
- // @param tokenId The RFT to transfer
- // @param _value Not used for an RFT
+ // Check that account is the owner or admin of the collection
//
- // Selector: transfer(address,uint256) a9059cbb
- function transfer(address to, uint256 tokenId) external;
-
- // @notice Burns a specific ERC721 token.
- // @dev Throws unless `msg.sender` is the current owner or an authorized
- // operator for this RFT. Throws if `from` is not the current owner. Throws
- // if `to` is the zero address. Throws if `tokenId` is not a valid RFT.
- // Throws if RFT pieces have multiple owners.
- // @param from The current owner of the RFT
- // @param tokenId The RFT to transfer
- // @param _value Not used for an RFT
+ // @return "true" if account is the owner or admin
//
- // Selector: burnFrom(address,uint256) 79cc6790
- function burnFrom(address from, uint256 tokenId) external;
+ // Selector: verifyOwnerOrAdmin() 04a46053
+ function verifyOwnerOrAdmin() external returns (bool);
- // @notice Returns next free RFT ID.
+ // Returns collection type
//
- // Selector: nextTokenId() 75794a3c
- function nextTokenId() external view returns (uint256);
-
- // @notice Function to mint multiple tokens.
- // @dev `tokenIds` should be an array of consecutive numbers and first number
- // should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokenIds IDs of the minted RFTs
+ // @return `Fungible` or `NFT` or `ReFungible`
//
- // Selector: mintBulk(address,uint256[]) 44a9945e
- function mintBulk(address to, uint256[] memory tokenIds)
- external
- returns (bool);
-
- // @notice Function to mint multiple tokens with the given tokenUris.
- // @dev `tokenIds` is array of pairs of token ID and token URI. Token IDs should be consecutive
- // numbers and first number should be obtained with `nextTokenId` method
- // @param to The new owner
- // @param tokens array of pairs of token ID and token URI for minted tokens
- //
- // Selector: mintBulkWithTokenURI(address,(uint256,string)[]) 36543006
- function mintBulkWithTokenURI(address to, Tuple0[] memory tokens)
- external
- returns (bool);
+ // Selector: uniqueCollectionType() d34b55b8
+ function uniqueCollectionType() external returns (string memory);
}
interface UniqueRefungible is
tests/src/eth/api/UniqueRefungibleToken.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungibleToken.sol
+++ b/tests/src/eth/api/UniqueRefungibleToken.sol
@@ -22,6 +22,23 @@
);
}
+// Selector: 042f1106
+interface ERC1633UniqueExtensions is Dummy, ERC165 {
+ // Selector: setParentNFT(address,uint256) 042f1106
+ function setParentNFT(address collection, uint256 nftId)
+ external
+ returns (bool);
+}
+
+// Selector: 5755c3f2
+interface ERC1633 is Dummy, ERC165 {
+ // Selector: parentToken() 80a54001
+ function parentToken() external view returns (address);
+
+ // Selector: parentTokenId() d7f083f3
+ function parentTokenId() external view returns (uint256);
+}
+
// Selector: 942e8b22
interface ERC20 is Dummy, ERC165, ERC20Events {
// @return the name of the token.
@@ -115,5 +132,7 @@
Dummy,
ERC165,
ERC20,
- ERC20UniqueExtensions
+ ERC20UniqueExtensions,
+ ERC1633,
+ ERC1633UniqueExtensions
{}
tests/src/eth/reFungibleAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleAbi.json
+++ b/tests/src/eth/reFungibleAbi.json
@@ -482,6 +482,15 @@
},
{
"inputs": [
+ { "internalType": "uint256", "name": "token", "type": "uint256" }
+ ],
+ "name": "tokenContractAddress",
+ "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "address", "name": "owner", "type": "address" },
{ "internalType": "uint256", "name": "index", "type": "uint256" }
],
@@ -526,5 +535,19 @@
"outputs": [],
"stateMutability": "nonpayable",
"type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "uniqueCollectionType",
+ "outputs": [{ "internalType": "string", "name": "", "type": "string" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "verifyOwnerOrAdmin",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
}
]
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth--- a/tests/src/eth/reFungibleToken.test.ts
+++ b/tests/src/eth/reFungibleToken.test.ts
@@ -15,7 +15,7 @@
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
import {approve, createCollection, createRefungibleToken, transfer, transferFrom, UNIQUE} from '../util/helpers';
-import {collectionIdToAddress, createEthAccount, createEthAccountWithBalance, evmCollection, evmCollectionHelpers, GAS_ARGS, getCollectionAddressFromResult, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, tokenIdToAddress, transferBalanceToEth} from './util/helpers';
+import {collectionIdFromAddress, collectionIdToAddress, createEthAccount, createEthAccountWithBalance, createNonfungibleCollection, createRefungibleCollection, evmCollection, evmCollectionHelpers, GAS_ARGS, getCollectionAddressFromResult, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, tokenIdToAddress, transferBalanceToEth, uniqueNFT, uniqueRefungible, uniqueRefungibleToken} from './util/helpers';
import reFungibleTokenAbi from './reFungibleTokenAbi.json';
import chai from 'chai';
@@ -630,3 +630,31 @@
]);
});
});
+
+describe('ERC 1633 implementation', () => {
+ itWeb3('Parent NFT token address and id', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+
+ const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);
+ const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);
+ const nftTokenId = await nftContract.methods.nextTokenId().call();
+ await nftContract.methods.mint(owner, nftTokenId).send();
+ const nftCollectionId = collectionIdFromAddress(nftCollectionAddress);
+
+ const {collectionIdAddress, collectionId} = await createRefungibleCollection(api, web3, owner);
+ const refungibleContract = uniqueRefungible(web3, collectionIdAddress, owner);
+ const refungibleTokenId = await refungibleContract.methods.nextTokenId().call();
+ await refungibleContract.methods.mint(owner, refungibleTokenId).send();
+
+ const rftTokenAddress = tokenIdToAddress(collectionId, refungibleTokenId);
+ const refungibleTokenContract = uniqueRefungibleToken(web3, rftTokenAddress, owner);
+ await refungibleTokenContract.methods.setParentNFT(nftCollectionAddress, nftTokenId).send();
+
+ const tokenAddress = await refungibleTokenContract.methods.parentToken().call();
+ const tokenId = await refungibleTokenContract.methods.parentTokenId().call();
+ const nftTokenAddress = tokenIdToAddress(nftCollectionId, nftTokenId);
+ expect(tokenAddress).to.be.equal(nftTokenAddress);
+ expect(tokenId).to.be.equal(nftTokenId);
+ });
+});
+
tests/src/eth/reFungibleTokenAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleTokenAbi.json
+++ b/tests/src/eth/reFungibleTokenAbi.json
@@ -103,6 +103,20 @@
"type": "function"
},
{
+ "inputs": [],
+ "name": "parentToken",
+ "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
+ "inputs": [],
+ "name": "parentTokenId",
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
+ "stateMutability": "view",
+ "type": "function"
+ },
+ {
"inputs": [
{ "internalType": "uint256", "name": "amount", "type": "uint256" }
],
@@ -113,6 +127,16 @@
},
{
"inputs": [
+ { "internalType": "address", "name": "collection", "type": "address" },
+ { "internalType": "uint256", "name": "nftId", "type": "uint256" }
+ ],
+ "name": "setParentNFT",
+ "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
+ "stateMutability": "nonpayable",
+ "type": "function"
+ },
+ {
+ "inputs": [
{ "internalType": "bytes4", "name": "interfaceID", "type": "bytes4" }
],
"name": "supportsInterface",