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
before · pallets/common/src/eth.rs
1// 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.89// 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/>.1617//! The module contains a number of functions for converting and checking ethereum identifiers.1819use evm_coder::types::uint256;20pub use pallet_evm::account::{Config, CrossAccountId};21use sp_core::H160;22use up_data_structs::CollectionId;2324// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 125// TODO: Unhardcode prefix26const ETH_COLLECTION_PREFIX: [u8; 16] = [27	0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,28];2930/// Maps the ethereum address of the collection in substrate.31pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {32	if eth[0..16] != ETH_COLLECTION_PREFIX {33		return None;34	}35	let mut id_bytes = [0; 4];36	id_bytes.copy_from_slice(&eth[16..20]);37	Some(CollectionId(u32::from_be_bytes(id_bytes)))38}3940/// Maps the substrate collection id in ethereum.41pub fn collection_id_to_address(id: CollectionId) -> H160 {42	let mut out = [0; 20];43	out[0..16].copy_from_slice(&ETH_COLLECTION_PREFIX);44	out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));45	H160(out)46}4748/// Check if the ethereum address is a collection.49pub fn is_collection(address: &H160) -> bool {50	address[0..16] == ETH_COLLECTION_PREFIX51}5253/// Convert `CrossAccountId` to `uint256`.54pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint25655where56	T::AccountId: AsRef<[u8; 32]>,57{58	let slice = from.as_sub().as_ref();59	uint256::from_big_endian(slice)60}6162/// Convert `uint256` to `CrossAccountId`.63pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId64where65	T::AccountId: From<[u8; 32]>,66{67	let mut new_admin_arr: [u8; 32] = Default::default();68	from.to_big_endian(&mut new_admin_arr);69	let account_id = T::AccountId::from(new_admin_arr);70	T::CrossAccountId::from_sub(account_id)71}
after · pallets/common/src/eth.rs
1// 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.89// 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/>.1617//! The module contains a number of functions for converting and checking ethereum identifiers.1819use evm_coder::types::uint256;20pub use pallet_evm::account::{Config, CrossAccountId};21use sp_core::H160;22use up_data_structs::CollectionId;2324// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 125// TODO: Unhardcode prefix26const ETH_COLLECTION_PREFIX: [u8; 16] = [27	0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,28];2930/// Maps the ethereum address of the collection in substrate.31pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {32	if eth[0..16] != ETH_COLLECTION_PREFIX {33		return None;34	}35	let mut id_bytes = [0; 4];36	id_bytes.copy_from_slice(&eth[16..20]);37	Some(CollectionId(u32::from_be_bytes(id_bytes)))38}3940/// Maps the substrate collection id in ethereum.41pub fn collection_id_to_address(id: CollectionId) -> H160 {42	let mut out = [0; 20];43	out[0..16].copy_from_slice(&ETH_COLLECTION_PREFIX);44	out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));45	H160(out)46}4748/// Check if the ethereum address is a collection.49pub fn is_collection(address: &H160) -> bool {50	address[0..16] == ETH_COLLECTION_PREFIX51}5253/// Convert `CrossAccountId` to `uint256`.54pub fn convert_cross_account_to_uint256<T: Config>(from: &T::CrossAccountId) -> uint25655where56	T::AccountId: AsRef<[u8; 32]>,57{58	let slice = from.as_sub().as_ref();59	uint256::from_big_endian(slice)60}6162/// Convert `uint256` to `CrossAccountId`.63pub fn convert_uint256_to_cross_account<T: Config>(from: uint256) -> T::CrossAccountId64where65	T::AccountId: From<[u8; 32]>,66{67	let mut new_admin_arr = [0_u8; 32];68	from.to_big_endian(&mut new_admin_arr);69	let account_id = T::AccountId::from(new_admin_arr);70	T::CrossAccountId::from_sub(account_id)71}
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
--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -1,4 +1,4 @@
-import {addToAllowListExpectSuccess, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, getDetailedCollectionInfo, setCollectionSponsorExpectSuccess} from '../util/helpers';
+import {addToAllowListExpectSuccess, bigIntToSub, confirmSponsorshipExpectSuccess, createCollectionExpectSuccess, enablePublicMintingExpectSuccess, getDetailedCollectionInfo, setCollectionSponsorExpectSuccess} from '../util/helpers';
 import {itWeb3, createEthAccount, collectionIdToAddress, GAS_ARGS, normalizeEvents, createEthAccountWithBalance, evmCollectionHelpers, getCollectionAddressFromResult, evmCollection, ethBalanceViaSub, subToEth} from './util/helpers';
 import nonFungibleAbi from './nonFungibleAbi.json';
 import {expect} from 'chai';
@@ -57,7 +57,7 @@
     expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
     
     const sponsorTuple = await collectionEvm.methods.getCollectionSponsor().call({from: owner});
-    expect(sponsorTuple.field_0).to.be.eq(subToEth(sponsor.address));
+    expect(bigIntToSub(api, BigInt(sponsorTuple[1]))).to.be.eq(sponsor.address);
   });
 
   itWeb3('Remove sponsor', async ({api, web3, privateKeyWrapper}) => {
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) {