difftreelog
refactor `collection_limits`, add docs for `CollectionLimits`
in: master
9 files changed
pallets/common/src/erc.rsdiffbeforeafterboth--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -358,18 +358,16 @@
),
limits
.sponsored_data_rate_limit
- .map(|limit| {
- (
- EvmCollectionLimits::SponsoredDataRateLimit,
- match limit {
- SponsoringRateLimit::Blocks(_) => true,
- _ => false,
- },
- match limit {
- SponsoringRateLimit::Blocks(blocks) => blocks.into(),
- _ => Default::default(),
- },
- )
+ .and_then(|limit| {
+ if let SponsoringRateLimit::Blocks(blocks) = limit {
+ Some((
+ EvmCollectionLimits::SponsoredDataRateLimit,
+ true,
+ blocks.into(),
+ ))
+ } else {
+ None
+ }
})
.unwrap_or((
EvmCollectionLimits::SponsoredDataRateLimit,
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -155,6 +155,8 @@
}
}
}
+
+/// [`CollectionLimits`](up_data_structs::CollectionLimits) representation for EVM.
#[derive(Debug, Default, Clone, Copy, AbiCoder)]
#[repr(u8)]
pub enum CollectionLimits {
tests/src/eth/collectionLimits.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionLimits.test.ts
+++ b/tests/src/eth/collectionLimits.test.ts
@@ -1,6 +1,7 @@
import {IKeyringPair} from '@polkadot/types/types';
import {Pallets} from '../util';
-import {CollectionLimits, expect, itEth, usingEthPlaygrounds} from './util';
+import {expect, itEth, usingEthPlaygrounds} from './util';
+import {CollectionLimits} from './util/playgrounds/types';
describe('Can set collection limits', () => {
@@ -62,15 +63,15 @@
// Check limits from eth:
const limitsEvm = await collectionEvm.methods.collectionLimits().call({from: owner});
expect(limitsEvm).to.have.length(9);
- expect(limitsEvm[0]).to.deep.eq(['0', true, limits.accountTokenOwnershipLimit.toString()]);
- expect(limitsEvm[1]).to.deep.eq(['1', true, limits.sponsoredDataSize.toString()]);
- expect(limitsEvm[2]).to.deep.eq(['2', true, limits.sponsoredDataRateLimit.toString()]);
- expect(limitsEvm[3]).to.deep.eq(['3', true, limits.tokenLimit.toString()]);
- expect(limitsEvm[4]).to.deep.eq(['4', true, limits.sponsorTransferTimeout.toString()]);
- expect(limitsEvm[5]).to.deep.eq(['5', true, limits.sponsorApproveTimeout.toString()]);
- expect(limitsEvm[6]).to.deep.eq(['6', true, limits.ownerCanTransfer.toString()]);
- expect(limitsEvm[7]).to.deep.eq(['7', true, limits.ownerCanDestroy.toString()]);
- expect(limitsEvm[8]).to.deep.eq(['8', true, limits.transfersEnabled.toString()]);
+ expect(limitsEvm[0]).to.deep.eq([CollectionLimits.AccountTokenOwnership.toString(), true, limits.accountTokenOwnershipLimit.toString()]);
+ expect(limitsEvm[1]).to.deep.eq([CollectionLimits.SponsoredDataSize.toString(), true, limits.sponsoredDataSize.toString()]);
+ expect(limitsEvm[2]).to.deep.eq([CollectionLimits.SponsoredDataRateLimit.toString(), true, limits.sponsoredDataRateLimit.toString()]);
+ expect(limitsEvm[3]).to.deep.eq([CollectionLimits.TokenLimit.toString(), true, limits.tokenLimit.toString()]);
+ expect(limitsEvm[4]).to.deep.eq([CollectionLimits.SponsorTransferTimeout.toString(), true, limits.sponsorTransferTimeout.toString()]);
+ expect(limitsEvm[5]).to.deep.eq([CollectionLimits.SponsorApproveTimeout.toString(), true, limits.sponsorApproveTimeout.toString()]);
+ expect(limitsEvm[6]).to.deep.eq([CollectionLimits.OwnerCanTransfer.toString(), true, limits.ownerCanTransfer.toString()]);
+ expect(limitsEvm[7]).to.deep.eq([CollectionLimits.OwnerCanDestroy.toString(), true, limits.ownerCanDestroy.toString()]);
+ expect(limitsEvm[8]).to.deep.eq([CollectionLimits.TransferEnabled.toString(), true, limits.transfersEnabled.toString()]);
}));
});
tests/src/eth/createFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createFTCollection.test.ts
+++ b/tests/src/eth/createFTCollection.test.ts
@@ -17,7 +17,8 @@
import {IKeyringPair} from '@polkadot/types/types';
import {evmToAddress} from '@polkadot/util-crypto';
import {Pallets, requirePalletsOrSkip} from '../util';
-import {CollectionLimits, expect, itEth, usingEthPlaygrounds} from './util';
+import {expect, itEth, usingEthPlaygrounds} from './util';
+import { CollectionLimits } from './util/playgrounds/types';
const DECIMALS = 18;
tests/src/eth/createNFTCollection.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.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 {evmToAddress} from '@polkadot/util-crypto';18import {IKeyringPair} from '@polkadot/types/types';19import {CollectionLimits, expect, itEth, usingEthPlaygrounds} from './util';202122describe('Create NFT collection from EVM', () => {23 let donor: IKeyringPair;2425 before(async function () {26 await usingEthPlaygrounds(async (_helper, privateKey) => {27 donor = await privateKey({filename: __filename});28 });29 });3031 itEth('Create collection with properties & get desctription', async ({helper}) => {32 const owner = await helper.eth.createAccountWithBalance(donor);3334 const name = 'CollectionEVM';35 const description = 'Some description';36 const prefix = 'token prefix';37 const baseUri = 'BaseURI';3839 const {collectionId, collectionAddress, events} = await helper.eth.createERC721MetadataCompatibleNFTCollection(owner, name, description, prefix, baseUri);40 const contract = helper.ethNativeContract.collection(collectionAddress, 'nft');41 42 expect(events).to.be.deep.equal([43 {44 address: '0x6C4E9fE1AE37a41E93CEE429e8E1881aBdcbb54F',45 event: 'CollectionCreated',46 args: {47 owner: owner,48 collectionId: collectionAddress,49 },50 },51 ]);5253 const collection = helper.nft.getCollectionObject(collectionId);54 const data = (await collection.getData())!;55 56 expect(data.name).to.be.eq(name);57 expect(data.description).to.be.eq(description);58 expect(data.raw.tokenPrefix).to.be.eq(prefix);59 expect(data.raw.mode).to.be.eq('NFT');60 61 expect(await contract.methods.description().call()).to.deep.equal(description);62 63 const options = await collection.getOptions();64 expect(options.tokenPropertyPermissions).to.be.deep.equal([65 {66 key: 'URI',67 permission: {mutable: true, collectionAdmin: true, tokenOwner: false},68 },69 {70 key: 'URISuffix',71 permission: {mutable: true, collectionAdmin: true, tokenOwner: false},72 },73 ]);74 });7576 // Soft-deprecated77 itEth('[eth] Set sponsorship', async ({helper}) => {78 const owner = await helper.eth.createAccountWithBalance(donor);79 const sponsor = await helper.eth.createAccountWithBalance(donor);80 const ss58Format = helper.chain.getChainProperties().ss58Format;81 const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', 'absolutely anything', 'ROC');8283 const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', owner, true);84 await collection.methods.setCollectionSponsor(sponsor).send();8586 let data = (await helper.nft.getData(collectionId))!;87 expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));8889 await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('ConfirmSponsorshipFail');9091 const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor, true);92 await sponsorCollection.methods.confirmCollectionSponsorship().send();9394 data = (await helper.nft.getData(collectionId))!;95 expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));96 });9798 itEth('[cross] Set sponsorship & get description', async ({helper}) => {99 const owner = await helper.eth.createAccountWithBalance(donor);100 const sponsor = await helper.eth.createAccountWithBalance(donor);101 const ss58Format = helper.chain.getChainProperties().ss58Format;102 const description = 'absolutely anything';103 const {collectionId, collectionAddress} = await helper.eth.createNFTCollection(owner, 'Sponsor', description, 'ROC');104105 const collection = helper.ethNativeContract.collection(collectionAddress, 'nft', owner);106 const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);107 await collection.methods.setCollectionSponsorCross(sponsorCross).send();108109 let data = (await helper.nft.getData(collectionId))!;110 expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));111112 await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('ConfirmSponsorshipFail');113114 const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor);115 await sponsorCollection.methods.confirmCollectionSponsorship().send();116117 data = (await helper.nft.getData(collectionId))!;118 expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));119 120 expect(await sponsorCollection.methods.description().call()).to.deep.equal(description);121 });122123 itEth('Collection address exist', async ({helper}) => {124 const owner = await helper.eth.createAccountWithBalance(donor);125 const collectionAddressForNonexistentCollection = '0x17C4E6453CC49AAAAEACA894E6D9683E00112233';126 expect(await helper.ethNativeContract.collectionHelpers(collectionAddressForNonexistentCollection)127 .methods.isCollectionExist(collectionAddressForNonexistentCollection).call())128 .to.be.false;129130 const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Exister', 'absolutely anything', 'EVC');131 expect(await helper.ethNativeContract.collectionHelpers(collectionAddress)132 .methods.isCollectionExist(collectionAddress).call())133 .to.be.true;134 });135});136137describe('(!negative tests!) Create NFT collection from EVM', () => {138 let donor: IKeyringPair;139 let nominal: bigint;140141 before(async function () {142 await usingEthPlaygrounds(async (helper, privateKey) => {143 donor = await privateKey({filename: __filename});144 nominal = helper.balance.getOneTokenNominal();145 });146 });147148 itEth('(!negative test!) Create collection (bad lengths)', async ({helper}) => {149 const owner = await helper.eth.createAccountWithBalance(donor);150 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);151 {152 const MAX_NAME_LENGTH = 64;153 const collectionName = 'A'.repeat(MAX_NAME_LENGTH + 1);154 const description = 'A';155 const tokenPrefix = 'A';156157 await expect(collectionHelper.methods158 .createNFTCollection(collectionName, description, tokenPrefix)159 .call({value: Number(2n * nominal)})).to.be.rejectedWith('name is too long. Max length is ' + MAX_NAME_LENGTH);160161 }162 {163 const MAX_DESCRIPTION_LENGTH = 256;164 const collectionName = 'A';165 const description = 'A'.repeat(MAX_DESCRIPTION_LENGTH + 1);166 const tokenPrefix = 'A';167 await expect(collectionHelper.methods168 .createNFTCollection(collectionName, description, tokenPrefix)169 .call({value: Number(2n * nominal)})).to.be.rejectedWith('description is too long. Max length is ' + MAX_DESCRIPTION_LENGTH);170 }171 {172 const MAX_TOKEN_PREFIX_LENGTH = 16;173 const collectionName = 'A';174 const description = 'A';175 const tokenPrefix = 'A'.repeat(MAX_TOKEN_PREFIX_LENGTH + 1);176 await expect(collectionHelper.methods177 .createNFTCollection(collectionName, description, tokenPrefix)178 .call({value: Number(2n * nominal)})).to.be.rejectedWith('token_prefix is too long. Max length is ' + MAX_TOKEN_PREFIX_LENGTH);179 }180 });181182 itEth('(!negative test!) Create collection (no funds)', async ({helper}) => {183 const owner = await helper.eth.createAccountWithBalance(donor);184 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);185 await expect(collectionHelper.methods186 .createNFTCollection('Peasantry', 'absolutely anything', 'CVE')187 .call({value: Number(1n * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');188 });189190 // Soft-deprecated191 itEth('(!negative test!) [eth] Check owner', async ({helper}) => {192 const owner = await helper.eth.createAccountWithBalance(donor);193 const malfeasant = helper.eth.createAccount();194 const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Transgressed', 'absolutely anything', 'COR');195 const malfeasantCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', malfeasant, true);196 const EXPECTED_ERROR = 'NoPermission';197 {198 const sponsor = await helper.eth.createAccountWithBalance(donor);199 await expect(malfeasantCollection.methods200 .setCollectionSponsor(sponsor)201 .call()).to.be.rejectedWith(EXPECTED_ERROR);202203 const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor, true);204 await expect(sponsorCollection.methods205 .confirmCollectionSponsorship()206 .call()).to.be.rejectedWith('ConfirmSponsorshipFail');207 }208 {209 await expect(malfeasantCollection.methods210 .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)211 .call()).to.be.rejectedWith(EXPECTED_ERROR);212 }213 });214215 itEth('(!negative test!) [cross] Check owner', async ({helper}) => {216 const owner = await helper.eth.createAccountWithBalance(donor);217 const malfeasant = helper.eth.createAccount();218 const {collectionAddress} = await helper.eth.createNFTCollection(owner, 'Transgressed', 'absolutely anything', 'COR');219 const malfeasantCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', malfeasant);220 const EXPECTED_ERROR = 'NoPermission';221 {222 const sponsor = await helper.eth.createAccountWithBalance(donor);223 const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);224 await expect(malfeasantCollection.methods225 .setCollectionSponsorCross(sponsorCross)226 .call()).to.be.rejectedWith(EXPECTED_ERROR);227228 const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'nft', sponsor);229 await expect(sponsorCollection.methods230 .confirmCollectionSponsorship()231 .call()).to.be.rejectedWith('ConfirmSponsorshipFail');232 }233 {234 await expect(malfeasantCollection.methods235 .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)236 .call()).to.be.rejectedWith(EXPECTED_ERROR);237 }238 });239240 itEth('destroyCollection', async ({helper}) => {241 const owner = await helper.eth.createAccountWithBalance(donor);242 const {collectionAddress, collectionId} = await helper.eth.createNFTCollection(owner, 'Limits', 'absolutely anything', 'OLF');243 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);244245246 const result = await collectionHelper.methods247 .destroyCollection(collectionAddress)248 .send({from: owner});249250 const events = helper.eth.normalizeEvents(result.events);251 252 expect(events).to.be.deep.equal([253 {254 address: collectionHelper.options.address,255 event: 'CollectionDestroyed',256 args: {257 collectionId: collectionAddress,258 },259 },260 ]);261262 expect(await collectionHelper.methods263 .isCollectionExist(collectionAddress)264 .call()).to.be.false;265 expect(await helper.collection.getData(collectionId)).to.be.null;266 });267});tests/src/eth/createRFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createRFTCollection.test.ts
+++ b/tests/src/eth/createRFTCollection.test.ts
@@ -17,7 +17,8 @@
import {evmToAddress} from '@polkadot/util-crypto';
import {IKeyringPair} from '@polkadot/types/types';
import {Pallets, requirePalletsOrSkip} from '../util';
-import {CollectionLimits, expect, itEth, usingEthPlaygrounds} from './util';
+import {expect, itEth, usingEthPlaygrounds} from './util';
+import { CollectionLimits } from './util/playgrounds/types';
describe('Create RFT collection from EVM', () => {
tests/src/eth/events.test.tsdiffbeforeafterboth--- a/tests/src/eth/events.test.ts
+++ b/tests/src/eth/events.test.ts
@@ -16,10 +16,10 @@
import {expect} from 'chai';
import {IKeyringPair} from '@polkadot/types/types';
-import {CollectionLimits, EthUniqueHelper, itEth, usingEthPlaygrounds} from './util';
+import {EthUniqueHelper, itEth, usingEthPlaygrounds} from './util';
import {IEvent, TCollectionMode} from '../util/playgrounds/types';
import {Pallets, requirePalletsOrSkip} from '../util';
-import {EthTokenPermissions, NormalizedEvent} from './util/playgrounds/types';
+import {CollectionLimits, EthTokenPermissions, NormalizedEvent} from './util/playgrounds/types';
let donor: IKeyringPair;
tests/src/eth/util/index.tsdiffbeforeafterboth--- a/tests/src/eth/util/index.ts
+++ b/tests/src/eth/util/index.ts
@@ -26,18 +26,8 @@
Allowlisted = 1,
Generous = 2,
}
-export enum CollectionLimits {
- AccountTokenOwnership,
- SponsoredDataSize,
- SponsoredDataRateLimit,
- TokenLimit,
- SponsorTransferTimeout,
- SponsorApproveTimeout,
- OwnerCanTransfer,
- OwnerCanDestroy,
- TransferEnabled
-}
+
export const usingEthPlaygrounds = async (code: (helper: EthUniqueHelper, privateKey: (seed: string | {filename: string}) => Promise<IKeyringPair>) => Promise<void>) => {
const silentConsole = new SilentConsole();
silentConsole.enable();
tests/src/eth/util/playgrounds/types.tsdiffbeforeafterboth--- a/tests/src/eth/util/playgrounds/types.ts
+++ b/tests/src/eth/util/playgrounds/types.ts
@@ -24,4 +24,15 @@
Mutable,
TokenOwner,
CollectionAdmin
-}
\ No newline at end of file
+}
+export enum CollectionLimits {
+ AccountTokenOwnership,
+ SponsoredDataSize,
+ SponsoredDataRateLimit,
+ TokenLimit,
+ SponsorTransferTimeout,
+ SponsorApproveTimeout,
+ OwnerCanTransfer,
+ OwnerCanDestroy,
+ TransferEnabled
+}