difftreelog
Merge pull request #542 from UniqueNetwork/fix/RFT_and_fractionalizer
in: master
14 files changed
pallets/refungible/src/benchmarking.rsdiffbeforeafterboth--- a/pallets/refungible/src/benchmarking.rs
+++ b/pallets/refungible/src/benchmarking.rs
@@ -281,15 +281,6 @@
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);
pallets/refungible/src/erc_token.rsdiffbeforeafterboth--- a/pallets/refungible/src/erc_token.rs
+++ b/pallets/refungible/src/erc_token.rs
@@ -29,22 +29,21 @@
convert::TryInto,
ops::Deref,
};
-use evm_coder::{ToLog, execution::*, generate_stubgen, solidity, solidity_interface, types::*, weight};
+use evm_coder::{ToLog, execution::*, generate_stubgen, solidity_interface, types::*, weight};
use pallet_common::{
CommonWeightInfo,
- erc::{CommonEvmHandler, PrecompileResult, static_property::key},
- eth::map_eth_to_id,
+ erc::{CommonEvmHandler, PrecompileResult},
+ eth::collection_id_to_address,
};
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::{mapping::TokenAddressMapping, PropertyScope, TokenId};
+use up_data_structs::TokenId;
use crate::{
Allowance, Balance, common::CommonWeights, Config, Pallet, RefungibleHandle, SelfWeightOf,
- TokenProperties, TotalSupply, weights::WeightInfo,
+ TotalSupply, weights::WeightInfo,
};
pub struct RefungibleTokenHandle<T: Config>(pub RefungibleHandle<T>, pub TokenId);
@@ -52,63 +51,14 @@
#[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");
- if let Some(value) = props.get(&key_scoped) {
- Ok(H160::from_slice(value.as_slice()))
- } else {
- Ok(*T::CrossTokenAddressMapping::token_to_address(self.id, self.1).as_eth())
- }
+ Ok(collection_id_to_address(self.id))
}
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");
- if let Some(value) = props.get(&key_scoped) {
- 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())
- } else {
- Ok(self.1.into())
- }
+ Ok(self.1.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
@@ -307,7 +257,7 @@
#[solidity_interface(
name = UniqueRefungibleToken,
- is(ERC20, ERC20UniqueExtensions, ERC1633, ERC1633UniqueExtensions)
+ is(ERC20, ERC20UniqueExtensions, ERC1633)
)]
impl<T: Config> RefungibleTokenHandle<T> where T::AccountId: From<[u8; 32]> {}
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -1379,68 +1379,4 @@
Some(res)
}
}
-
- /// Sets the NFT token as a parent for the RFT token
- ///
- /// Throws if `sender` is not the owner of the NFT token.
- /// Throws if `sender` is not the owner of all of the RFT token pieces.
- pub fn set_parent_nft(
- collection: &RefungibleHandle<T>,
- rft_token_id: TokenId,
- sender: T::CrossAccountId,
- nft_collection: CollectionId,
- nft_token: TokenId,
- ) -> DispatchResult {
- let handle = <CollectionHandle<T>>::try_get(nft_collection)?;
- if handle.mode != CollectionMode::NFT {
- return Err("Only NFT token could be parent to RFT".into());
- }
- let dispatch = T::CollectionDispatch::dispatch(handle);
- let dispatch = dispatch.as_dyn();
-
- let owner = dispatch.token_owner(nft_token).ok_or("owner not found")?;
- if owner != sender {
- return Err("Only owned token could be set as parent".into());
- }
-
- let nft_token_address =
- T::CrossTokenAddressMapping::token_to_address(nft_collection, nft_token);
-
- Self::set_parent_nft_unchecked(collection, rft_token_id, sender, nft_token_address)
- }
-
- /// Sets the NFT token as a parent for the RFT token
- ///
- /// `sender` should be the owner of the NFT token.
- /// Throws if `sender` is not the owner of all of the RFT token pieces.
- pub fn set_parent_nft_unchecked(
- collection: &RefungibleHandle<T>,
- rft_token_id: TokenId,
- sender: T::CrossAccountId,
- nft_token_address: T::CrossAccountId,
- ) -> DispatchResult {
- let owner_balance = <Balance<T>>::get((collection.id, rft_token_id, &sender));
- let total_supply = <TotalSupply<T>>::get((collection.id, rft_token_id));
- if total_supply != owner_balance {
- return Err("token has multiple owners".into());
- }
-
- let parent_nft_property_key = key::parent_nft();
-
- let parent_nft_property_value =
- property_value_from_bytes(&nft_token_address.as_eth().to_fixed_bytes())
- .expect("address should fit in value length limit");
-
- <Pallet<T>>::set_scoped_token_property(
- collection.id,
- rft_token_id,
- PropertyScope::Eth,
- Property {
- key: parent_nft_property_key,
- value: parent_nft_property_value,
- },
- )?;
-
- Ok(())
- }
}
pallets/refungible/src/stubs/UniqueRefungibleToken.rawdiffbeforeafterbothbinary blob — no preview
pallets/refungible/src/stubs/UniqueRefungibleToken.soldiffbeforeafterboth--- a/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
+++ b/pallets/refungible/src/stubs/UniqueRefungibleToken.sol
@@ -21,22 +21,6 @@
}
}
-/// @dev the ERC-165 identifier for this interface is 0x042f1106
-contract ERC1633UniqueExtensions is Dummy, ERC165 {
- /// @dev EVM selector for this function is: 0x042f1106,
- /// or in textual repr: setParentNFT(address,uint256)
- function setParentNFT(address collection, uint256 nftId)
- public
- returns (bool)
- {
- require(false, stub_error);
- collection;
- nftId;
- dummy = 0;
- return false;
- }
-}
-
/// @dev the ERC-165 identifier for this interface is 0x5755c3f2
contract ERC1633 is Dummy, ERC165 {
/// @dev EVM selector for this function is: 0x80a54001,
@@ -222,6 +206,5 @@
ERC165,
ERC20,
ERC20UniqueExtensions,
- ERC1633,
- ERC1633UniqueExtensions
+ ERC1633
{}
pallets/refungible/src/weights.rsdiffbeforeafterboth--- a/pallets/refungible/src/weights.rs
+++ b/pallets/refungible/src/weights.rs
@@ -53,7 +53,6 @@
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;
}
@@ -254,14 +253,6 @@
(22_356_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 {
- (12_015_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 {
@@ -466,14 +457,6 @@
(22_356_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 {
- (12_015_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 {
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -154,17 +154,6 @@
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,
>(
@@ -188,16 +177,6 @@
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)
}
primitives/data-structs/src/lib.rsdiffbeforeafterboth--- a/primitives/data-structs/src/lib.rs
+++ b/primitives/data-structs/src/lib.rs
@@ -1050,7 +1050,6 @@
pub enum PropertyScope {
None,
Rmrk,
- Eth,
}
impl PropertyScope {
@@ -1059,7 +1058,6 @@
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()]
tests/src/eth/api/UniqueRefungibleToken.soldiffbeforeafterboth--- a/tests/src/eth/api/UniqueRefungibleToken.sol
+++ b/tests/src/eth/api/UniqueRefungibleToken.sol
@@ -12,15 +12,6 @@
function supportsInterface(bytes4 interfaceID) external view returns (bool);
}
-/// @dev the ERC-165 identifier for this interface is 0x042f1106
-interface ERC1633UniqueExtensions is Dummy, ERC165 {
- /// @dev EVM selector for this function is: 0x042f1106,
- /// or in textual repr: setParentNFT(address,uint256)
- function setParentNFT(address collection, uint256 nftId)
- external
- returns (bool);
-}
-
/// @dev the ERC-165 identifier for this interface is 0x5755c3f2
interface ERC1633 is Dummy, ERC165 {
/// @dev EVM selector for this function is: 0x80a54001,
@@ -140,6 +131,5 @@
ERC165,
ERC20,
ERC20UniqueExtensions,
- ERC1633,
- ERC1633UniqueExtensions
+ ERC1633
{}
tests/src/eth/base.test.tsdiffbeforeafterboth--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -94,7 +94,7 @@
});
itWeb3('ERC721 support', async ({web3}) => {
- expect(await contract(web3).methods.supportsInterface('0x58800161').call()).to.be.true;
+ expect(await contract(web3).methods.supportsInterface('0x780e9d63').call()).to.be.true;
});
itWeb3('ERC721Metadata support', async ({web3}) => {
tests/src/eth/fractionalizer/Fractionalizer.soldiffbeforeafterboth--- a/tests/src/eth/fractionalizer/Fractionalizer.sol
+++ b/tests/src/eth/fractionalizer/Fractionalizer.sol
@@ -16,8 +16,8 @@
}
address rftCollection;
mapping(address => bool) nftCollectionAllowList;
- mapping(address => mapping(uint256 => uint256)) nft2rftMapping;
- mapping(address => Token) rft2nftMapping;
+ mapping(address => mapping(uint256 => uint256)) public nft2rftMapping;
+ mapping(address => Token) public rft2nftMapping;
bytes32 refungibleCollectionType = keccak256(bytes("ReFungible"));
receive() external payable onlyOwner {}
@@ -137,7 +137,6 @@
rft2nftMapping[rftTokenAddress] = Token(_collection, _token);
rftTokenContract = UniqueRefungibleToken(rftTokenAddress);
- rftTokenContract.setParentNFT(_collection, _token);
} else {
rftTokenId = nft2rftMapping[_collection][_token];
rftTokenAddress = rftCollectionContract.tokenContractAddress(rftTokenId);
tests/src/eth/fractionalizer/fractionalizer.test.tsdiffbeforeafterboth--- a/tests/src/eth/fractionalizer/fractionalizer.test.ts
+++ b/tests/src/eth/fractionalizer/fractionalizer.test.ts
@@ -223,6 +223,28 @@
},
});
});
+
+ itWeb3('Test fractionalizer NFT <-> RFT mapping ', async ({api, web3, privateKeyWrapper}) => {
+ const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);
+
+ const {fractionalizer, rftCollectionAddress} = await initFractionalizer(api, web3, privateKeyWrapper, owner);
+ const {rftTokenAddress, nftCollectionAddress, nftTokenId} = await createRFTToken(api, web3, owner, fractionalizer, 100n);
+
+ const {collectionId, tokenId} = tokenIdFromAddress(rftTokenAddress);
+ const refungibleAddress = collectionIdToAddress(collectionId);
+ expect(rftCollectionAddress).to.be.equal(refungibleAddress);
+ const refungibleTokenContract = uniqueRefungibleToken(web3, rftTokenAddress, owner);
+ await refungibleTokenContract.methods.approve(fractionalizer.options.address, 100).send();
+
+ const rft2nft = await fractionalizer.methods.rft2nftMapping(rftTokenAddress).call();
+ expect(rft2nft).to.be.like({
+ _collection: nftCollectionAddress,
+ _tokenId: nftTokenId,
+ });
+
+ const nft2rft = await fractionalizer.methods.nft2rftMapping(nftCollectionAddress, nftTokenId).call();
+ expect(nft2rft).to.be.eq(tokenId.toString());
+ });
});
tests/src/eth/reFungibleToken.test.tsdiffbeforeafterboth1// 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/>.1617import {approve, createCollection, createRefungibleToken, transfer, transferFrom, UNIQUE, requirePallets, Pallets} from '../util/helpers';18import {collectionIdFromAddress, collectionIdToAddress, createEthAccount, createEthAccountWithBalance, createNonfungibleCollection, createRefungibleCollection, evmCollection, evmCollectionHelpers, getCollectionAddressFromResult, itWeb3, normalizeEvents, recordEthFee, recordEvents, subToEth, tokenIdToAddress, transferBalanceToEth, uniqueNFT, uniqueRefungible, uniqueRefungibleToken} from './util/helpers';1920import chai from 'chai';21import chaiAsPromised from 'chai-as-promised';22chai.use(chaiAsPromised);23const expect = chai.expect;2425describe('Refungible token: Information getting', () => {26 before(async function() {27 await requirePallets(this, [Pallets.ReFungible]);28 });2930 itWeb3('totalSupply', async ({api, web3, privateKeyWrapper}) => {31 const alice = privateKeyWrapper('//Alice');3233 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;3435 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);3637 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: caller})).itemId;3839 const address = tokenIdToAddress(collectionId, tokenId);40 const contract = uniqueRefungibleToken(web3, address, caller);41 const totalSupply = await contract.methods.totalSupply().call();4243 expect(totalSupply).to.equal('200');44 });4546 itWeb3('balanceOf', async ({api, web3, privateKeyWrapper}) => {47 const alice = privateKeyWrapper('//Alice');4849 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;5051 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);5253 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: caller})).itemId;5455 const address = tokenIdToAddress(collectionId, tokenId);56 const contract = uniqueRefungibleToken(web3, address, caller);57 const balance = await contract.methods.balanceOf(caller).call();5859 expect(balance).to.equal('200');60 });6162 itWeb3('decimals', async ({api, web3, privateKeyWrapper}) => {63 const alice = privateKeyWrapper('//Alice');6465 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;6667 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);6869 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: caller})).itemId;7071 const address = tokenIdToAddress(collectionId, tokenId);72 const contract = uniqueRefungibleToken(web3, address, caller);73 const decimals = await contract.methods.decimals().call();7475 expect(decimals).to.equal('0');76 });77});7879// FIXME: Need erc721 for ReFubgible.80describe('Check ERC721 token URI for ReFungible', () => {81 before(async function() {82 await requirePallets(this, [Pallets.ReFungible]);83 });8485 itWeb3('Empty tokenURI', async ({web3, api, privateKeyWrapper}) => {86 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);87 const helper = evmCollectionHelpers(web3, owner);88 let result = await helper.methods.createERC721MetadataCompatibleCollection('Mint collection', '1', '1', '').send();89 const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);90 const receiver = createEthAccount(web3);91 const contract = evmCollection(web3, owner, collectionIdAddress, {type: 'ReFungible'});9293 const nextTokenId = await contract.methods.nextTokenId().call();94 expect(nextTokenId).to.be.equal('1');95 result = await contract.methods.mint(96 receiver,97 nextTokenId,98 ).send();99100 const events = normalizeEvents(result.events);101 const address = collectionIdToAddress(collectionId);102103 expect(events).to.be.deep.equal([104 {105 address,106 event: 'Transfer',107 args: {108 from: '0x0000000000000000000000000000000000000000',109 to: receiver,110 tokenId: nextTokenId,111 },112 },113 ]);114115 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('');116 });117118 itWeb3('TokenURI from url', async ({web3, api, privateKeyWrapper}) => {119 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);120 const helper = evmCollectionHelpers(web3, owner);121 let result = await helper.methods.createERC721MetadataCompatibleCollection('Mint collection', '1', '1', 'BaseURI_').send();122 const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);123 const receiver = createEthAccount(web3);124 const contract = evmCollection(web3, owner, collectionIdAddress, {type: 'ReFungible'});125126 const nextTokenId = await contract.methods.nextTokenId().call();127 expect(nextTokenId).to.be.equal('1');128 result = await contract.methods.mint(129 receiver,130 nextTokenId,131 ).send();132133 // Set URL134 await contract.methods.setProperty(nextTokenId, 'url', Buffer.from('Token URI')).send();135136 const events = normalizeEvents(result.events);137 const address = collectionIdToAddress(collectionId);138139 expect(events).to.be.deep.equal([140 {141 address,142 event: 'Transfer',143 args: {144 from: '0x0000000000000000000000000000000000000000',145 to: receiver,146 tokenId: nextTokenId,147 },148 },149 ]);150151 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Token URI');152 });153154 itWeb3('TokenURI from baseURI + tokenId', async ({web3, api, privateKeyWrapper}) => {155 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);156 const helper = evmCollectionHelpers(web3, owner);157 let result = await helper.methods.createERC721MetadataCompatibleCollection('Mint collection', '1', '1', 'BaseURI_').send();158 const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);159 const receiver = createEthAccount(web3);160 const contract = evmCollection(web3, owner, collectionIdAddress, {type: 'ReFungible'});161162 const nextTokenId = await contract.methods.nextTokenId().call();163 expect(nextTokenId).to.be.equal('1');164 result = await contract.methods.mint(165 receiver,166 nextTokenId,167 ).send();168169 const events = normalizeEvents(result.events);170 const address = collectionIdToAddress(collectionId);171172 expect(events).to.be.deep.equal([173 {174 address,175 event: 'Transfer',176 args: {177 from: '0x0000000000000000000000000000000000000000',178 to: receiver,179 tokenId: nextTokenId,180 },181 },182 ]);183184 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + nextTokenId);185 });186187 itWeb3('TokenURI from baseURI + suffix', async ({web3, api, privateKeyWrapper}) => {188 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);189 const helper = evmCollectionHelpers(web3, owner);190 let result = await helper.methods.createERC721MetadataCompatibleCollection('Mint collection', '1', '1', 'BaseURI_').send();191 const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);192 const receiver = createEthAccount(web3);193 const contract = evmCollection(web3, owner, collectionIdAddress, {type: 'ReFungible'});194195 const nextTokenId = await contract.methods.nextTokenId().call();196 expect(nextTokenId).to.be.equal('1');197 result = await contract.methods.mint(198 receiver,199 nextTokenId,200 ).send();201202 // Set suffix203 const suffix = '/some/suffix';204 await contract.methods.setProperty(nextTokenId, 'suffix', Buffer.from(suffix)).send();205206 const events = normalizeEvents(result.events);207 const address = collectionIdToAddress(collectionId);208209 expect(events).to.be.deep.equal([210 {211 address,212 event: 'Transfer',213 args: {214 from: '0x0000000000000000000000000000000000000000',215 to: receiver,216 tokenId: nextTokenId,217 },218 },219 ]);220221 expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('BaseURI_' + suffix);222 });223});224225describe('Refungible: Plain calls', () => {226 before(async function() {227 await requirePallets(this, [Pallets.ReFungible]);228 });229230 itWeb3('Can perform approve()', async ({web3, api, privateKeyWrapper}) => {231 const alice = privateKeyWrapper('//Alice');232233 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;234235 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);236237 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: owner})).itemId;238239 const address = tokenIdToAddress(collectionId, tokenId);240241 const spender = createEthAccount(web3);242243 const contract = uniqueRefungibleToken(web3, address, owner);244245 {246 const result = await contract.methods.approve(spender, 100).send({from: owner});247 const events = normalizeEvents(result.events);248249 expect(events).to.be.deep.equal([250 {251 address,252 event: 'Approval',253 args: {254 owner,255 spender,256 value: '100',257 },258 },259 ]);260 }261262 {263 const allowance = await contract.methods.allowance(owner, spender).call();264 expect(+allowance).to.equal(100);265 }266 });267268 itWeb3('Can perform transferFrom()', async ({web3, api, privateKeyWrapper}) => {269 const alice = privateKeyWrapper('//Alice');270271 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;272273 const owner = createEthAccount(web3);274 await transferBalanceToEth(api, alice, owner);275276 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: owner})).itemId;277278 const spender = createEthAccount(web3);279 await transferBalanceToEth(api, alice, spender);280281 const receiver = createEthAccount(web3);282283 const address = tokenIdToAddress(collectionId, tokenId);284 const contract = uniqueRefungibleToken(web3, address, owner);285286 await contract.methods.approve(spender, 100).send();287288 {289 const result = await contract.methods.transferFrom(owner, receiver, 49).send({from: spender});290 const events = normalizeEvents(result.events);291 expect(events).to.include.deep.members([292 {293 address,294 event: 'Transfer',295 args: {296 from: owner,297 to: receiver,298 value: '49',299 },300 },301 {302 address,303 event: 'Approval',304 args: {305 owner,306 spender,307 value: '51',308 },309 },310 ]);311 }312313 {314 const balance = await contract.methods.balanceOf(receiver).call();315 expect(+balance).to.equal(49);316 }317318 {319 const balance = await contract.methods.balanceOf(owner).call();320 expect(+balance).to.equal(151);321 }322 });323324 itWeb3('Can perform transfer()', async ({web3, api, privateKeyWrapper}) => {325 const alice = privateKeyWrapper('//Alice');326327 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;328329 const owner = createEthAccount(web3);330 await transferBalanceToEth(api, alice, owner);331332 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: owner})).itemId;333334 const receiver = createEthAccount(web3);335 await transferBalanceToEth(api, alice, receiver);336337 const address = tokenIdToAddress(collectionId, tokenId);338 const contract = uniqueRefungibleToken(web3, address, owner);339340 {341 const result = await contract.methods.transfer(receiver, 50).send({from: owner});342 const events = normalizeEvents(result.events);343 expect(events).to.include.deep.members([344 {345 address,346 event: 'Transfer',347 args: {348 from: owner,349 to: receiver,350 value: '50',351 },352 },353 ]);354 }355356 {357 const balance = await contract.methods.balanceOf(owner).call();358 expect(+balance).to.equal(150);359 }360361 {362 const balance = await contract.methods.balanceOf(receiver).call();363 expect(+balance).to.equal(50);364 }365 });366367 itWeb3('Can perform repartition()', async ({web3, api, privateKeyWrapper}) => {368 const alice = privateKeyWrapper('//Alice');369370 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;371372 const owner = createEthAccount(web3);373 await transferBalanceToEth(api, alice, owner);374375 const receiver = createEthAccount(web3);376 await transferBalanceToEth(api, alice, receiver);377378 const tokenId = (await createRefungibleToken(api, alice, collectionId, 100n, {Ethereum: owner})).itemId;379380 const address = tokenIdToAddress(collectionId, tokenId);381 const contract = uniqueRefungibleToken(web3, address, owner);382383 await contract.methods.repartition(200).send({from: owner});384 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(200);385 await contract.methods.transfer(receiver, 110).send({from: owner});386 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(90);387 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(110);388389 await expect(contract.methods.repartition(80).send({from: owner})).to.eventually.be.rejected;390391 await contract.methods.transfer(receiver, 90).send({from: owner});392 expect(+await contract.methods.balanceOf(owner).call()).to.be.equal(0);393 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(200);394395 await contract.methods.repartition(150).send({from: receiver});396 await expect(contract.methods.transfer(owner, 160).send({from: receiver})).to.eventually.be.rejected;397 expect(+await contract.methods.balanceOf(receiver).call()).to.be.equal(150);398 });399400 itWeb3('Can repartition with increased amount', async ({web3, api, privateKeyWrapper}) => {401 const alice = privateKeyWrapper('//Alice');402403 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;404405 const owner = createEthAccount(web3);406 await transferBalanceToEth(api, alice, owner);407408 const tokenId = (await createRefungibleToken(api, alice, collectionId, 100n, {Ethereum: owner})).itemId;409410 const address = tokenIdToAddress(collectionId, tokenId);411 const contract = uniqueRefungibleToken(web3, address, owner);412413 const result = await contract.methods.repartition(200).send();414 const events = normalizeEvents(result.events);415416 expect(events).to.deep.equal([417 {418 address,419 event: 'Transfer',420 args: {421 from: '0x0000000000000000000000000000000000000000',422 to: owner,423 value: '100',424 },425 },426 ]);427 });428429 itWeb3('Can repartition with decreased amount', async ({web3, api, privateKeyWrapper}) => {430 const alice = privateKeyWrapper('//Alice');431432 const collectionId = (await createCollection(api, alice, {name: 'token name', mode: {type: 'ReFungible'}})).collectionId;433434 const owner = createEthAccount(web3);435 await transferBalanceToEth(api, alice, owner);436437 const tokenId = (await createRefungibleToken(api, alice, collectionId, 100n, {Ethereum: owner})).itemId;438439 const address = tokenIdToAddress(collectionId, tokenId);440 const contract = uniqueRefungibleToken(web3, address, owner);441442 const result = await contract.methods.repartition(50).send();443 const events = normalizeEvents(result.events);444 expect(events).to.deep.equal([445 {446 address,447 event: 'Transfer',448 args: {449 from: owner,450 to: '0x0000000000000000000000000000000000000000',451 value: '50',452 },453 },454 ]);455 });456457 itWeb3('Receiving Transfer event on burning into full ownership', async ({web3, api, privateKeyWrapper}) => {458 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);459 const receiver = await createEthAccountWithBalance(api, web3, privateKeyWrapper);460 const helper = evmCollectionHelpers(web3, caller);461 const result = await helper.methods.createRefungibleCollection('Mint collection', '6', '6').send();462 const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);463 const contract = evmCollection(web3, caller, collectionIdAddress, {type: 'ReFungible'});464465 const tokenId = await contract.methods.nextTokenId().call();466 await contract.methods.mint(caller, tokenId).send();467468 const address = tokenIdToAddress(collectionId, tokenId);469470 const tokenContract = uniqueRefungibleToken(web3, address, caller);471 await tokenContract.methods.repartition(2).send();472 await tokenContract.methods.transfer(receiver, 1).send();473474 const events = await recordEvents(contract, async () =>475 await tokenContract.methods.burnFrom(caller, 1).send());476 expect(events).to.deep.equal([477 {478 address: collectionIdAddress,479 event: 'Transfer',480 args: {481 from: '0xFFfFfFffFFfffFFfFFfFFFFFffFFFffffFfFFFfF',482 to: receiver,483 tokenId,484 },485 },486 ]);487 });488});489490describe('Refungible: Fees', () => {491 before(async function() {492 await requirePallets(this, [Pallets.ReFungible]);493 });494495 itWeb3('approve() call fee is less than 0.2UNQ', async ({web3, api, privateKeyWrapper}) => {496 const alice = privateKeyWrapper('//Alice');497498 const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId;499500 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);501 const spender = createEthAccount(web3);502503 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: owner})).itemId;504505 const address = tokenIdToAddress(collectionId, tokenId);506 const contract = uniqueRefungibleToken(web3, address, owner);507508 const cost = await recordEthFee(api, owner, () => contract.methods.approve(spender, 100).send({from: owner}));509 expect(cost < BigInt(0.2 * Number(UNIQUE)));510 });511512 itWeb3('transferFrom() call fee is less than 0.2UNQ', async ({web3, api, privateKeyWrapper}) => {513 const alice = privateKeyWrapper('//Alice');514515 const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId;516517 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);518 const spender = await createEthAccountWithBalance(api, web3, privateKeyWrapper);519520 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: owner})).itemId;521522 const address = tokenIdToAddress(collectionId, tokenId);523 const contract = uniqueRefungibleToken(web3, address, owner);524525 await contract.methods.approve(spender, 100).send({from: owner});526527 const cost = await recordEthFee(api, spender, () => contract.methods.transferFrom(owner, spender, 100).send({from: spender}));528 expect(cost < BigInt(0.2 * Number(UNIQUE)));529 });530531 itWeb3('transfer() call fee is less than 0.2UNQ', async ({web3, api, privateKeyWrapper}) => {532 const alice = privateKeyWrapper('//Alice');533534 const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId;535536 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);537 const receiver = createEthAccount(web3);538539 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n, {Ethereum: owner})).itemId;540541 const address = tokenIdToAddress(collectionId, tokenId);542 const contract = uniqueRefungibleToken(web3, address, owner);543544 const cost = await recordEthFee(api, owner, () => contract.methods.transfer(receiver, 100).send({from: owner}));545 expect(cost < BigInt(0.2 * Number(UNIQUE)));546 });547});548549describe('Refungible: Substrate calls', () => {550 before(async function() {551 await requirePallets(this, [Pallets.ReFungible]);552 });553554 itWeb3('Events emitted for approve()', async ({web3, api, privateKeyWrapper}) => {555 const alice = privateKeyWrapper('//Alice');556557 const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId;558559 const receiver = createEthAccount(web3);560561 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n)).itemId;562563 const address = tokenIdToAddress(collectionId, tokenId);564 const contract = uniqueRefungibleToken(web3, address);565566 const events = await recordEvents(contract, async () => {567 expect(await approve(api, collectionId, tokenId, alice, {Ethereum: receiver}, 100n)).to.be.true;568 });569570 expect(events).to.be.deep.equal([571 {572 address,573 event: 'Approval',574 args: {575 owner: subToEth(alice.address),576 spender: receiver,577 value: '100',578 },579 },580 ]);581 });582583 itWeb3('Events emitted for transferFrom()', async ({web3, api, privateKeyWrapper}) => {584 const alice = privateKeyWrapper('//Alice');585586 const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId;587 const bob = privateKeyWrapper('//Bob');588589 const receiver = createEthAccount(web3);590591 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n)).itemId;592 expect(await approve(api, collectionId, tokenId, alice, bob.address, 100n)).to.be.true;593594 const address = tokenIdToAddress(collectionId, tokenId);595 const contract = uniqueRefungibleToken(web3, address);596597 const events = await recordEvents(contract, async () => {598 expect(await transferFrom(api, collectionId, tokenId, bob, alice, {Ethereum: receiver}, 51n)).to.be.true;599 });600601 expect(events).to.be.deep.equal([602 {603 address,604 event: 'Transfer',605 args: {606 from: subToEth(alice.address),607 to: receiver,608 value: '51',609 },610 },611 {612 address,613 event: 'Approval',614 args: {615 owner: subToEth(alice.address),616 spender: subToEth(bob.address),617 value: '49',618 },619 },620 ]);621 });622623 itWeb3('Events emitted for transfer()', async ({web3, api, privateKeyWrapper}) => {624 const alice = privateKeyWrapper('//Alice');625626 const collectionId = (await createCollection(api, alice, {mode: {type: 'ReFungible'}})).collectionId;627628 const receiver = createEthAccount(web3);629630 const tokenId = (await createRefungibleToken(api, alice, collectionId, 200n)).itemId;631632 const address = tokenIdToAddress(collectionId, tokenId);633 const contract = uniqueRefungibleToken(web3, address);634635 const events = await recordEvents(contract, async () => {636 expect(await transfer(api, collectionId, tokenId, alice, {Ethereum: receiver}, 51n)).to.be.true;637 });638639 expect(events).to.be.deep.equal([640 {641 address,642 event: 'Transfer',643 args: {644 from: subToEth(alice.address),645 to: receiver,646 value: '51',647 },648 },649 ]);650 });651});652653describe('ERC 1633 implementation', () => {654 before(async function() {655 await requirePallets(this, [Pallets.ReFungible]);656 });657658 itWeb3('Parent NFT token address and id', async ({api, web3, privateKeyWrapper}) => {659 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);660661 const {collectionIdAddress: nftCollectionAddress} = await createNonfungibleCollection(api, web3, owner);662 const nftContract = uniqueNFT(web3, nftCollectionAddress, owner);663 const nftTokenId = await nftContract.methods.nextTokenId().call();664 await nftContract.methods.mint(owner, nftTokenId).send();665 const nftCollectionId = collectionIdFromAddress(nftCollectionAddress);666667 const {collectionIdAddress, collectionId} = await createRefungibleCollection(api, web3, owner);668 const refungibleContract = uniqueRefungible(web3, collectionIdAddress, owner);669 const refungibleTokenId = await refungibleContract.methods.nextTokenId().call();670 await refungibleContract.methods.mint(owner, refungibleTokenId).send();671672 const rftTokenAddress = tokenIdToAddress(collectionId, refungibleTokenId);673 const refungibleTokenContract = uniqueRefungibleToken(web3, rftTokenAddress, owner);674 await refungibleTokenContract.methods.setParentNFT(nftCollectionAddress, nftTokenId).send();675676 const tokenAddress = await refungibleTokenContract.methods.parentToken().call();677 const tokenId = await refungibleTokenContract.methods.parentTokenId().call();678 const nftTokenAddress = tokenIdToAddress(nftCollectionId, nftTokenId);679 expect(tokenAddress).to.be.equal(nftTokenAddress);680 expect(tokenId).to.be.equal(nftTokenId);681 });682683 itWeb3('Default parent token address and id', async ({api, web3, privateKeyWrapper}) => {684 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);685686 const {collectionIdAddress, collectionId} = await createRefungibleCollection(api, web3, owner);687 const refungibleContract = uniqueRefungible(web3, collectionIdAddress, owner);688 const refungibleTokenId = await refungibleContract.methods.nextTokenId().call();689 await refungibleContract.methods.mint(owner, refungibleTokenId).send();690691 const rftTokenAddress = tokenIdToAddress(collectionId, refungibleTokenId);692 const refungibleTokenContract = uniqueRefungibleToken(web3, rftTokenAddress, owner);693694 const tokenAddress = await refungibleTokenContract.methods.parentToken().call();695 const tokenId = await refungibleTokenContract.methods.parentTokenId().call();696 expect(tokenAddress).to.be.equal(rftTokenAddress);697 expect(tokenId).to.be.equal(refungibleTokenId);698 });699});tests/src/eth/reFungibleTokenAbi.jsondiffbeforeafterboth--- a/tests/src/eth/reFungibleTokenAbi.json
+++ b/tests/src/eth/reFungibleTokenAbi.json
@@ -127,16 +127,6 @@
},
{
"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",