difftreelog
fix small fixes
in: master
7 files changed
pallets/common/src/erc.rsdiffbeforeafterboth179 ///179 ///180 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.180 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.181 fn get_collection_sponsor(&self) -> Result<(address, uint256)> {181 fn get_collection_sponsor(&self) -> Result<(address, uint256)> {182 let sponsor = match self.collection.sponsorship {182 let sponsor = match self.collection.sponsorship.sponsor() {183 Some(sponsor) => sponsor,183 SponsorshipState::Disabled | SponsorshipState::Unconfirmed(_) => {184 None => return Ok(Default::default()),184 return Ok(Default::default())185 }186 SponsorshipState::Confirmed(ref sponsor) => sponsor,187 };185 };188 let sponsor = T::CrossAccountId::from_sub(sponsor.clone());186 let sponsor = T::CrossAccountId::from_sub(sponsor.clone());187 let result: (address, uint256) = if sponsor.is_canonical_substrate() {189 let sponsor_sub = convert_cross_account_to_uint256::<T>(&sponsor);188 let sponsor = convert_cross_account_to_uint256::<T>(&sponsor);189 (Default::default(), sponsor)190 } else {190 Ok((*sponsor.as_eth(), sponsor_sub))191 let sponsor = *sponsor.as_eth();192 (sponsor, Default::default())193 };194 Ok(result)191 }195 }192196193 /// Set limits for the collection.197 /// Set limits for the collection.pallets/common/src/eth.rsdiffbeforeafterboth64where64where65 T::AccountId: From<[u8; 32]>,65 T::AccountId: From<[u8; 32]>,66{66{67 let mut new_admin_arr: [u8; 32] = Default::default();67 let mut new_admin_arr = [0_u8; 32];68 from.to_big_endian(&mut new_admin_arr);68 from.to_big_endian(&mut new_admin_arr);69 let account_id = T::AccountId::from(new_admin_arr);69 let account_id = T::AccountId::from(new_admin_arr);70 T::CrossAccountId::from_sub(account_id)70 T::CrossAccountId::from_sub(account_id)pallets/fungible/CHANGELOG.mddiffbeforeafterboth5## [v0.1.4] - 2022-08-245## [v0.1.4] - 2022-08-24667### Change7### Change8 - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.8 - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.9910<!-- bureaucrate goes here -->10<!-- bureaucrate goes here -->11## [v0.1.3] 2022-08-1611## [v0.1.3] 2022-08-16pallets/nonfungible/CHANGELOG.mddiffbeforeafterboth5## [v0.1.5] - 2022-08-245## [v0.1.5] - 2022-08-24667### Change7### Change8 - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.8 - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.9910<!-- bureaucrate goes here -->10<!-- bureaucrate goes here -->11## [v0.1.4] 2022-08-1611## [v0.1.4] 2022-08-16pallets/refungible/CHANGELOG.mddiffbeforeafterboth5## [v0.2.4] - 2022-08-245## [v0.2.4] - 2022-08-24667### Change7### Change8 - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.8 - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.9910<!-- bureaucrate goes here -->10<!-- bureaucrate goes here -->11## [v0.2.3] 2022-08-1611## [v0.2.3] 2022-08-16tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth1import {addToAllowListExpectSuccess, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, getDetailedCollectionInfo, setCollectionSponsorExpectSuccess} from '../util/helpers';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';2import {itWeb3, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents, createEthAccountWithBalance, evmCollectionHelpers, getCollectionAddressFromResult, evmCollection, ethBalanceViaSub, subToEth} from './util/helpers';3import nonFungibleAbi from './nonFungibleAbi.json';3import nonFungibleAbi from './nonFungibleAbi.json';4import {expect} from 'chai';4import {expect} from 'chai';57 expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;57 expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;58 58 59 const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});59 const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});60 expect(sponsorTuple.field_0).to.be.eq(subToEth(sponsor.address));60 expect(bigIntToSub(api, BigInt(sponsorTuple[1]))).to.be.eq(sponsor.address);61 });61 });626263 itWeb3('Remove sponsor', async ({api, web3, privateKeyWrapper}) => {63 itWeb3('Remove sponsor', async ({api, web3, privateKeyWrapper}) => {tests/src/util/helpers.tsdiffbeforeafterboth99 }99 }100}100}101102export function bigIntToSub(api: ApiPromise, number: bigint) {103 return api.registry.createType('AccountId', '0x' + number.toString(16).padStart(64, '0')).toJSON();104}101105102export function normalizeAccountId(input: string | AccountId | CrossAccountId | IKeyringPair): CrossAccountId {106export function normalizeAccountId(input: string | AccountId | CrossAccountId | IKeyringPair): CrossAccountId {103 if (typeof input === 'string') {107 if (typeof input === 'string') {