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.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 {IKeyringPair} from '@polkadot/types/types';18import {evmToAddress} from '@polkadot/util-crypto';19import {Pallets, requirePalletsOrSkip} from '../util';20import {CollectionLimits, expect, itEth, usingEthPlaygrounds} from './util';2122const DECIMALS = 18;2324describe('Create FT collection from EVM', () => {25 let donor: IKeyringPair;2627 before(async function() {28 await usingEthPlaygrounds(async (helper, privateKey) => {29 requirePalletsOrSkip(this, helper, [Pallets.Fungible]);30 donor = await privateKey({filename: __filename});31 });32 });33 34 // Soft-deprecated35 itEth('[eth] Set sponsorship', async ({helper}) => {36 const owner = await helper.eth.createAccountWithBalance(donor);37 const sponsor = await helper.eth.createAccountWithBalance(donor);38 const ss58Format = helper.chain.getChainProperties().ss58Format;39 const description = 'absolutely anything';40 41 const {collectionId, collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', DECIMALS, description, 'ENVY');4243 const collection = helper.ethNativeContract.collection(collectionAddress, 'ft', owner, true);44 await collection.methods.setCollectionSponsor(sponsor).send();4546 let data = (await helper.rft.getData(collectionId))!;47 expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));4849 await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('ConfirmSponsorshipFail');5051 const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor, true);52 await sponsorCollection.methods.confirmCollectionSponsorship().send();5354 data = (await helper.rft.getData(collectionId))!;55 expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));56 });5758 itEth('[cross] Set sponsorship', async ({helper}) => {59 const owner = await helper.eth.createAccountWithBalance(donor);60 const sponsor = await helper.eth.createAccountWithBalance(donor);61 const ss58Format = helper.chain.getChainProperties().ss58Format;62 const description = 'absolutely anything';63 const {collectionId, collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Sponsor', DECIMALS, description, 'ENVY');64 65 const collection = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);66 const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);67 await collection.methods.setCollectionSponsorCross(sponsorCross).send();6869 let data = (await helper.rft.getData(collectionId))!;70 expect(data.raw.sponsorship.Unconfirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));7172 await expect(collection.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('ConfirmSponsorshipFail');7374 const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'rft', sponsor);75 await sponsorCollection.methods.confirmCollectionSponsorship().send();7677 data = (await helper.rft.getData(collectionId))!;78 expect(data.raw.sponsorship.Confirmed).to.be.equal(evmToAddress(sponsor, Number(ss58Format)));79 expect(await collection.methods.description().call()).to.deep.equal(description);80 });8182 itEth('Collection address exist', async ({helper}) => {83 const owner = await helper.eth.createAccountWithBalance(donor);84 const collectionAddressForNonexistentCollection = '0x17C4E6453CC49AAAAEACA894E6D9683E00112233';85 expect(await helper.ethNativeContract.collectionHelpers(collectionAddressForNonexistentCollection)86 .methods.isCollectionExist(collectionAddressForNonexistentCollection).call())87 .to.be.false;88 89 const {collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Exister', DECIMALS, 'absolutely anything', 'WIWT');90 expect(await helper.ethNativeContract.collectionHelpers(collectionAddress)91 .methods.isCollectionExist(collectionAddress).call())92 .to.be.true;93 });94 95 itEth('destroyCollection', async ({helper}) => {96 const owner = await helper.eth.createAccountWithBalance(donor);97 const {collectionAddress, collectionId} = await helper.eth.createFungibleCollection(owner, 'Exister', DECIMALS, 'absolutely anything', 'WIWT');98 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);99100 const result = await collectionHelper.methods101 .destroyCollection(collectionAddress)102 .send({from: owner});103104 const events = helper.eth.normalizeEvents(result.events);105 106 expect(events).to.be.deep.equal([107 {108 address: collectionHelper.options.address,109 event: 'CollectionDestroyed',110 args: {111 collectionId: collectionAddress,112 },113 },114 ]);115116 expect(await collectionHelper.methods117 .isCollectionExist(collectionAddress)118 .call()).to.be.false;119 expect(await helper.collection.getData(collectionId)).to.be.null;120 });121});122123describe('(!negative tests!) Create FT collection from EVM', () => {124 let donor: IKeyringPair;125 let nominal: bigint;126127 before(async function() {128 await usingEthPlaygrounds(async (helper, privateKey) => {129 requirePalletsOrSkip(this, helper, [Pallets.Fungible]);130 donor = await privateKey({filename: __filename});131 nominal = helper.balance.getOneTokenNominal();132 });133 });134135 itEth('(!negative test!) Create collection (bad lengths)', async ({helper}) => {136 const owner = await helper.eth.createAccountWithBalance(donor);137 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);138 {139 const MAX_NAME_LENGTH = 64;140 const collectionName = 'A'.repeat(MAX_NAME_LENGTH + 1);141 const description = 'A';142 const tokenPrefix = 'A';143144 await expect(collectionHelper.methods145 .createFTCollection(collectionName, DECIMALS, description, tokenPrefix)146 .call({value: Number(2n * nominal)})).to.be.rejectedWith('name is too long. Max length is ' + MAX_NAME_LENGTH);147 }148 {149 const MAX_DESCRIPTION_LENGTH = 256;150 const collectionName = 'A';151 const description = 'A'.repeat(MAX_DESCRIPTION_LENGTH + 1);152 const tokenPrefix = 'A';153 await expect(collectionHelper.methods154 .createFTCollection(collectionName, DECIMALS, description, tokenPrefix)155 .call({value: Number(2n * nominal)})).to.be.rejectedWith('description is too long. Max length is ' + MAX_DESCRIPTION_LENGTH);156 }157 {158 const MAX_TOKEN_PREFIX_LENGTH = 16;159 const collectionName = 'A';160 const description = 'A';161 const tokenPrefix = 'A'.repeat(MAX_TOKEN_PREFIX_LENGTH + 1);162 await expect(collectionHelper.methods163 .createFTCollection(collectionName, DECIMALS, description, tokenPrefix)164 .call({value: Number(2n * nominal)})).to.be.rejectedWith('token_prefix is too long. Max length is ' + MAX_TOKEN_PREFIX_LENGTH);165 }166 });167 168 itEth('(!negative test!) cannot create collection if value !== 2', async ({helper}) => {169 const owner = await helper.eth.createAccountWithBalance(donor);170 const collectionHelper = helper.ethNativeContract.collectionHelpers(owner);171 const expects = [0n, 1n, 30n].map(async value => {172 await expect(collectionHelper.methods173 .createFTCollection('Peasantry', DECIMALS, 'absolutely anything', 'TWIW')174 .call({value: Number(value * nominal)})).to.be.rejectedWith('Sent amount not equals to collection creation price (2000000000000000000)');175 });176 await Promise.all(expects);177 });178179 // Soft-deprecated180 itEth('(!negative test!) [eth] Check owner', async ({helper}) => {181 const owner = await helper.eth.createAccountWithBalance(donor);182 const peasant = helper.eth.createAccount();183 const {collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Transgressed', DECIMALS, 'absolutely anything', 'YVNE');184 const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'ft', peasant, true);185 const EXPECTED_ERROR = 'NoPermission';186 {187 const sponsor = await helper.eth.createAccountWithBalance(donor);188 await expect(peasantCollection.methods189 .setCollectionSponsor(sponsor)190 .call()).to.be.rejectedWith(EXPECTED_ERROR);191 192 const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'ft', sponsor, true);193 await expect(sponsorCollection.methods194 .confirmCollectionSponsorship()195 .call()).to.be.rejectedWith('ConfirmSponsorshipFail');196 }197 {198 await expect(peasantCollection.methods199 .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)200 .call()).to.be.rejectedWith(EXPECTED_ERROR);201 }202 });203204 itEth('(!negative test!) [cross] Check owner', async ({helper}) => {205 const owner = await helper.eth.createAccountWithBalance(donor);206 const peasant = helper.eth.createAccount();207 const {collectionAddress} = await helper.eth.createFungibleCollection(owner, 'Transgressed', DECIMALS, 'absolutely anything', 'YVNE');208 const peasantCollection = helper.ethNativeContract.collection(collectionAddress, 'ft', peasant);209 const EXPECTED_ERROR = 'NoPermission';210 {211 const sponsor = await helper.eth.createAccountWithBalance(donor);212 const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);213 await expect(peasantCollection.methods214 .setCollectionSponsorCross(sponsorCross)215 .call()).to.be.rejectedWith(EXPECTED_ERROR);216 217 const sponsorCollection = helper.ethNativeContract.collection(collectionAddress, 'ft', sponsor);218 await expect(sponsorCollection.methods219 .confirmCollectionSponsorship()220 .call()).to.be.rejectedWith('ConfirmSponsorshipFail');221 }222 {223 await expect(peasantCollection.methods224 .setCollectionLimit(CollectionLimits.AccountTokenOwnership, true, 1000)225 .call()).to.be.rejectedWith(EXPECTED_ERROR);226 }227 }); 228});tests/src/eth/createNFTCollection.test.tsdiffbeforeafterboth--- a/tests/src/eth/createNFTCollection.test.ts
+++ b/tests/src/eth/createNFTCollection.test.ts
@@ -16,7 +16,8 @@
import {evmToAddress} from '@polkadot/util-crypto';
import {IKeyringPair} from '@polkadot/types/types';
-import {CollectionLimits, expect, itEth, usingEthPlaygrounds} from './util';
+import {expect, itEth, usingEthPlaygrounds} from './util';
+import { CollectionLimits } from './util/playgrounds/types';
describe('Create NFT collection from EVM', () => {
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
+}