git.delta.rocks / unique-network / refs/commits / 6b1c924f3c5d

difftreelog

CORE-345 Add check that contract is unique collection

Trubnikov Sergey2022-05-18parent: #cf8cdb9.patch.diff
in: master

3 files changed

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/>.1617use up_data_structs::CollectionId;18use sp_core::H160;1920// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 121// TODO: Unhardcode prefix22const ETH_COLLECTION_PREFIX: [u8; 16] = [23	0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,24];2526pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {27	if eth[0..16] != ETH_COLLECTION_PREFIX {28		return None;29	}30	let mut id_bytes = [0; 4];31	id_bytes.copy_from_slice(&eth[16..20]);32	Some(CollectionId(u32::from_be_bytes(id_bytes)))33}34pub fn collection_id_to_address(id: CollectionId) -> H160 {35	let mut out = [0; 20];36	out[0..16].copy_from_slice(&ETH_COLLECTION_PREFIX);37	out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));38	H160(out)39}
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/>.1617use up_data_structs::CollectionId;18use sp_core::H160;1920// 0x17c4e6453Cc49AAAaEACA894e6D9683e00000001 - collection 121// TODO: Unhardcode prefix22const ETH_COLLECTION_PREFIX: [u8; 16] = [23	0x17, 0xc4, 0xe6, 0x45, 0x3c, 0xc4, 0x9a, 0xaa, 0xae, 0xac, 0xa8, 0x94, 0xe6, 0xd9, 0x68, 0x3e,24];2526pub fn map_eth_to_id(eth: &H160) -> Option<CollectionId> {27	if eth[0..16] != ETH_COLLECTION_PREFIX {28		return None;29	}30	let mut id_bytes = [0; 4];31	id_bytes.copy_from_slice(&eth[16..20]);32	Some(CollectionId(u32::from_be_bytes(id_bytes)))33}34pub fn collection_id_to_address(id: CollectionId) -> H160 {35	let mut out = [0; 20];36	out[0..16].copy_from_slice(&ETH_COLLECTION_PREFIX);37	out[16..20].copy_from_slice(&u32::to_be_bytes(id.0));38	H160(out)39}4041pub fn is_collection(address: &H160) -> bool {42	address[0..16] == ETH_COLLECTION_PREFIX43}
modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -318,6 +318,10 @@
 			input: &[u8],
 			value: sp_core::U256,
 		) -> Option<PrecompileResult> {
+			if !pallet_common::eth::is_collection(target) {
+				return None;
+			}
+
 			let helpers = EvmCollection::<T>(Rc::new(SubstrateRecorder::<T>::new(*target, gas_left)));
 			pallet_evm_coder_substrate::call(*source, helpers, value, input)
 		}
modifiedtests/src/eth/createCollection.test.tsdiffbeforeafterboth
--- a/tests/src/eth/createCollection.test.ts
+++ b/tests/src/eth/createCollection.test.ts
@@ -31,6 +31,7 @@
   normalizeAddress,
   normalizeEvents,
 } from './util/helpers';
+import util from 'util';
 
 async function getCollectionAddressFromResult(api: ApiPromise, result: any) {
   const collectionIdAddress = normalizeAddress(result.events[0].raw.topics[2]);
@@ -201,18 +202,18 @@
       .call()).to.be.rejectedWith('NotSufficientFounds');
   });
 
-  itWeb3('(!negative test!) Collection address (Contract is not an unique collection)', async ({api, web3}) => {
+  itWeb3('(!negative test!) Collection address (Create collection handle error)', async ({api, web3}) => {
     const owner = await createEthAccountWithBalance(api, web3);
-    const collectionAddressWithBadPrefix = '0x00112233445566778899AABBCCDDEEFF00112233';
-    const collectionEvm = evmCollection(web3, owner, collectionAddressWithBadPrefix);
-    const EXPECTED_ERROR = 'Contract is not an unique collection';
+    const collectionAddressForNonexistentCollection = '0x17C4E6453CC49AAAAEACA894E6D9683E00112233';
+    const collectionEvm = evmCollection(web3, owner, collectionAddressForNonexistentCollection);
+    const EXPECTED_ERROR = 'Create collection handle error';
     {
       const sponsor = await createEthAccountWithBalance(api, web3);
       await expect(collectionEvm.methods
         .setSponsor(sponsor)
         .call()).to.be.rejectedWith(EXPECTED_ERROR);
       
-      const sponsorCollection = evmCollection(web3, sponsor, collectionAddressWithBadPrefix);
+      const sponsorCollection = evmCollection(web3, sponsor, collectionAddressForNonexistentCollection);
       await expect(sponsorCollection.methods
         .confirmSponsorship()
         .call()).to.be.rejectedWith(EXPECTED_ERROR);