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
179 ///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 }
192196
193 /// Set limits for the collection.197 /// Set limits for the collection.
modifiedpallets/common/src/eth.rsdiffbeforeafterboth
64where64where
65 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)
modifiedpallets/fungible/CHANGELOG.mddiffbeforeafterboth
5## [v0.1.4] - 2022-08-245## [v0.1.4] - 2022-08-24
66
7### Change7### Change
8 - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.8 - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
99
10<!-- bureaucrate goes here -->10<!-- bureaucrate goes here -->
11## [v0.1.3] 2022-08-1611## [v0.1.3] 2022-08-16
modifiedpallets/nonfungible/CHANGELOG.mddiffbeforeafterboth
5## [v0.1.5] - 2022-08-245## [v0.1.5] - 2022-08-24
66
7### Change7### Change
8 - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.8 - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
99
10<!-- bureaucrate goes here -->10<!-- bureaucrate goes here -->
11## [v0.1.4] 2022-08-1611## [v0.1.4] 2022-08-16
modifiedpallets/refungible/CHANGELOG.mddiffbeforeafterboth
5## [v0.2.4] - 2022-08-245## [v0.2.4] - 2022-08-24
66
7### Change7### Change
8 - Add bound `AsRef<[u8]>` to `T::CrossAccountId`.8 - Add bound `AsRef<[u8; 32]>` to `T::CrossAccountId`.
99
10<!-- bureaucrate goes here -->10<!-- bureaucrate goes here -->
11## [v0.2.3] 2022-08-1611## [v0.2.3] 2022-08-16
modifiedtests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth
1import {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 });
6262
63 itWeb3('Remove sponsor', async ({api, web3, privateKeyWrapper}) => {63 itWeb3('Remove sponsor', async ({api, web3, privateKeyWrapper}) => {
modifiedtests/src/util/helpers.tsdiffbeforeafterboth
99 }99 }
100}100}
101
102export function bigIntToSub(api: ApiPromise, number: bigint) {
103 return api.registry.createType('AccountId', '0x' + number.toString(16).padStart(64, '0')).toJSON();
104}
101105
102export 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') {