difftreelog
CORE-386 Fix PR
in: master
5 files changed
pallets/common/src/erc.rsdiffbeforeafterboth1// 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 evm_coder::{18 solidity_interface, solidity, ToLog,19 types::*,20 execution::{Result, Error},21};22pub use pallet_evm::{PrecompileOutput, PrecompileResult, PrecompileHandle, account::CrossAccountId};23use pallet_evm_coder_substrate::dispatch_to_evm;24use sp_std::vec::Vec;25use up_data_structs::{Property, SponsoringRateLimit, NestingRule, OwnerRestrictedSet, AccessMode};26use alloc::format;2728use crate::{Pallet, CollectionHandle, Config, CollectionProperties};2930#[derive(ToLog)]31pub enum CollectionHelpersEvents {32 CollectionCreated {33 #[indexed]34 owner: address,35 #[indexed]36 collection_id: address,37 },38}3940/// Does not always represent a full collection, for RFT it is either41/// collection (Implementing ERC721), or specific collection token (Implementing ERC20)42pub trait CommonEvmHandler {43 const CODE: &'static [u8];4445 fn call(self, handle: &mut impl PrecompileHandle) -> Option<PrecompileResult>;46}4748#[solidity_interface(name = "Collection")]49impl<T: Config> CollectionHandle<T>50where51 T::AccountId: From<[u8; 32]>,52{53 fn set_collection_property(&mut self, caller: caller, key: string, value: bytes) -> Result<()> {54 let caller = T::CrossAccountId::from_eth(caller);55 let key = <Vec<u8>>::from(key)56 .try_into()57 .map_err(|_| "key too large")?;58 let value = value.try_into().map_err(|_| "value too large")?;5960 <Pallet<T>>::set_collection_property(self, &caller, Property { key, value })61 .map_err(dispatch_to_evm::<T>)62 }6364 fn delete_collection_property(&mut self, caller: caller, key: string) -> Result<()> {65 let caller = T::CrossAccountId::from_eth(caller);66 let key = <Vec<u8>>::from(key)67 .try_into()68 .map_err(|_| "key too large")?;6970 <Pallet<T>>::delete_collection_property(self, &caller, key).map_err(dispatch_to_evm::<T>)71 }7273 /// Throws error if key not found74 fn collection_property(&self, key: string) -> Result<bytes> {75 let key = <Vec<u8>>::from(key)76 .try_into()77 .map_err(|_| "key too large")?;7879 let props = <CollectionProperties<T>>::get(self.id);80 let prop = props.get(&key).ok_or("key not found")?;8182 Ok(prop.to_vec())83 }8485 fn set_collection_sponsor(&mut self, caller: caller, sponsor: address) -> Result<void> {86 check_is_owner_or_admin(caller, self)?;8788 let sponsor = T::CrossAccountId::from_eth(sponsor);89 self.set_sponsor(sponsor.as_sub().clone())90 .map_err(dispatch_to_evm::<T>)?;91 save(self)92 }9394 fn confirm_collection_sponsorship(&mut self, caller: caller) -> Result<void> {95 let caller = T::CrossAccountId::from_eth(caller);96 if !self97 .confirm_sponsorship(caller.as_sub())98 .map_err(dispatch_to_evm::<T>)?99 {100 return Err("Caller is not set as sponsor".into());101 }102 save(self)103 }104105 #[solidity(rename_selector = "setCollectionLimit")]106 fn set_int_limit(&mut self, caller: caller, limit: string, value: uint32) -> Result<void> {107 check_is_owner_or_admin(caller, self)?;108 let mut limits = self.limits.clone();109110 match limit.as_str() {111 "accountTokenOwnershipLimit" => {112 limits.account_token_ownership_limit = Some(value);113 }114 "sponsoredDataSize" => {115 limits.sponsored_data_size = Some(value);116 }117 "sponsoredDataRateLimit" => {118 limits.sponsored_data_rate_limit = Some(SponsoringRateLimit::Blocks(value));119 }120 "tokenLimit" => {121 limits.token_limit = Some(value);122 }123 "sponsorTransferTimeout" => {124 limits.sponsor_transfer_timeout = Some(value);125 }126 "sponsorApproveTimeout" => {127 limits.sponsor_approve_timeout = Some(value);128 }129 _ => {130 return Err(Error::Revert(format!(131 "Unknown integer limit \"{}\"",132 limit133 )))134 }135 }136 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)137 .map_err(dispatch_to_evm::<T>)?;138 save(self)139 }140141 #[solidity(rename_selector = "setCollectionLimit")]142 fn set_bool_limit(&mut self, caller: caller, limit: string, value: bool) -> Result<void> {143 check_is_owner_or_admin(caller, self)?;144 let mut limits = self.limits.clone();145146 match limit.as_str() {147 "ownerCanTransfer" => {148 limits.owner_can_transfer = Some(value);149 }150 "ownerCanDestroy" => {151 limits.owner_can_destroy = Some(value);152 }153 "transfersEnabled" => {154 limits.transfers_enabled = Some(value);155 }156 _ => {157 return Err(Error::Revert(format!(158 "Unknown boolean limit \"{}\"",159 limit160 )))161 }162 }163 self.limits = <Pallet<T>>::clamp_limits(self.mode.clone(), &self.limits, limits)164 .map_err(dispatch_to_evm::<T>)?;165 save(self)166 }167168 fn contract_address(&self, _caller: caller) -> Result<address> {169 Ok(crate::eth::collection_id_to_address(self.id))170 }171172 fn add_collection_admin_substrate(&self, caller: caller, new_admin: uint256) -> Result<void> {173 let caller = T::CrossAccountId::from_eth(caller);174 let mut new_admin_arr: [u8; 32] = Default::default();175 new_admin.to_big_endian(&mut new_admin_arr);176 let account_id = T::AccountId::from(new_admin_arr);177 let new_admin = T::CrossAccountId::from_sub(account_id);178 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;179 Ok(())180 }181182 fn remove_collection_admin_substrate(183 &self,184 caller: caller,185 new_admin: uint256,186 ) -> Result<void> {187 let caller = T::CrossAccountId::from_eth(caller);188 let mut new_admin_arr: [u8; 32] = Default::default();189 new_admin.to_big_endian(&mut new_admin_arr);190 let account_id = T::AccountId::from(new_admin_arr);191 let new_admin = T::CrossAccountId::from_sub(account_id);192 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, false)193 .map_err(dispatch_to_evm::<T>)?;194 Ok(())195 }196197 fn add_collection_admin(&self, caller: caller, new_admin: address) -> Result<void> {198 let caller = T::CrossAccountId::from_eth(caller);199 let new_admin = T::CrossAccountId::from_eth(new_admin);200 <Pallet<T>>::toggle_admin(self, &caller, &new_admin, true).map_err(dispatch_to_evm::<T>)?;201 Ok(())202 }203204 fn remove_collection_admin(&self, caller: caller, admin: address) -> Result<void> {205 let caller = T::CrossAccountId::from_eth(caller);206 let admin = T::CrossAccountId::from_eth(admin);207 <Pallet<T>>::toggle_admin(self, &caller, &admin, false).map_err(dispatch_to_evm::<T>)?;208 Ok(())209 }210211 #[solidity(rename_selector = "setNesting")]212 fn set_nesting_bool(&mut self, caller: caller, enable: bool) -> Result<void> {213 check_is_owner_or_admin(caller, self)?;214 self.collection.permissions.nesting = Some(match enable {215 false => NestingRule::Disabled,216 true => NestingRule::Owner,217 });218 save(self)?;219 Ok(())220 }221222 #[solidity(rename_selector = "setNesting")]223 fn set_nesting(224 &mut self,225 caller: caller,226 enable: bool,227 collections: Vec<address>,228 ) -> Result<void> {229 if collections.is_empty() {230 return Err("No addresses provided".into());231 }232 if collections.len() >= OwnerRestrictedSet::bound() {233 return Err(Error::Revert(format!(234 "Out of bound: {} >= {}",235 collections.len(),236 OwnerRestrictedSet::bound()237 )));238 }239 check_is_owner_or_admin(caller, self)?;240 self.collection.permissions.nesting = Some(match enable {241 false => NestingRule::Disabled,242 true => {243 let mut bv = OwnerRestrictedSet::new();244 for i in collections {245 bv.try_insert(crate::eth::map_eth_to_id(&i).ok_or_else(|| {246 Error::Revert("Can't convert address into collection id".into())247 })?)248 .map_err(|e| Error::Revert(format!("{:?}", e)))?;249 }250 NestingRule::OwnerRestricted(bv)251 }252 });253 save(self)?;254 Ok(())255 }256257 fn set_collection_access(&mut self, caller: caller, mode: uint8) -> Result<void> {258 check_is_owner_or_admin(caller, self)?;259 self.collection.permissions.access = Some(match mode {260 0 => AccessMode::Normal,261 1 => AccessMode::AllowList,262 _ => return Err("Not supported access mode".into()),263 });264 save(self)?;265 Ok(())266 }267268 fn add_to_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {269 let caller = T::CrossAccountId::from_eth(caller);270 let user = T::CrossAccountId::from_eth(user);271 <Pallet<T>>::toggle_allowlist(self, &caller, &user, true).map_err(dispatch_to_evm::<T>)?;272 Ok(())273 }274275 fn remove_from_collection_allow_list(&self, caller: caller, user: address) -> Result<void> {276 let caller = T::CrossAccountId::from_eth(caller);277 let user = T::CrossAccountId::from_eth(user);278 <Pallet<T>>::toggle_allowlist(self, &caller, &user, false).map_err(dispatch_to_evm::<T>)?;279 Ok(())280 }281282 fn set_mint_mode(&mut self, caller: caller, mode: bool) -> Result<void> {283 check_is_owner_or_admin(caller, self)?;284 self.collection.permissions.mint_mode = Some(mode);285 save(self)?;286 Ok(())287 }288}289290fn check_is_owner_or_admin<T: Config>(291 caller: caller,292 collection: &CollectionHandle<T>,293) -> Result<T::CrossAccountId> {294 let caller = T::CrossAccountId::from_eth(caller);295 collection296 .check_is_owner_or_admin(&caller)297 .map_err(pallet_evm_coder_substrate::dispatch_to_evm::<T>)?;298 Ok(caller)299}300301fn save<T: Config>(collection: &CollectionHandle<T>) -> Result<void> {302 // TODO possibly delete for the lack of transaction303 collection304 .check_is_internal()305 .map_err(dispatch_to_evm::<T>)?;306 <crate::CollectionById<T>>::insert(collection.id, collection.collection.clone());307 Ok(())308}309310pub fn token_uri_key() -> up_data_structs::PropertyKey {311 b"tokenURI"312 .to_vec()313 .try_into()314 .expect("length < limit; qed")315}tests/src/setCollectionLimits.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionLimits.test.ts
+++ b/tests/src/setCollectionLimits.test.ts
@@ -46,6 +46,7 @@
before(async () => {
await usingApi(async (api, privateKeyWrapper) => {
alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
collectionIdForTesting = await createCollectionExpectSuccess({name: 'A', description: 'B', tokenPrefix: 'C', mode: {type: 'NFT'}});
});
});
@@ -115,6 +116,21 @@
});
});
+ it('execute setCollectionLimits from admin collection', async () => {
+ await addCollectionAdminExpectSuccess(alice, collectionIdForTesting, bob.address);
+ await usingApi(async (api: ApiPromise) => {
+ tx = api.tx.unique.setCollectionLimits(
+ collectionIdForTesting,
+ {
+ accountTokenOwnershipLimit,
+ sponsoredDataSize,
+ // sponsoredMintSize,
+ tokenLimit,
+ },
+ );
+ await expect(submitTransactionAsync(bob, tx)).to.be.not.rejected;
+ });
+ });
});
describe('setCollectionLimits negative', () => {
@@ -143,21 +159,6 @@
});
});
it('execute setCollectionLimits from user who is not owner of this collection', async () => {
- await usingApi(async (api: ApiPromise) => {
- tx = api.tx.unique.setCollectionLimits(
- collectionIdForTesting,
- {
- accountTokenOwnershipLimit,
- sponsoredDataSize,
- // sponsoredMintSize,
- tokenLimit,
- },
- );
- await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.rejected;
- });
- });
- it('execute setCollectionLimits from admin collection', async () => {
- await addCollectionAdminExpectSuccess(alice, collectionIdForTesting, bob.address);
await usingApi(async (api: ApiPromise) => {
tx = api.tx.unique.setCollectionLimits(
collectionIdForTesting,
tests/src/setCollectionSponsor.test.tsdiffbeforeafterboth--- a/tests/src/setCollectionSponsor.test.ts
+++ b/tests/src/setCollectionSponsor.test.ts
@@ -65,6 +65,11 @@
await setCollectionSponsorExpectSuccess(collectionId, bob.address);
await setCollectionSponsorExpectSuccess(collectionId, charlie.address);
});
+ it('Collection admin add sponsor', async () => {
+ const collectionId = await createCollectionExpectSuccess();
+ await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
+ await setCollectionSponsorExpectSuccess(collectionId, charlie.address, '//Bob');
+ });
});
describe('(!negative test!) integration test: ext. setCollectionSponsor():', () => {
@@ -93,10 +98,5 @@
const collectionId = await createCollectionExpectSuccess();
await destroyCollectionExpectSuccess(collectionId);
await setCollectionSponsorExpectFailure(collectionId, bob.address);
- });
- it('(!negative test!) Collection admin add sponsor', async () => {
- const collectionId = await createCollectionExpectSuccess();
- await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
- await setCollectionSponsorExpectFailure(collectionId, charlie.address, '//Bob');
});
});
tests/src/setMintPermission.test.tsdiffbeforeafterboth--- a/tests/src/setMintPermission.test.ts
+++ b/tests/src/setMintPermission.test.ts
@@ -67,6 +67,14 @@
await setMintPermissionExpectSuccess(alice, collectionId, false);
});
});
+
+ it('Collection admin success on set', async () => {
+ await usingApi(async () => {
+ const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
+ await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
+ await setMintPermissionExpectSuccess(bob, collectionId, true);
+ });
+ });
});
describe('Negative Integration Test setMintPermission', () => {
@@ -100,14 +108,6 @@
const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
await enableAllowListExpectSuccess(alice, collectionId);
await setMintPermissionExpectFailure(bob, collectionId, true);
- });
-
- it('Collection admin fails on set', async () => {
- await usingApi(async () => {
- const collectionId = await createCollectionExpectSuccess({mode: {type: 'NFT'}});
- await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
- await setMintPermissionExpectFailure(bob, collectionId, true);
- });
});
it('ensure non-allow-listed non-privileged address can\'t mint tokens', async () => {
tests/src/setPublicAccessMode.test.tsdiffbeforeafterboth--- a/tests/src/setPublicAccessMode.test.ts
+++ b/tests/src/setPublicAccessMode.test.ts
@@ -103,22 +103,23 @@
await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.rejected;
});
});
-});
-describe('Negative Integration Test ext. collection admin setPublicAccessMode(): ', () => {
- before(async () => {
- await usingApi(async (api, privateKeyWrapper) => {
- alice = privateKeyWrapper('//Alice');
- bob = privateKeyWrapper('//Bob');
- });
- });
it('setPublicAccessMode by collection admin', async () => {
await usingApi(async (api: ApiPromise) => {
// tslint:disable-next-line: no-bitwise
const collectionId = await createCollectionExpectSuccess();
await addCollectionAdminExpectSuccess(alice, collectionId, bob.address);
const tx = api.tx.unique.setCollectionPermissions(collectionId, {access: 'AllowList'});
- await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.rejected;
+ await expect(submitTransactionExpectFailAsync(bob, tx)).to.be.not.rejected;
+ });
+ });
+});
+
+describe('Negative Integration Test ext. collection admin setPublicAccessMode(): ', () => {
+ before(async () => {
+ await usingApi(async (api, privateKeyWrapper) => {
+ alice = privateKeyWrapper('//Alice');
+ bob = privateKeyWrapper('//Bob');
});
});
});