git.delta.rocks / unique-network / refs/commits / e137eba0a7ea

difftreelog

fix small fixes

Trubnikov Sergey2022-08-25parent: #9d78c86.patch.diff
in: master

7 files changed

modifiedpallets/common/src/erc.rsdiffbeforeafterboth
--- a/pallets/common/src/erc.rs
+++ b/pallets/common/src/erc.rs
@@ -179,15 +179,19 @@
 	///
 	/// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.
 	fn get_collection_sponsor(&self) -> Result<(address, uint256)> {
-		let sponsor = match self.collection.sponsorship {
-			SponsorshipState::Disabled | SponsorshipState::Unconfirmed(_) => {
-				return Ok(Default::default())
-			}
-			SponsorshipState::Confirmed(ref sponsor) => sponsor,
+		let sponsor = match self.collection.sponsorship.sponsor() {
+			Some(sponsor) => sponsor,
+			None => return Ok(Default::default()),
 		};
 		let sponsor = T::CrossAccountId::from_sub(sponsor.clone());
-		let sponsor_sub = convert_cross_account_to_uint256::<T>(&sponsor);
-		Ok((*sponsor.as_eth(), sponsor_sub))
+		let result: (address, uint256) = if sponsor.is_canonical_substrate() {
+			let sponsor = convert_cross_account_to_uint256::<T>(&sponsor);
+			(Default::default(), sponsor)
+		} else {
+			let sponsor = *sponsor.as_eth();
+			(sponsor, Default::default())
+		};
+		Ok(result)
 	}
 
 	/// Set limits for the collection.
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -64,7 +64,7 @@
 where
 	T::AccountId: From<[u8; 32]>,
 {
-	let mut new_admin_arr: [u8; 32] = Default::default();
+	let mut new_admin_arr = [0_u8; 32];
 	from.to_big_endian(&mut new_admin_arr);
 	let account_id = T::AccountId::from(new_admin_arr);
 	T::CrossAccountId::from_sub(account_id)
modifiedpallets/fungible/CHANGELOG.mddiffbeforeafterboth
--- a/pallets/fungible/CHANGELOG.md
+++ b/pallets/fungible/CHANGELOG.md
@@ -5,7 +5,7 @@
 ## [v0.1.4] - 2022-08-24
 
 ### Change
- - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.
+ - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
 
 <!-- bureaucrate goes here -->
 ## [v0.1.3] 2022-08-16
modifiedpallets/nonfungible/CHANGELOG.mddiffbeforeafterboth
--- a/pallets/nonfungible/CHANGELOG.md
+++ b/pallets/nonfungible/CHANGELOG.md
@@ -5,7 +5,7 @@
 ## [v0.1.5] - 2022-08-24
 
 ### Change
- - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.
+ - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
 
 <!-- bureaucrate goes here -->
 ## [v0.1.4] 2022-08-16
modifiedpallets/refungible/CHANGELOG.mddiffbeforeafterboth
--- a/pallets/refungible/CHANGELOG.md
+++ b/pallets/refungible/CHANGELOG.md
@@ -5,7 +5,7 @@
 ## [v0.2.4] - 2022-08-24
 
 ### Change
- - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.
+ - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
 
 <!-- bureaucrate goes here -->
 ## [v0.2.3] 2022-08-16
modifiedtests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth
after · tests/src/eth/collectionSponsoring.test.ts
1import {addToAllowListExpectSuccess, bigIntToSub, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, getDetailedCollectionInfo, setCollectionSponsorExpectSuccess} from '../util/helpers';2import {itWeb3, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents, createEthAccountWithBalance, evmCollectionHelpers, getCollectionAddressFromResult, evmCollection, ethBalanceViaSub, subToEth} from './util/helpers';3import nonFungibleAbi from './nonFungibleAbi.json';4import {expect} from 'chai';5import {evmToAddress} from '@polkadot/util-crypto';6import {submitTransactionAsync} from '../substrate/substrate-api';7import getBalance from '../substrate/get-balance';89describe('evm collection sponsoring', () => {10  itWeb3('sponsors mint transactions', async ({web3, privateKeyWrapper}) => {11    const alice = privateKeyWrapper('//Alice');1213    const collection = await createCollectionExpectSuccess();14    await setCollectionSponsorExpectSuccess(collection, alice.address);15    await confirmSponsorshipExpectSuccess(collection);1617    const minter = createEthAccount(web3);18    expect(await web3.eth.getBalance(minter)).to.equal('0');1920    const address = collectionIdToAddress(collection);21    const contract = new web3.eth.Contract(nonFungibleAbi as any, collectionIdToAddress(collection), {from: minter, ...GAS_ARGS});2223    await enablePublicMintingExpectSuccess(alice, collection);24    await addToAllowListExpectSuccess(alice, collection, {Ethereum: minter});2526    const nextTokenId = await contract.methods.nextTokenId().call();27    expect(nextTokenId).to.equal('1');28    const result = await contract.methods.mint(minter, nextTokenId).send();29    const events = normalizeEvents(result.events);30    expect(events).to.be.deep.equal([31      {32        address,33        event: 'Transfer',34        args: {35          from: '0x0000000000000000000000000000000000000000',36          to: minter,37          tokenId: nextTokenId,38        },39      },40    ]);41  });4243  itWeb3('Set substrate sponsor', async ({api, web3, privateKeyWrapper}) => {44    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);45    const collectionHelpers = evmCollectionHelpers(web3, owner);46    let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();47    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);48    const sponsor = privateKeyWrapper('//Alice');49    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);5051    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;52    result = await collectionEvm.methods.setCollectionSponsorSubstrate(sponsor.addressRaw).send({from: owner});53    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;54    55    const confirmTx = await api.tx.unique.confirmSponsorship(collectionId);56    await submitTransactionAsync(sponsor, confirmTx);57    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;58    59    const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});60    expect(bigIntToSub(api, BigInt(sponsorTuple[1]))).to.be.eq(sponsor.address);61  });6263  itWeb3('Remove sponsor', async ({api, web3, privateKeyWrapper}) => {64    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);65    const collectionHelpers = evmCollectionHelpers(web3, owner);66    let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();67    const {collectionIdAddress} = await getCollectionAddressFromResult(api, result);68    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);69    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);7071    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;72    result = await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});73    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;74    75    await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});76    expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;77    78    await collectionEvm.methods.removeCollectionSponsor().send({from: owner});79    80    const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});81    expect(sponsorTuple.field_0).to.be.eq('0x0000000000000000000000000000000000000000');82  });8384  itWeb3('Sponsoring collection from evm address via access list', async ({api, web3, privateKeyWrapper}) => {85    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);86    const collectionHelpers = evmCollectionHelpers(web3, owner);87    let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();88    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);89    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);90    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);91    result = await collectionEvm.methods.setCollectionSponsor(sponsor).send({from: owner});92    let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;93    const ss58Format = (api.registry.getChainProperties())!.toJSON().ss58Format;94    expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;95    expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));96    await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');9798    await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});99    collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;100    expect(collectionSub.sponsorship.isConfirmed).to.be.true;101    expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));102103    const user = createEthAccount(web3);104    const nextTokenId = await collectionEvm.methods.nextTokenId().call();105    expect(nextTokenId).to.be.equal('1');106107    const oldPermissions = (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();108    expect(oldPermissions.mintMode).to.be.false;109    expect(oldPermissions.access).to.be.equal('Normal');110111    await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});112    await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});113    await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});114115    const newPermissions = (await getDetailedCollectionInfo(api, collectionId))!.permissions.toHuman();116    expect(newPermissions.mintMode).to.be.true;117    expect(newPermissions.access).to.be.equal('AllowList');118119    const ownerBalanceBefore = await ethBalanceViaSub(api, owner);120    const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);121122    {123      const nextTokenId = await collectionEvm.methods.nextTokenId().call();124      expect(nextTokenId).to.be.equal('1');125      const result = await collectionEvm.methods.mintWithTokenURI(126        user,127        nextTokenId,128        'Test URI',129      ).send({from: user});130      const events = normalizeEvents(result.events);131132      expect(events).to.be.deep.equal([133        {134          address: collectionIdAddress,135          event: 'Transfer',136          args: {137            from: '0x0000000000000000000000000000000000000000',138            to: user,139            tokenId: nextTokenId,140          },141        },142      ]);143144      const ownerBalanceAfter = await ethBalanceViaSub(api, owner);145      const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);146147      expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');148      expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);149      expect(sponsorBalanceBefore > sponsorBalanceAfter).to.be.true;150    }151  });152153  itWeb3('Sponsoring collection from substrate address via access list', async ({api, web3, privateKeyWrapper}) => {154    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);155    const collectionHelpers = evmCollectionHelpers(web3, owner);156    const result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();157    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);158    const sponsor = privateKeyWrapper('//Alice');159    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);160161    await collectionEvm.methods.setCollectionSponsorSubstrate(sponsor.addressRaw).send({from: owner});162    163    const confirmTx = await api.tx.unique.confirmSponsorship(collectionId);164    await submitTransactionAsync(sponsor, confirmTx);165    166    const user = createEthAccount(web3);167    const nextTokenId = await collectionEvm.methods.nextTokenId().call();168    expect(nextTokenId).to.be.equal('1');169170    await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});171    await collectionEvm.methods.addToCollectionAllowList(user).send({from: owner});172    await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});173174    const ownerBalanceBefore = await ethBalanceViaSub(api, owner);175    const sponsorBalanceBefore = (await getBalance(api, [sponsor.address]))[0];176177    {178      const nextTokenId = await collectionEvm.methods.nextTokenId().call();179      expect(nextTokenId).to.be.equal('1');180      const result = await collectionEvm.methods.mintWithTokenURI(181        user,182        nextTokenId,183        'Test URI',184      ).send({from: user});185      const events = normalizeEvents(result.events);186187      expect(events).to.be.deep.equal([188        {189          address: collectionIdAddress,190          event: 'Transfer',191          args: {192            from: '0x0000000000000000000000000000000000000000',193            to: user,194            tokenId: nextTokenId,195          },196        },197      ]);198199      const ownerBalanceAfter = await ethBalanceViaSub(api, owner);200      const sponsorBalanceAfter = (await getBalance(api, [sponsor.address]))[0];201202      expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');203      expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);204      expect(sponsorBalanceBefore > sponsorBalanceAfter).to.be.true;205    }206  });207208  itWeb3('Check that transaction via EVM spend money from sponsor address', async ({api, web3, privateKeyWrapper}) => {209    const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);210    const collectionHelpers = evmCollectionHelpers(web3, owner);211    let result = await collectionHelpers.methods.createNonfungibleCollection('Sponsor collection', '1', '1').send();212    const {collectionIdAddress, collectionId} = await getCollectionAddressFromResult(api, result);213    const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);214    const collectionEvm = evmCollection(web3, owner, collectionIdAddress);215    result = await collectionEvm.methods.setCollectionSponsor(sponsor).send();216    let collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;217    const ss58Format = (api.registry.getChainProperties())!.toJSON().ss58Format;218    expect(collectionSub.sponsorship.isUnconfirmed).to.be.true;219    expect(collectionSub.sponsorship.asUnconfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));220    await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('caller is not set as sponsor');221    const sponsorCollection = evmCollection(web3, sponsor, collectionIdAddress);222    await sponsorCollection.methods.confirmCollectionSponsorship().send();223    collectionSub = (await getDetailedCollectionInfo(api, collectionId))!;224    expect(collectionSub.sponsorship.isConfirmed).to.be.true;225    expect(collectionSub.sponsorship.asConfirmed.toHuman()).to.be.eq(evmToAddress(sponsor, Number(ss58Format)));226227    const user = createEthAccount(web3);228    await collectionEvm.methods.addCollectionAdmin(user).send();229    230    const ownerBalanceBefore = await ethBalanceViaSub(api, owner);231    const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);232    233  234    const userCollectionEvm = evmCollection(web3, user, collectionIdAddress);235    const nextTokenId = await userCollectionEvm.methods.nextTokenId().call();236    expect(nextTokenId).to.be.equal('1');237    result = await userCollectionEvm.methods.mintWithTokenURI(238      user,239      nextTokenId,240      'Test URI',241    ).send();242243    const events = normalizeEvents(result.events);244    const address = collectionIdToAddress(collectionId);245246    expect(events).to.be.deep.equal([247      {248        address,249        event: 'Transfer',250        args: {251          from: '0x0000000000000000000000000000000000000000',252          to: user,253          tokenId: nextTokenId,254        },255      },256    ]);257    expect(await userCollectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');258  259    const ownerBalanceAfter = await ethBalanceViaSub(api, owner);260    expect(ownerBalanceAfter).to.be.eq(ownerBalanceBefore);261    const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);262    expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;263  });264});
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
--- a/tests/src/util/helpers.ts
+++ b/tests/src/util/helpers.ts
@@ -99,6 +99,10 @@
   }
 }
 
+export function bigIntToSub(api: ApiPromise, number: bigint) {
+  return api.registry.createType('AccountId', '0x' + number.toString(16).padStart(64, '0')).toJSON();
+}
+
 export function normalizeAccountId(input: string | AccountId | CrossAccountId | IKeyringPair): CrossAccountId {
   if (typeof input === 'string') {
     if (input.length >= 47) {