git.delta.rocks / unique-network / refs/commits / 39148f6db4ae

--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6711,24 +6711,6 @@
 ]
 
 [[package]]
-name = "pallet-unique-scheduler-v2"
-version = "0.1.0"
-dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "log",
- "pallet-preimage",
- "parity-scale-codec 3.2.1",
- "scale-info",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "substrate-test-utils",
-]
-
-[[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
 source = "git+https://github.com/paritytech/substrate?branch=polkadot-v0.9.29#cc370aa61e15c18d23a2f686b812fd576a630afe"

--- a/tests/src/eth/base.test.ts
+++ b/tests/src/eth/base.test.ts
@@ -14,8 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
 
-import {Contract} from 'web3-eth-contract';
-
 import {IKeyringPair} from '@polkadot/types/types';
 import {EthUniqueHelper, itEth, usingEthPlaygrounds, expect} from './util';
 
@@ -44,7 +42,7 @@
       from: userA,
       to: userB,
       value: '1000000',
-      gas: helper.eth.DEFAULT_GAS
+      gas: helper.eth.DEFAULT_GAS,
     }));
     const balanceB = await helper.balance.getEthereum(userB);
     expect(cost - balanceB < BigInt(0.2 * Number(helper.balance.getOneTokenNominal()))).to.be.true;
@@ -93,7 +91,7 @@
       const donor = await privateKey({filename: __filename});
       const [alice] = await helper.arrange.createAccounts([10n], donor);
       ({collectionId: simpleNftCollectionId} = await helper.nft.mintCollection(alice, {name: 'test', description: 'test', tokenPrefix: 'test'}));
-      minter = helper.eth.createAccount();
+      minter = await helper.eth.createAccountWithBalance(donor);
       ({collectionId: erc721MetadataCompatibleNftCollectionId} = await helper.eth.createERC721MetadataCompatibleNFTCollection(minter, 'n', 'd', 'p', BASE_URI));
     });
   });

