--- a/pallets/common/src/erc.rs +++ b/pallets/common/src/erc.rs @@ -16,10 +16,11 @@ use evm_coder::{solidity_interface, types::*, execution::{Result, Error}}; pub use pallet_evm::{PrecompileOutput, PrecompileResult, account::CrossAccountId}; -use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder}; +use pallet_evm_coder_substrate::dispatch_to_evm; use sp_core::{H160, U256}; use sp_std::vec::Vec; -use up_data_structs::Property; +use up_data_structs::{Property, SponsoringRateLimit}; +use alloc::format; use crate::{Pallet, CollectionHandle, Config, CollectionProperties}; @@ -87,37 +88,53 @@ Ok(()) } - fn set_limits( - &self, + fn set_limit( + &mut self, caller: caller, - limits_json: string, + limit: string, + value: string, ) -> Result { - // let mut collection = collection_from_address::(self.contract_address(caller).unwrap(), self.1.gas_left())?; - // check_is_owner(caller, &collection)?; + check_is_owner(caller, self)?; + let mut limits = self.limits.clone(); - // let limits = serde_json_core::from_str(limits_json.as_ref()) - // .map_err(|e| Error::Revert(format!("Parse JSON error: {}", e)))?; - // collection.limits = limits.0; - // collection.save().map_err(pallet_evm_coder_substrate::dispatch_to_evm::)?; + match limit.as_str() { + "accountTokenOwnershipLimit" => { + limits.account_token_ownership_limit = parse_int(value)?; + }, + "sponsoredDataSize" => { + limits.sponsored_data_size = parse_int(value)?; + }, + "sponsoredDataRateLimit" => { + limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(parse_int(value)?.unwrap())); + }, + "tokenLimit" => { + limits.token_limit = parse_int(value)?; + }, + "sponsorTransferTimeout" => { + limits.sponsor_transfer_timeout = parse_int(value)?; + }, + "sponsorApproveTimeout" => { + limits.sponsor_approve_timeout = parse_int(value)?; + }, + "ownerCanTransfer" => { + limits.owner_can_transfer = parse_bool(value)?; + }, + "ownerCanDestroy" => { + limits.owner_can_destroy = parse_bool(value)?; + }, + "transfersEnabled" => { + limits.transfers_enabled = parse_bool(value)?; + }, + _ => return Err(Error::Revert(format!("Unknown limit \"{}\"", limit))) + } + self.limits = limits; + save(self); Ok(()) } fn contract_address(&self, _caller: caller) -> Result
{ Ok(crate::eth::collection_id_to_address(self.id)) } -} - -fn collection_from_address( - collection_address: address, - gas_limit: u64 -) -> Result> { - let collection_id = crate::eth::map_eth_to_id(&collection_address) - .ok_or(Error::Revert("Contract is not an unique collection".into()))?; - let recorder = >::new(gas_limit); - let collection = - CollectionHandle::new_with_recorder(collection_id, recorder) - .ok_or(Error::Revert("Create collection handle error".into()))?; - Ok(collection) } fn check_is_owner(caller: caller, collection: &CollectionHandle) -> Result<()> { @@ -130,4 +147,16 @@ fn save(collection: &CollectionHandle) { >::insert(collection.id, collection.collection.clone()); +} + +fn parse_int(value: string) -> Result> { + value.parse::() + .map_err(|e| Error::Revert(format!("Int value \"{}\" parse error: {}", value, e))) + .map(|value| Some(value)) +} + +fn parse_bool(value: string) -> Result> { + value.parse::() + .map_err(|e| Error::Revert(format!("Bool value \"{}\" parse error: {}", value, e))) + .map(|value| Some(value)) } \ No newline at end of file --- a/pallets/nonfungible/src/stubs/UniqueNFT.sol +++ b/pallets/nonfungible/src/stubs/UniqueNFT.sol @@ -51,67 +51,6 @@ event MintingFinished(); } -// Selector: 38e33c60 -contract Collection is Dummy, ERC165 { - // Selector: setCollectionProperty(string,bytes) 2f073f66 - function setCollectionProperty(string memory key, bytes memory value) - public - { - require(false, stub_error); - key; - value; - dummy = 0; - } - - // Selector: deleteCollectionProperty(string) 7b7debce - function deleteCollectionProperty(string memory key) public { - require(false, stub_error); - key; - dummy = 0; - } - - // Throws error if key not found - // - // Selector: collectionProperty(string) cf24fd6d - function collectionProperty(string memory key) - public - view - returns (bytes memory) - { - require(false, stub_error); - key; - dummy; - return hex""; - } - - // Selector: ethSetSponsor(address) 8f9af356 - function ethSetSponsor(address sponsor) public { - require(false, stub_error); - sponsor; - dummy = 0; - } - - // Selector: ethConfirmSponsorship() a8580d1a - function ethConfirmSponsorship() public { - require(false, stub_error); - dummy = 0; - } - - // Selector: setLimits(string) 72cb345d - function setLimits(string memory limitsJson) public view { - require(false, stub_error); - limitsJson; - dummy; - } - - // Selector: contractAddress() f6b4dfb4 - function contractAddress() public view returns (address) { - require(false, stub_error); - dummy; - return 0x0000000000000000000000000000000000000000; - } -} - // Selector: 41369377 contract TokenProperties is Dummy, ERC165 { // Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa @@ -441,6 +380,68 @@ } } +// Selector: f5652829 +contract Collection is Dummy, ERC165 { + // Selector: setCollectionProperty(string,bytes) 2f073f66 + function setCollectionProperty(string memory key, bytes memory value) + public + { + require(false, stub_error); + key; + value; + dummy = 0; + } + + // Selector: deleteCollectionProperty(string) 7b7debce + function deleteCollectionProperty(string memory key) public { + require(false, stub_error); + key; + dummy = 0; + } + + // Throws error if key not found + // + // Selector: collectionProperty(string) cf24fd6d + function collectionProperty(string memory key) + public + view + returns (bytes memory) + { + require(false, stub_error); + key; + dummy; + return hex""; + } + + // Selector: ethSetSponsor(address) 8f9af356 + function ethSetSponsor(address sponsor) public { + require(false, stub_error); + sponsor; + dummy = 0; + } + + // Selector: ethConfirmSponsorship() a8580d1a + function ethConfirmSponsorship() public { + require(false, stub_error); + dummy = 0; + } + + // Selector: setLimit(string,string) bf4d2014 + function setLimit(string memory limit, string memory value) public { + require(false, stub_error); + limit; + value; + dummy = 0; + } + + // Selector: contractAddress() f6b4dfb4 + function contractAddress() public view returns (address) { + require(false, stub_error); + dummy; + return 0x0000000000000000000000000000000000000000; + } +} + contract UniqueNFT is Dummy, ERC165, --- a/pallets/unique/src/eth/mod.rs +++ b/pallets/unique/src/eth/mod.rs @@ -26,7 +26,7 @@ }; use frame_support::traits::Get; use sp_core::H160; - use pallet_common::{CollectionHandle, CollectionById}; + use pallet_common::CollectionById; use sp_std::vec::Vec; use alloc::format; --- a/primitives/data-structs/src/lib.rs +++ b/primitives/data-structs/src/lib.rs @@ -368,30 +368,21 @@ #[derive(Encode, Decode, Debug, Default, Clone, PartialEq, TypeInfo, MaxEncodedLen)] #[cfg_attr(feature = "serde1", derive(Serialize, Deserialize))] pub struct CollectionLimits { - #[serde(alias = "accountTokenOwnershipLimit")] pub account_token_ownership_limit: Option, - #[serde(alias = "sponsoredDataSize")] pub sponsored_data_size: Option, /// FIXME should we delete this or repurpose it? /// None - setVariableMetadata is not sponsored /// Some(v) - setVariableMetadata is sponsored /// if there is v block between txs - #[serde(alias = "sponsoredDataRateLimit")] pub sponsored_data_rate_limit: Option, - #[serde(alias = "tokenLimit")] pub token_limit: Option, // Timeouts for item types in passed blocks - #[serde(alias = "sponsorTransferTimeout")] pub sponsor_transfer_timeout: Option, - #[serde(alias = "sponsorApproveTimeout")] pub sponsor_approve_timeout: Option, - #[serde(alias = "ownerCanTransfer")] pub owner_can_transfer: Option, - #[serde(alias = "ownerCanDestroy")] pub owner_can_destroy: Option, - #[serde(alias = "transfersEnabled")] pub transfers_enabled: Option, } --- a/tests/src/eth/api/Collection.sol +++ /dev/null @@ -1,28 +0,0 @@ -// SPDX-License-Identifier: OTHER -// This code is automatically generated - -pragma solidity >=0.8.0 <0.9.0; - -// Common stubs holder -interface Dummy { - -} - -interface ERC165 is Dummy { - function supportsInterface(bytes4 interfaceID) external view returns (bool); -} - -// Selector: 15cc740e -interface Collection is Dummy, ERC165 { - // Selector: setSponsor(address) 59753fb1 - function setSponsor(address sponsor) external view; - - // Selector: confirmSponsorship() c8c6a056 - function confirmSponsorship() external view; - - // Selector: setLimits(string) 72cb345d - function setLimits(string memory limitsJson) external view; - - // Selector: contractAddress() f6b4dfb4 - function contractAddress() external view returns (address); -} --- a/tests/src/eth/api/UniqueNFT.sol +++ b/tests/src/eth/api/UniqueNFT.sol @@ -42,36 +42,6 @@ event MintingFinished(); } -// Selector: 38e33c60 -interface Collection is Dummy, ERC165 { - // Selector: setCollectionProperty(string,bytes) 2f073f66 - function setCollectionProperty(string memory key, bytes memory value) - external; - - // Selector: deleteCollectionProperty(string) 7b7debce - function deleteCollectionProperty(string memory key) external; - - // Throws error if key not found - // - // Selector: collectionProperty(string) cf24fd6d - function collectionProperty(string memory key) - external - view - returns (bytes memory); - - // Selector: ethSetSponsor(address) 8f9af356 - function ethSetSponsor(address sponsor) external; - - // Selector: ethConfirmSponsorship() a8580d1a - function ethConfirmSponsorship() external; - - // Selector: setLimits(string) 72cb345d - function setLimits(string memory limitsJson) external view; - - // Selector: contractAddress() f6b4dfb4 - function contractAddress() external view returns (address); -} - // Selector: 41369377 interface TokenProperties is Dummy, ERC165 { // Selector: setTokenPropertyPermission(string,bool,bool,bool) 222d97fa @@ -243,6 +213,36 @@ returns (bool); } +// Selector: f5652829 +interface Collection is Dummy, ERC165 { + // Selector: setCollectionProperty(string,bytes) 2f073f66 + function setCollectionProperty(string memory key, bytes memory value) + external; + + // Selector: deleteCollectionProperty(string) 7b7debce + function deleteCollectionProperty(string memory key) external; + + // Throws error if key not found + // + // Selector: collectionProperty(string) cf24fd6d + function collectionProperty(string memory key) + external + view + returns (bytes memory); + + // Selector: ethSetSponsor(address) 8f9af356 + function ethSetSponsor(address sponsor) external; + + // Selector: ethConfirmSponsorship() a8580d1a + function ethConfirmSponsorship() external; + + // Selector: setLimit(string,string) bf4d2014 + function setLimit(string memory limit, string memory value) external; + + // Selector: contractAddress() f6b4dfb4 + function contractAddress() external view returns (address); +} + interface UniqueNFT is Dummy, ERC165, --- a/tests/src/eth/createCollection.test.ts +++ b/tests/src/eth/createCollection.test.ts @@ -108,7 +108,7 @@ const limits = { accountTokenOwnershipLimit: 1000, sponsoredDataSize: 1024, - sponsoredDataRateLimit: {Blocks: 30}, + sponsoredDataRateLimit: 30, tokenLimit: 1000000, sponsorTransferTimeout: 6, sponsorApproveTimeout: 6, @@ -117,14 +117,21 @@ transfersEnabled: false, }; - const limitsJson = JSON.stringify(limits, null, 1); const collectionEvm = evmCollection(web3, owner, collectionIdAddress); - await collectionEvm.methods.setLimits(limitsJson).send(); + await collectionEvm.methods.setLimit('accountTokenOwnershipLimit', limits.accountTokenOwnershipLimit.toString()).send(); + await collectionEvm.methods.setLimit('sponsoredDataSize', limits.sponsoredDataSize.toString()).send(); + await collectionEvm.methods.setLimit('sponsoredDataRateLimit', limits.sponsoredDataRateLimit.toString()).send(); + await collectionEvm.methods.setLimit('tokenLimit', limits.tokenLimit.toString()).send(); + await collectionEvm.methods.setLimit('sponsorTransferTimeout', limits.sponsorTransferTimeout.toString()).send(); + await collectionEvm.methods.setLimit('sponsorApproveTimeout', limits.sponsorApproveTimeout.toString()).send(); + await collectionEvm.methods.setLimit('ownerCanTransfer', limits.ownerCanTransfer.toString()).send(); + await collectionEvm.methods.setLimit('ownerCanDestroy', limits.ownerCanDestroy.toString()).send(); + await collectionEvm.methods.setLimit('transfersEnabled', limits.transfersEnabled.toString()).send(); const collectionSub = (await getDetailedCollectionInfo(api, collectionId))!; expect(collectionSub.limits.accountTokenOwnershipLimit.unwrap().toNumber()).to.be.eq(limits.accountTokenOwnershipLimit); expect(collectionSub.limits.sponsoredDataSize.unwrap().toNumber()).to.be.eq(limits.sponsoredDataSize); - expect(collectionSub.limits.sponsoredDataRateLimit.unwrap().asBlocks.toNumber()).to.be.eq(limits.sponsoredDataRateLimit.Blocks); + expect(collectionSub.limits.sponsoredDataRateLimit.unwrap().asBlocks.toNumber()).to.be.eq(limits.sponsoredDataRateLimit); expect(collectionSub.limits.tokenLimit.unwrap().toNumber()).to.be.eq(limits.tokenLimit); expect(collectionSub.limits.sponsorTransferTimeout.unwrap().toNumber()).to.be.eq(limits.sponsorTransferTimeout); expect(collectionSub.limits.sponsorApproveTimeout.unwrap().toNumber()).to.be.eq(limits.sponsorApproveTimeout); @@ -171,6 +178,21 @@ // const tokenUri = await contract.methods.tokenURI(nextTokenId).call(); // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`); }); + + itWeb3('Collection address exist', async ({api, web3}) => { + const owner = await createEthAccountWithBalance(api, web3); + const collectionAddressForNonexistentCollection = '0x17C4E6453CC49AAAAEACA894E6D9683E00112233'; + const collectionHelper = evmCollectionHelper(web3, owner); + expect(await collectionHelper.methods + .isCollectionExist(collectionAddressForNonexistentCollection).call()) + .to.be.false; + + const result = await collectionHelper.methods.create721Collection('Const collection', '5', '5').send(); + const {collectionIdAddress} = await getCollectionAddressFromResult(api, result); + expect(await collectionHelper.methods + .isCollectionExist(collectionIdAddress).call()) + .to.be.true; + }); }); describe('(!negative tests!) Create collection from EVM', () => { @@ -218,30 +240,6 @@ await expect(helper.methods .create721Collection(collectionName, description, tokenPrefix) .call()).to.be.rejectedWith('NotSufficientFounds'); - }); - - itWeb3('(!negative test!) Collection address (Create collection handle error)', async ({api, web3}) => { - const owner = await createEthAccountWithBalance(api, web3); - const collectionAddressForNonexistentCollection = '0x17C4E6453CC49AAAAEACA894E6D9683E00112233'; - const collectionEvm = evmCollection(web3, owner, collectionAddressForNonexistentCollection); - const EXPECTED_ERROR = 'Create collection handle error'; - { - const sponsor = await createEthAccountWithBalance(api, web3); - await expect(collectionEvm.methods - .setSponsor(sponsor) - .call()).to.be.rejectedWith(EXPECTED_ERROR); - - const sponsorCollection = evmCollection(web3, sponsor, collectionAddressForNonexistentCollection); - await expect(sponsorCollection.methods - .confirmSponsorship() - .call()).to.be.rejectedWith(EXPECTED_ERROR); - } - { - const limits = '{"account_token_ownership_limit":1000}'; - await expect(collectionEvm.methods - .setLimits(limits) - .call()).to.be.rejectedWith(EXPECTED_ERROR); - } }); itWeb3('(!negative test!) Check owner', async ({api, web3}) => { @@ -255,18 +253,17 @@ { const sponsor = await createEthAccountWithBalance(api, web3); await expect(contractEvmFromNotOwner.methods - .setSponsor(sponsor) + .ethSetSponsor(sponsor) .call()).to.be.rejectedWith(EXPECTED_ERROR); const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress); await expect(sponsorCollection.methods - .confirmSponsorship() + .ethConfirmSponsorship() .call()).to.be.rejectedWith('Caller is not set as sponsor'); } { - const limits = '{"account_token_ownership_limit":1000}'; await expect(contractEvmFromNotOwner.methods - .setLimits(limits) + .setLimit('account_token_ownership_limit', '1000') .call()).to.be.rejectedWith(EXPECTED_ERROR); } }); @@ -277,9 +274,14 @@ const result = await collectionHelper.methods.create721Collection('Schema collection', 'A', 'A').send(); const {collectionIdAddress} = await getCollectionAddressFromResult(api, result); const collectionEvm = evmCollection(web3, owner, collectionIdAddress); - const badJson = '{accountTokenOwnershipLimit: 1000}'; await expect(collectionEvm.methods - .setLimits(badJson) - .call()).to.be.rejectedWith('Parse JSON error:'); + .setLimit('badLimit', 'true') + .call()).to.be.rejectedWith('Unknown limit "badLimit"'); + await expect(collectionEvm.methods + .setLimit('sponsoredDataSize', 'badValue') + .call()).to.be.rejectedWith('Int value "badValue" parse error:'); + await expect(collectionEvm.methods + .setLimit('ownerCanTransfer', 'badValue') + .call()).to.be.rejectedWith('Bool value "badValue" parse error:'); }); }); \ No newline at end of file --- a/tests/src/eth/nonFungibleAbi.json +++ b/tests/src/eth/nonFungibleAbi.json @@ -325,11 +325,12 @@ }, { "inputs": [ - { "internalType": "string", "name": "limitsJson", "type": "string" } + { "internalType": "string", "name": "limit", "type": "string" }, + { "internalType": "string", "name": "value", "type": "string" } ], - "name": "setLimits", + "name": "setLimit", "outputs": [], - "stateMutability": "view", + "stateMutability": "nonpayable", "type": "function" }, {