git.delta.rocks / unique-network / refs/commits / 02be24d6ef8a

difftreelog

CORE-302 Some refactor

Trubnikov Sergey2022-04-26parent: #f052050.patch.diff
in: master

3 files changed

modifiedpallets/evm-collection/src/eth.rsdiffbeforeafterboth
--- a/pallets/evm-collection/src/eth.rs
+++ b/pallets/evm-collection/src/eth.rs
@@ -205,7 +205,7 @@
 	recorder: &Rc<SubstrateRecorder<T>>,
 ) -> Result<CollectionHandle<T>> {
 	let collection_id = pallet_common::eth::map_eth_to_id(&collection_address)
-		.ok_or(Error::Revert("Bad ETH prefix".into()))?;
+		.ok_or(Error::Revert("Contract is not an unique collection".into()))?;
 	let collection =
 		pallet_common::CollectionHandle::new_with_recorder(collection_id, recorder.clone())
 			.ok_or(Error::Revert("Create collection handle error".into()))?;
@@ -216,14 +216,14 @@
 	let caller = T::CrossAccountId::from_eth(caller);
 	collection
 		.check_is_owner(&caller)
-		.map_err(|e| Error::Revert(format!("{:?}", e)))?;
+		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;
 	Ok(())
 }
 
 fn save<T: Config>(collection: CollectionHandle<T>) -> Result<()> {
-	collection
+	Ok(collection
 		.save()
-		.map_err(|e| Error::Revert(format!("{:?}", e)))
+		.map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?)
 }
 
 pub struct CollectionOnMethodCall<T: Config>(PhantomData<*const T>);