18import {Pallets} from '../util';18import {Pallets} from '../util';
19import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types';19import {IProperty, ITokenPropertyPermission} from '../util/playgrounds/types';
20import {IKeyringPair} from '@polkadot/types/types';20import {IKeyringPair} from '@polkadot/types/types';
21import {Contract} from 'web3-eth-contract';
2221
23describe('EVM collection properties', () => {22describe('EVM collection properties', () => {
24  let donor: IKeyringPair;23  let donor: IKeyringPair;
87    const caller = await helper.eth.createAccountWithBalance(donor);86    const caller = await helper.eth.createAccountWithBalance(donor);
88    const bruh = await helper.eth.createAccountWithBalance(donor);87    const bruh = await helper.eth.createAccountWithBalance(donor);
8988
90    const BASE_URI = 'base/'89    const BASE_URI = 'base/';
91    const SUFFIX = 'suffix1'90    const SUFFIX = 'suffix1';
92    const URI = 'uri1'91    const URI = 'uri1';
9392
94    const collectionHelpers = helper.ethNativeContract.collectionHelpers(caller);93    const collectionHelpers = helper.ethNativeContract.collectionHelpers(caller);
95    const creatorMethod = mode === 'rft' ? 'createRFTCollection' : 'createNFTCollection'94    const creatorMethod = mode === 'rft' ? 'createRFTCollection' : 'createNFTCollection';
9695
97    const {collectionId, collectionAddress} = await helper.eth[creatorMethod](caller, 'n', 'd', 'p')96    const {collectionId, collectionAddress} = await helper.eth[creatorMethod](caller, 'n', 'd', 'p');
9897
99    const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);98    const contract = helper.ethNativeContract.collectionById(collectionId, mode, caller);
100    await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too99    await contract.methods.addCollectionAdmin(bruh).send(); // to check that admin will work too
101100
102    const collection1 = await helper.nft.getCollectionObject(collectionId);101    const collection1 = helper.nft.getCollectionObject(collectionId);
103    const data1 = await collection1.getData()102    const data1 = await collection1.getData();
104    expect(data1?.raw.flags.erc721metadata).to.be.false;103    expect(data1?.raw.flags.erc721metadata).to.be.false;
105    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;104    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.false;
106105
109108
110    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;109    expect(await contract.methods.supportsInterface('0x5b5e139f').call()).to.be.true;
111110
112    const collection2 = await helper.nft.getCollectionObject(collectionId);111    const collection2 = helper.nft.getCollectionObject(collectionId);
113    const data2 = await collection2.getData()112    const data2 = await collection2.getData();
114    expect(data2?.raw.flags.erc721metadata).to.be.true;113    expect(data2?.raw.flags.erc721metadata).to.be.true;
115114
116    const TPPs = data2?.raw.tokenPropertyPermissions115    const propertyPermissions = data2?.raw.tokenPropertyPermissions;
117    expect(TPPs?.length).to.equal(2);116    expect(propertyPermissions?.length).to.equal(2);
118117
119    expect(TPPs.find((tpp: ITokenPropertyPermission) => {118    expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {
120      return tpp.key === "URI" && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner119      return tpp.key === 'URI' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;
121    })).to.be.not.null120    })).to.be.not.null;
122121
123    expect(TPPs.find((tpp: ITokenPropertyPermission) => {122    expect(propertyPermissions.find((tpp: ITokenPropertyPermission) => {
124      return tpp.key === "URISuffix" && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner123      return tpp.key === 'URISuffix' && tpp.permission.mutable && tpp.permission.collectionAdmin && !tpp.permission.tokenOwner;
125    })).to.be.not.null124    })).to.be.not.null;
126125
127    expect(data2?.raw.properties?.find((property: IProperty) => {126    expect(data2?.raw.properties?.find((property: IProperty) => {
128      return property.key === "baseURI" && property.value === BASE_URI127      return property.key === 'baseURI' && property.value === BASE_URI;
129    })).to.be.not.null128    })).to.be.not.null;
130129
131    const token1Result = await contract.methods.mint(bruh).send();130    const token1Result = await contract.methods.mint(bruh).send();
132    const tokenId1 = token1Result.events.Transfer.returnValues.tokenId;131    const tokenId1 = token1Result.events.Transfer.returnValues.tokenId;
133132
134    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI);133    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI);
135134
136    await contract.methods.setProperty(tokenId1, "URISuffix", Buffer.from(SUFFIX)).send();135    await contract.methods.setProperty(tokenId1, 'URISuffix', Buffer.from(SUFFIX)).send();
137    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);136    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);
138137
139    await contract.methods.setProperty(tokenId1, "URI", Buffer.from(URI)).send();138    await contract.methods.setProperty(tokenId1, 'URI', Buffer.from(URI)).send();
140    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(URI);139    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(URI);
141140
142    await contract.methods.deleteProperty(tokenId1, "URI").send();141    await contract.methods.deleteProperty(tokenId1, 'URI').send();
143    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);142    expect(await contract.methods.tokenURI(tokenId1).call()).to.equal(BASE_URI + SUFFIX);
144143
145    const token2Result = await contract.methods.mintWithTokenURI(bruh, URI).send();144    const token2Result = await contract.methods.mintWithTokenURI(bruh, URI).send();
146    const tokenId2 = token2Result.events.Transfer.returnValues.tokenId;145    const tokenId2 = token2Result.events.Transfer.returnValues.tokenId;
147146
148    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(URI);147    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(URI);
149148
150    await contract.methods.deleteProperty(tokenId2, "URI").send();149    await contract.methods.deleteProperty(tokenId2, 'URI').send();
151    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI);150    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI);
152151
153    await contract.methods.setProperty(tokenId2, "URISuffix", Buffer.from(SUFFIX)).send();152    await contract.methods.setProperty(tokenId2, 'URISuffix', Buffer.from(SUFFIX)).send();
154    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI + SUFFIX);153    expect(await contract.methods.tokenURI(tokenId2).call()).to.equal(BASE_URI + SUFFIX);
155  }154  };
156155
157  itEth('ERC721Metadata property can be set for NFT collection', async({helper}) => {156  itEth('ERC721Metadata property can be set for NFT collection', async({helper}) => {
158    await checkERC721Metadata(helper, 'nft');157    await checkERC721Metadata(helper, 'nft');

--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -247,7 +247,7 @@
 
     const userCollectionEvm = helper.ethNativeContract.collection(collectionAddress, 'nft', user);
 
-    let result = await userCollectionEvm.methods.mintWithTokenURI(user, 'Test URI',).send();
+    const result = await userCollectionEvm.methods.mintWithTokenURI(user, 'Test URI').send();
     const tokenId = result.events.Transfer.returnValues.tokenId;
 
     const events = helper.eth.normalizeEvents(result.events);

--- a/tests/src/eth/proxy/nonFungibleProxy.test.ts
+++ b/tests/src/eth/proxy/nonFungibleProxy.test.ts
@@ -111,7 +111,7 @@
     await collectionEvmOwned.methods.addCollectionAdmin(contract.options.address).send();
 
     {
-      const nextTokenId = await contract.methods.nextTokenId().call()
+      const nextTokenId = await contract.methods.nextTokenId().call();
       const result = await contract.methods.mintWithTokenURI(receiver, nextTokenId, 'Test URI').send({from: caller});
       const tokenId = result.events.Transfer.returnValues.tokenId;
       expect(tokenId).to.be.equal('1');

--- a/tests/src/eth/util/index.ts
+++ b/tests/src/eth/util/index.ts
@@ -14,7 +14,7 @@
 import chai from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 import chaiLike from 'chai-like';
-import {getTestSeed, requirePalletsOrSkip} from '../../util';
+import {getTestSeed, MINIMUM_DONOR_FUND, requirePalletsOrSkip} from '../../util';
 
 chai.use(chaiAsPromised);
 chai.use(chaiLike);
@@ -43,7 +43,7 @@
       else {
         const actualSeed = getTestSeed(seed.filename);
         let account = helper.util.fromSeed(actualSeed, ss58Format);
-        if (await helper.balance.getSubstrate(account.address) == 0n) {
+        if (await helper.balance.getSubstrate(account.address) < MINIMUM_DONOR_FUND) {
           console.warn(`${path.basename(seed.filename)}: Not enough funds present on the filename account. Using the default one as the donor instead.`);
           account = helper.util.fromSeed('//Alice', ss58Format);
         }

--- a/tests/src/eth/util/playgrounds/unique.dev.ts
+++ b/tests/src/eth/util/playgrounds/unique.dev.ts
@@ -189,7 +189,7 @@
   async createERC721MetadataCompatibleNFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
     const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
 
-    const {collectionId, collectionAddress} = await this.createNFTCollection(signer, name, description, tokenPrefix)
+    const {collectionId, collectionAddress} = await this.createNFTCollection(signer, name, description, tokenPrefix);
 
     await collectionHelper.methods.makeCollectionERC721MetadataCompatible(collectionAddress, baseUri).send();
 
@@ -211,7 +211,7 @@
   async createERC721MetadataCompatibleRFTCollection(signer: string, name: string, description: string, tokenPrefix: string, baseUri: string): Promise<{collectionId: number, collectionAddress: string}> {
     const collectionHelper = this.helper.ethNativeContract.collectionHelpers(signer);
 
-    const {collectionId, collectionAddress} = await this.createRFTCollection(signer, name, description, tokenPrefix)
+    const {collectionId, collectionAddress} = await this.createRFTCollection(signer, name, description, tokenPrefix);
 
     await collectionHelper.methods.makeCollectionERC721MetadataCompatible(collectionAddress, baseUri).send();
 

--- a/tests/src/pallet-presence.test.ts
+++ b/tests/src/pallet-presence.test.ts
@@ -62,7 +62,7 @@
       const chain = await helper.callRpc('api.rpc.system.chain', []);
 
       const refungible = 'refungible';
-      const scheduler = 'scheduler';
+      // const scheduler = 'scheduler';
       const foreignAssets = 'foreignassets';
       const rmrkPallets = ['rmrkcore', 'rmrkequip'];
       const appPromotion = 'apppromotion';
@@ -70,7 +70,7 @@
       if (chain.eq('OPAL by UNIQUE')) {
         requiredPallets.push(
           refungible,
-          scheduler,
+          // scheduler,
           foreignAssets,
           appPromotion,
           ...rmrkPallets,