@@ -243,7 +243,6 @@
 		input: &[u8],
 		value: sp_core::U256,
 	) -> Option<PrecompileResult> {
-		// TODO: Extract to another OnMethodCall handler
 		if target != &T::ContractAddress::get() {
 			return None;
 		}
modifiedtests/package.jsondiffbeforeafterboth
--- a/tests/package.json
+++ b/tests/package.json
@@ -73,6 +73,7 @@
     "testBlockProduction": "mocha --timeout 9999999 -r ts-node/register ./**/block-production.test.ts",
     "testEnableDisableTransfers": "mocha --timeout 9999999 -r ts-node/register ./**/enableDisableTransfer.test.ts",
     "testLimits": "mocha --timeout 9999999 -r ts-node/register ./**/limits.test.ts",
+    "testEthCreateCollection": "mocha --timeout 9999999 -r ts-node/register ./**/eth/createCollection.test.ts",
     "polkadot-types-fetch-metadata": "curl -H 'Content-Type: application/json' -d '{\"id\":\"1\", \"jsonrpc\":\"2.0\", \"method\": \"state_getMetadata\", \"params\":[]}' http://localhost:9933 > src/interfaces/metadata.json",
     "polkadot-types-from-defs": "ts-node ./node_modules/.bin/polkadot-types-from-defs --endpoint src/interfaces/metadata.json --input src/interfaces/ --package .",
     "polkadot-types-from-chain": "ts-node ./node_modules/.bin/polkadot-types-from-chain --endpoint src/interfaces/metadata.json --output src/interfaces/ --package .",
modifiedtests/src/eth/createCollection.test.tsdiffbeforeafterboth
before · tests/src/eth/createCollection.test.ts
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.8//9// 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 nonFungibleAbi from './nonFungibleAbi.json';18import {ApiPromise} from '@polkadot/api';19import {evmToAddress} from '@polkadot/util-crypto';20import {expect} from 'chai';21import {getCreatedCollectionCount, getDetailedCollectionInfo} from '../util/helpers';22import {23  collectionHelper,24  collectionIdFromAddress,25  collectionIdToAddress,26  createEthAccount,27  createEthAccountWithBalance,28  GAS_ARGS,29  itWeb3,30  normalizeAddress,31  normalizeEvents,32} from './util/helpers';3334async function getCollectionAddressFromResult(api: ApiPromise, result: any) {35  const collectionIdAddress = normalizeAddress(result.events[0].raw.topics[2]);36  const collectionId = collectionIdFromAddress(collectionIdAddress);  37  const collection = (await getDetailedCollectionInfo(api, collectionId))!;38  return {collectionIdAddress, collectionId, collection};39}4041describe('Create collection from EVM', () => {42  itWeb3('Create collection', async ({api, web3}) => {43    const owner = await createEthAccountWithBalance(api, web3);44    const helper = collectionHelper(web3, owner);45    const collectionName = 'CollectionEVM';46    const description = 'Some description';47    const tokenPrefix = 'token prefix';48  49    const collectionCountBefore = await getCreatedCollectionCount(api);50    const result = await helper.methods51      .create721Collection(collectionName, description, tokenPrefix)52      .send();53    const collectionCountAfter = await getCreatedCollectionCount(api);54  55    const {collectionId, collection} = await getCollectionAddressFromResult(api, result);56    expect(collectionCountAfter - collectionCountBefore).to.be.eq(1);57    expect(collectionId).to.be.eq(collectionCountAfter);58    expect(collection.name.map(v => String.fromCharCode(v.toNumber())).join('')).to.be.eq(collectionName);59    expect(collection.description.map(v => String.fromCharCode(v.toNumber())).join('')).to.be.eq(description);60    expect(collection.tokenPrefix.toHuman()).to.be.eq(tokenPrefix);61    expect(collection.schemaVersion.type).to.be.eq('ImageURL');62  });63  64  itWeb3('Set sponsorship', async ({api, web3}) => {65    const owner = await createEthAccountWithBalance(api, web3);66    const helper = collectionHelper(web3, owner);67    let result = await helper.methods.create721Collection('Sponsor collection', '1', '1').send();68    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);69    const sponsor = await createEthAccountWithBalance(api, web3);70    result = await helper.methods.setSponsor(collectionIdAddress, sponsor).send();71    let collection = (await getDetailedCollectionInfo(api, collectionId))!;72    expect(collection.sponsorship.isUnconfirmed).to.be.true;73    expect(collection.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));74    await expect(helper.methods.confirmSponsorship(collectionIdAddress).call()).to.be.rejectedWith('Caller is not set as sponsor');75    const sponsorHelper = collectionHelper(web3, sponsor);76    await sponsorHelper.methods.confirmSponsorship(collectionIdAddress).send();77    collection = (await getDetailedCollectionInfo(api, collectionId))!;78    expect(collection.sponsorship.isConfirmed).to.be.true;79    expect(collection.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor));80  });81  82  itWeb3('Set offchain shema', async ({api, web3}) => {83    const owner = await createEthAccountWithBalance(api, web3);84    const helper = collectionHelper(web3, owner);85    let result = await helper.methods.create721Collection('Shema collection', '2', '2').send();86    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);87    const shema = 'Some shema';88    result = await helper.methods.setOffchainShema(collectionIdAddress, shema).send();89    const collection = (await getDetailedCollectionInfo(api, collectionId))!;90    expect(collection.offchainSchema.toHuman()).to.be.eq(shema);91  });92  93  itWeb3('Set variable on chain schema', async ({api, web3}) => {94    const owner = await createEthAccountWithBalance(api, web3);95    const helper = collectionHelper(web3, owner);96    let result = await helper.methods.create721Collection('Variable collection', '3', '3').send();97    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);98    const variable = 'Some variable';99    result = await helper.methods.setVariableOnChainSchema(collectionIdAddress, variable).send();100    const collection = (await getDetailedCollectionInfo(api, collectionId))!;101    expect(collection.variableOnChainSchema.toHuman()).to.be.eq(variable);102  });103  104  itWeb3('Set const on chain schema', async ({api, web3}) => {105    const owner = await createEthAccountWithBalance(api, web3);106    const helper = collectionHelper(web3, owner);107    let result = await helper.methods.create721Collection('Const collection', '4', '4').send();108    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);109    const constShema = 'Some const';110    result = await helper.methods.setConstOnChainSchema(collectionIdAddress, constShema).send();111    const collection = (await getDetailedCollectionInfo(api, collectionId))!;112    expect(collection.constOnChainSchema.toHuman()).to.be.eq(constShema);113  });114115  itWeb3('Set limits', async ({api, web3}) => {116    const owner = await createEthAccountWithBalance(api, web3);117    const helper = collectionHelper(web3, owner);118    const result = await helper.methods.create721Collection('Const collection', '5', '5').send();119    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);120    const limits = {121      accountTokenOwnershipLimit: 1000,122      sponsoredDataSize: 1024,123      sponsoredDataRateLimit: {Blocks: 30},124      tokenLimit: 1000000,125      sponsorTransferTimeout: 6,126      sponsorApproveTimeout: 6,127      ownerCanTransfer: false,128      ownerCanDestroy: false,129      transfersEnabled: false,130    };131132    const limitsJson = JSON.stringify(limits, null, 1);133    await helper.methods.setLimits(collectionIdAddress, limitsJson).send();134    135    const collection = (await getDetailedCollectionInfo(api, collectionId))!;136    expect(collection.limits.accountTokenOwnershipLimit.unwrap().toNumber()).to.be.eq(limits.accountTokenOwnershipLimit);137    expect(collection.limits.sponsoredDataSize.unwrap().toNumber()).to.be.eq(limits.sponsoredDataSize);138    expect(collection.limits.sponsoredDataRateLimit.unwrap().asBlocks.toNumber()).to.be.eq(limits.sponsoredDataRateLimit.Blocks);139    expect(collection.limits.tokenLimit.unwrap().toNumber()).to.be.eq(limits.tokenLimit);140    expect(collection.limits.sponsorTransferTimeout.unwrap().toNumber()).to.be.eq(limits.sponsorTransferTimeout);141    expect(collection.limits.sponsorApproveTimeout.unwrap().toNumber()).to.be.eq(limits.sponsorApproveTimeout);142    expect(collection.limits.ownerCanTransfer.toHuman()).to.be.eq(limits.ownerCanTransfer);143    expect(collection.limits.ownerCanDestroy.toHuman()).to.be.eq(limits.ownerCanDestroy);144    expect(collection.limits.transfersEnabled.toHuman()).to.be.eq(limits.transfersEnabled);145  });146147  itWeb3('Check tokenURI', async ({web3, api}) => {148    const owner = await createEthAccountWithBalance(api, web3);149    const helper = collectionHelper(web3, owner);150    let result = await helper.methods.create721Collection('Mint collection', '6', '6').send();151    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);152    const receiver = createEthAccount(web3);153    const contract = new web3.eth.Contract(nonFungibleAbi as any, collectionIdAddress.toLowerCase(), {from: owner, ...GAS_ARGS});154    const nextTokenId = await contract.methods.nextTokenId().call();155156    expect(nextTokenId).to.be.equal('1');157    result = await contract.methods.mintWithTokenURI(158      receiver,159      nextTokenId,160      'Test URI',161    ).send();162163    const events = normalizeEvents(result.events);164    const address = collectionIdToAddress(collectionId);165166    expect(events).to.be.deep.equal([167      {168        address,169        event: 'Transfer',170        args: {171          from: '0x0000000000000000000000000000000000000000',172          to: receiver,173          tokenId: nextTokenId,174        },175      },176    ]);177178    expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');179180    // TODO: this wont work right now, need release 919000 first181    // await helper.methods.setOffchainShema(collectionIdAddress, 'https://offchain-service.local/token-info/{id}').send();182    // const tokenUri = await contract.methods.tokenURI(nextTokenId).call();183    // expect(tokenUri).to.be.equal(`https://offchain-service.local/token-info/${nextTokenId}`);184  });185});186187describe('(!negative tests!) Create collection from EVM', () => {188  itWeb3('(!negative test!) Create collection (bad lengths)', async ({api, web3}) => {189    const owner = await createEthAccountWithBalance(api, web3);190    const helper = collectionHelper(web3, owner);191    {192      const MAX_NAME_LENGHT = 64;193      const collectionName = 'A'.repeat(MAX_NAME_LENGHT + 1);194      const description = 'A';195      const tokenPrefix = 'A';196    197      await expect(helper.methods198        .create721Collection(collectionName, description, tokenPrefix)199        .call()).to.be.rejectedWith('name is too long. Max length is ' + MAX_NAME_LENGHT);200      201    }202    {  203      const MAX_DESCRIPTION_LENGHT = 256;204      const collectionName = 'A';205      const description = 'A'.repeat(MAX_DESCRIPTION_LENGHT + 1);206      const tokenPrefix = 'A';207      await expect(helper.methods208        .create721Collection(collectionName, description, tokenPrefix)209        .call()).to.be.rejectedWith('description is too long. Max length is ' + MAX_DESCRIPTION_LENGHT);210    }211    {  212      const MAX_TOKEN_PREFIX_LENGHT = 16;213      const collectionName = 'A';214      const description = 'A';215      const tokenPrefix = 'A'.repeat(MAX_TOKEN_PREFIX_LENGHT + 1);216      await expect(helper.methods217        .create721Collection(collectionName, description, tokenPrefix)218        .call()).to.be.rejectedWith('token_prefix is too long. Max length is ' + MAX_TOKEN_PREFIX_LENGHT);219    }220  });221  222  itWeb3('(!negative test!) Create collection (no funds)', async ({web3}) => {223    const owner = await createEthAccount(web3);224    const helper = collectionHelper(web3, owner);225    const collectionName = 'A';226    const description = 'A';227    const tokenPrefix = 'A';228    229    await expect(helper.methods230      .create721Collection(collectionName, description, tokenPrefix)231      .call()).to.be.rejectedWith('NotSufficientFounds');232  });233234  itWeb3('(!negative test!) Collection address (Bad ETH prefix)', async ({api, web3}) => {235    const owner = await createEthAccountWithBalance(api, web3);236    const helper = collectionHelper(web3, owner);237    const collectionAddressWithBadPrefix = '0x00112233445566778899AABBCCDDEEFF00112233';238    const EXPECTED_ERROR = 'Bad ETH prefix';239    {240      const sponsor = await createEthAccountWithBalance(api, web3);241      await expect(helper.methods242        .setSponsor(collectionAddressWithBadPrefix, sponsor)243        .call()).to.be.rejectedWith(EXPECTED_ERROR);244      245      const sponsorHelper = collectionHelper(web3, sponsor);246      await expect(sponsorHelper.methods247        .confirmSponsorship(collectionAddressWithBadPrefix)248        .call()).to.be.rejectedWith(EXPECTED_ERROR);249    }250    {251      const shema = 'Some shema';252      await expect(helper.methods253        .setOffchainShema(collectionAddressWithBadPrefix, shema)254        .call()).to.be.rejectedWith(EXPECTED_ERROR);255    }256    {257      const variable = 'Some variable';258      await expect(helper.methods259        .setVariableOnChainSchema(collectionAddressWithBadPrefix, variable)260        .call()).to.be.rejectedWith(EXPECTED_ERROR);261    }262    {263      const constData = 'Some const';264      await expect(helper.methods265        .setConstOnChainSchema(collectionAddressWithBadPrefix, constData)266        .call()).to.be.rejectedWith(EXPECTED_ERROR);267    }268    {269      const limits = '{"account_token_ownership_limit":1000}';270      await expect(helper.methods271        .setLimits(collectionAddressWithBadPrefix, limits)272        .call()).to.be.rejectedWith(EXPECTED_ERROR);273    }274  });275276  itWeb3('(!negative test!) Check owner', async ({api, web3}) => {277    const owner = await createEthAccountWithBalance(api, web3);278    const notOwner = await createEthAccount(web3);279    const helperFromOwner = collectionHelper(web3, owner);280    const helperFromNotOwner = collectionHelper(web3, notOwner);281    const result = await helperFromOwner.methods.create721Collection('A', 'A', 'A').send();282    const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);283    const EXPECTED_ERROR = 'NoPermission';284    {285      const sponsor = await createEthAccountWithBalance(api, web3);286      await expect(helperFromNotOwner.methods287        .setSponsor(collectionIdAddress, sponsor)288        .call()).to.be.rejectedWith(EXPECTED_ERROR);289      290      const sponsorHelper = collectionHelper(web3, sponsor);291      await expect(sponsorHelper.methods292        .confirmSponsorship(collectionIdAddress)293        .call()).to.be.rejectedWith('Caller is not set as sponsor');294    }295    {296      const shema = 'Some shema';297      await expect(helperFromNotOwner.methods298        .setOffchainShema(collectionIdAddress, shema)299        .call()).to.be.rejectedWith(EXPECTED_ERROR);300    }301    {302      const variable = 'Some variable';303      await expect(helperFromNotOwner.methods304        .setVariableOnChainSchema(collectionIdAddress, variable)305        .call()).to.be.rejectedWith(EXPECTED_ERROR);306    }307    {308      const constData = 'Some const';309      await expect(helperFromNotOwner.methods310        .setConstOnChainSchema(collectionIdAddress, constData)311        .call()).to.be.rejectedWith(EXPECTED_ERROR);312    }313    {314      const limits = '{"account_token_ownership_limit":1000}';315      await expect(helperFromNotOwner.methods316        .setLimits(collectionIdAddress, limits)317        .call()).to.be.rejectedWith(EXPECTED_ERROR);318    }319  });320321  itWeb3('(!negative test!) Set offchain shema (length limit)', async ({api, web3}) => {322    const owner = await createEthAccountWithBalance(api, web3);323    const helper = collectionHelper(web3, owner);324    const result = await helper.methods.create721Collection('Shema collection', 'A', 'A').send();325    const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);326    const OFFCHAIN_SCHEMA_LIMIT = 8192;327    const shema = 'A'.repeat(OFFCHAIN_SCHEMA_LIMIT + 1);328    await expect(helper.methods329      .setOffchainShema(collectionIdAddress, shema)330      .call()).to.be.rejectedWith('shema is too long. Max length is ' + OFFCHAIN_SCHEMA_LIMIT);331  });332333  itWeb3('(!negative test!) Set variable on chain schema (length limit)', async ({api, web3}) => {334    const owner = await createEthAccountWithBalance(api, web3);335    const helper = collectionHelper(web3, owner);336    const result = await helper.methods.create721Collection('Shema collection', 'A', 'A').send();337    const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);338    const VARIABLE_ON_CHAIN_SCHEMA_LIMIT = 8192;339    const variable = 'A'.repeat(VARIABLE_ON_CHAIN_SCHEMA_LIMIT + 1);340    await expect(helper.methods341      .setVariableOnChainSchema(collectionIdAddress, variable)342      .call()).to.be.rejectedWith('variable is too long. Max length is ' + VARIABLE_ON_CHAIN_SCHEMA_LIMIT);343  });344345  itWeb3('(!negative test!) Set const on chain schema (length limit)', async ({api, web3}) => {346    const owner = await createEthAccountWithBalance(api, web3);347    const helper = collectionHelper(web3, owner);348    const result = await helper.methods.create721Collection('Shema collection', 'A', 'A').send();349    const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);350    const CONST_ON_CHAIN_SCHEMA_LIMIT = 32768;351    const constData = 'A'.repeat(CONST_ON_CHAIN_SCHEMA_LIMIT + 1);352    await expect(helper.methods353      .setConstOnChainSchema(collectionIdAddress, constData)354      .call()).to.be.rejectedWith('const_on_chain is too long. Max length is ' + CONST_ON_CHAIN_SCHEMA_LIMIT);355  });356357  itWeb3('(!negative test!) Set limits', async ({api, web3}) => {358    const owner = await createEthAccountWithBalance(api, web3);359    const helper = collectionHelper(web3, owner);360    const result = await helper.methods.create721Collection('Shema collection', 'A', 'A').send();361    const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);362    const badJson = '{accountTokenOwnershipLimit: 1000}';363    await expect(helper.methods364      .setLimits(collectionIdAddress, badJson)365      .call()).to.be.rejectedWith('Parse JSON error:');366  });367});