difftreelog
chore fix warnings
in: master
3 files changed
pallets/common/src/eth.rsdiffbeforeafterboth--- a/pallets/common/src/eth.rs
+++ b/pallets/common/src/eth.rs
@@ -125,7 +125,9 @@
/// Ethereum representation of Optional value with CrossAddress.
#[derive(Debug, Default, AbiCoder)]
pub struct OptionCrossAddress {
+ /// TODO: field description
pub status: bool,
+ /// TODO: field description
pub value: CrossAddress,
}
pallets/evm-contract-helpers/src/eth.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/>.1617//! Implementation of magic contract1819extern crate alloc;20use core::marker::PhantomData;21use evm_coder::{22 abi::{AbiWriter, AbiType},23 execution::Result,24 generate_stubgen, solidity_interface,25 types::*,26 ToLog,27};28use pallet_common::eth;29use pallet_evm::{30 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,31 account::CrossAccountId,32};33use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};34use pallet_evm_transaction_payment::CallContext;35use sp_core::{H160, U256};36use up_data_structs::SponsorshipState;37use crate::{38 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,39 SponsoringRateLimit, SponsoringModeT, Sponsoring,40};41use frame_support::traits::Get;42use up_sponsorship::SponsorshipHandler;43use sp_std::vec::Vec;4445/// Pallet events.46#[derive(ToLog)]47pub enum ContractHelpersEvents {48 /// Contract sponsor was set.49 ContractSponsorSet {50 /// Contract address of the affected collection.51 #[indexed]52 contract_address: address,53 /// New sponsor address.54 sponsor: address,55 },5657 /// New sponsor was confirm.58 ContractSponsorshipConfirmed {59 /// Contract address of the affected collection.60 #[indexed]61 contract_address: address,62 /// New sponsor address.63 sponsor: address,64 },6566 /// Collection sponsor was removed.67 ContractSponsorRemoved {68 /// Contract address of the affected collection.69 #[indexed]70 contract_address: address,71 },72}7374/// See [`ContractHelpersCall`]75pub struct ContractHelpers<T: Config>(SubstrateRecorder<T>);76impl<T: Config> WithRecorder<T> for ContractHelpers<T> {77 fn recorder(&self) -> &SubstrateRecorder<T> {78 &self.079 }8081 fn into_recorder(self) -> SubstrateRecorder<T> {82 self.083 }84}8586/// @title Magic contract, which allows users to reconfigure other contracts87#[solidity_interface(name = ContractHelpers, events(ContractHelpersEvents))]88impl<T: Config> ContractHelpers<T>89where90 T::AccountId: AsRef<[u8; 32]>,91{92 /// Get user, which deployed specified contract93 /// @dev May return zero address in case if contract is deployed94 /// using uniquenetwork evm-migration pallet, or using other terms not95 /// intended by pallet-evm96 /// @dev Returns zero address if contract does not exists97 /// @param contractAddress Contract to get owner of98 /// @return address Owner of contract99 fn contract_owner(&self, contract_address: address) -> Result<address> {100 Ok(<Owner<T>>::get(contract_address))101 }102103 /// Set sponsor.104 /// @param contractAddress Contract for which a sponsor is being established.105 /// @param sponsor User address who set as pending sponsor.106 fn set_sponsor(107 &mut self,108 caller: caller,109 contract_address: address,110 sponsor: address,111 ) -> Result<void> {112 self.recorder().consume_sload()?;113 self.recorder().consume_sstore()?;114115 Pallet::<T>::set_sponsor(116 &T::CrossAccountId::from_eth(caller),117 contract_address,118 &T::CrossAccountId::from_eth(sponsor),119 )120 .map_err(dispatch_to_evm::<T>)?;121122 Ok(())123 }124125 /// Set contract as self sponsored.126 ///127 /// @param contractAddress Contract for which a self sponsoring is being enabled.128 fn self_sponsored_enable(&mut self, caller: caller, contract_address: address) -> Result<void> {129 self.recorder().consume_sload()?;130 self.recorder().consume_sstore()?;131132 let caller = T::CrossAccountId::from_eth(caller);133134 Pallet::<T>::ensure_owner(contract_address, *caller.as_eth())135 .map_err(dispatch_to_evm::<T>)?;136137 Pallet::<T>::force_set_sponsor(138 contract_address,139 &T::CrossAccountId::from_eth(contract_address),140 )141 .map_err(dispatch_to_evm::<T>)?;142143 Ok(())144 }145146 /// Remove sponsor.147 ///148 /// @param contractAddress Contract for which a sponsorship is being removed.149 fn remove_sponsor(&mut self, caller: caller, contract_address: address) -> Result<void> {150 self.recorder().consume_sload()?;151 self.recorder().consume_sstore()?;152153 Pallet::<T>::remove_sponsor(&T::CrossAccountId::from_eth(caller), contract_address)154 .map_err(dispatch_to_evm::<T>)?;155156 Ok(())157 }158159 /// Confirm sponsorship.160 ///161 /// @dev Caller must be same that set via [`setSponsor`].162 ///163 /// @param contractAddress Сontract for which need to confirm sponsorship.164 fn confirm_sponsorship(&mut self, caller: caller, contract_address: address) -> Result<void> {165 self.recorder().consume_sload()?;166 self.recorder().consume_sstore()?;167168 Pallet::<T>::confirm_sponsorship(&T::CrossAccountId::from_eth(caller), contract_address)169 .map_err(dispatch_to_evm::<T>)?;170171 Ok(())172 }173174 /// Get current sponsor.175 ///176 /// @param contractAddress The contract for which a sponsor is requested.177 /// @return Tuble with sponsor address and his substrate mirror. If there is no confirmed sponsor error "Contract has no sponsor" throw.178 fn sponsor(&self, contract_address: address) -> Result<eth::OptionCrossAddress> {179 Ok(match Pallet::<T>::get_sponsor(contract_address) {180 Some(ref value) => eth::OptionCrossAddress {181 status: true,182 value: eth::CrossAddress::from_sub_cross_account::<T>(value),183 },184 None => eth::OptionCrossAddress {185 status: false,186 value: Default::default(),187 },188 })189 }190191 /// Check tat contract has confirmed sponsor.192 ///193 /// @param contractAddress The contract for which the presence of a confirmed sponsor is checked.194 /// @return **true** if contract has confirmed sponsor.195 fn has_sponsor(&self, contract_address: address) -> Result<bool> {196 Ok(Pallet::<T>::get_sponsor(contract_address).is_some())197 }198199 /// Check tat contract has pending sponsor.200 ///201 /// @param contractAddress The contract for which the presence of a pending sponsor is checked.202 /// @return **true** if contract has pending sponsor.203 fn has_pending_sponsor(&self, contract_address: address) -> Result<bool> {204 Ok(match Sponsoring::<T>::get(contract_address) {205 SponsorshipState::Disabled | SponsorshipState::Confirmed(_) => false,206 SponsorshipState::Unconfirmed(_) => true,207 })208 }209210 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {211 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)212 }213214 fn set_sponsoring_mode(215 &mut self,216 caller: caller,217 contract_address: address,218 mode: SponsoringModeT,219 ) -> Result<void> {220 self.recorder().consume_sload()?;221 self.recorder().consume_sstore()?;222223 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;224 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);225226 Ok(())227 }228229 /// Get current contract sponsoring rate limit230 /// @param contractAddress Contract to get sponsoring rate limit of231 /// @return uint32 Amount of blocks between two sponsored transactions232 fn sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {233 self.recorder().consume_sload()?;234235 Ok(<SponsoringRateLimit<T>>::get(contract_address)236 .try_into()237 .map_err(|_| "rate limit > u32::MAX")?)238 }239240 /// Set contract sponsoring rate limit241 /// @dev Sponsoring rate limit - is a minimum amount of blocks that should242 /// pass between two sponsored transactions243 /// @param contractAddress Contract to change sponsoring rate limit of244 /// @param rateLimit Target rate limit245 /// @dev Only contract owner can change this setting246 fn set_sponsoring_rate_limit(247 &mut self,248 caller: caller,249 contract_address: address,250 rate_limit: uint32,251 ) -> Result<void> {252 self.recorder().consume_sload()?;253 self.recorder().consume_sstore()?;254255 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;256 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());257 Ok(())258 }259260 /// Set contract sponsoring fee limit261 /// @dev Sponsoring fee limit - is maximum fee that could be spent by262 /// single transaction263 /// @param contractAddress Contract to change sponsoring fee limit of264 /// @param feeLimit Fee limit265 /// @dev Only contract owner can change this setting266 fn set_sponsoring_fee_limit(267 &mut self,268 caller: caller,269 contract_address: address,270 fee_limit: uint256,271 ) -> Result<void> {272 self.recorder().consume_sload()?;273 self.recorder().consume_sstore()?;274275 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;276 <Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into())277 .map_err(dispatch_to_evm::<T>)?;278 Ok(())279 }280281 /// Get current contract sponsoring fee limit282 /// @param contractAddress Contract to get sponsoring fee limit of283 /// @return uint256 Maximum amount of fee that could be spent by single284 /// transaction285 fn sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {286 self.recorder().consume_sload()?;287288 Ok(get_sponsoring_fee_limit::<T>(contract_address))289 }290291 /// Is specified user present in contract allow list292 /// @dev Contract owner always implicitly included293 /// @param contractAddress Contract to check allowlist of294 /// @param user User to check295 /// @return bool Is specified users exists in contract allowlist296 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {297 self.0.consume_sload()?;298 Ok(<Pallet<T>>::allowed(contract_address, user))299 }300301 /// Toggle user presence in contract allowlist302 /// @param contractAddress Contract to change allowlist of303 /// @param user Which user presence should be toggled304 /// @param isAllowed `true` if user should be allowed to be sponsored305 /// or call this contract, `false` otherwise306 /// @dev Only contract owner can change this setting307 fn toggle_allowed(308 &mut self,309 caller: caller,310 contract_address: address,311 user: address,312 is_allowed: bool,313 ) -> Result<void> {314 self.recorder().consume_sload()?;315 self.recorder().consume_sstore()?;316317 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;318 <Pallet<T>>::toggle_allowed(contract_address, user, is_allowed);319320 Ok(())321 }322323 /// Is this contract has allowlist access enabled324 /// @dev Allowlist always can have users, and it is used for two purposes:325 /// in case of allowlist sponsoring mode, users will be sponsored if they exist in allowlist326 /// in case of allowlist access enabled, only users from allowlist may call this contract327 /// @param contractAddress Contract to get allowlist access of328 /// @return bool Is specified contract has allowlist access enabled329 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {330 Ok(<AllowlistEnabled<T>>::get(contract_address))331 }332333 /// Toggle contract allowlist access334 /// @param contractAddress Contract to change allowlist access of335 /// @param enabled Should allowlist access to be enabled?336 fn toggle_allowlist(337 &mut self,338 caller: caller,339 contract_address: address,340 enabled: bool,341 ) -> Result<void> {342 self.recorder().consume_sload()?;343 self.recorder().consume_sstore()?;344345 <Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;346 <Pallet<T>>::toggle_allowlist(contract_address, enabled);347 Ok(())348 }349}350351/// Implements [`OnMethodCall`], which delegates call to [`ContractHelpers`]352pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);353impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T>354where355 T::AccountId: AsRef<[u8; 32]>,356{357 fn is_reserved(contract: &sp_core::H160) -> bool {358 contract == &T::ContractAddress::get()359 }360361 fn is_used(contract: &sp_core::H160) -> bool {362 contract == &T::ContractAddress::get()363 }364365 fn call(handle: &mut impl PrecompileHandle) -> Option<PrecompileResult> {366 // TODO: Extract to another OnMethodCall handler367 if <AllowlistEnabled<T>>::get(handle.code_address())368 && !<Pallet<T>>::allowed(handle.code_address(), handle.context().caller)369 {370 return Some(Err(PrecompileFailure::Revert {371 exit_status: ExitRevert::Reverted,372 output: {373 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));374 writer.string("Target contract is allowlisted");375 writer.finish()376 },377 }));378 }379380 if handle.code_address() != T::ContractAddress::get() {381 return None;382 }383384 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(handle.remaining_gas()));385 pallet_evm_coder_substrate::call(handle, helpers)386 }387388 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {389 (contract == &T::ContractAddress::get())390 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())391 }392}393394/// Hooks into contract creation, storing owner of newly deployed contract395pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);396impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {397 fn on_create(owner: H160, contract: H160) {398 <Owner<T>>::insert(contract, owner);399 }400}401402/// Bridge to pallet-sponsoring403pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);404impl<T: Config> SponsorshipHandler<T::CrossAccountId, CallContext>405 for HelpersContractSponsoring<T>406{407 fn get_sponsor(408 who: &T::CrossAccountId,409 call_context: &CallContext,410 ) -> Option<T::CrossAccountId> {411 let contract_address = call_context.contract_address;412 let mode = <Pallet<T>>::sponsoring_mode(contract_address);413 if mode == SponsoringModeT::Disabled {414 return None;415 }416417 let sponsor = match <Pallet<T>>::get_sponsor(contract_address) {418 Some(sponsor) => sponsor,419 None => return None,420 };421422 if mode == SponsoringModeT::Allowlisted423 && !<Pallet<T>>::allowed(contract_address, *who.as_eth())424 {425 return None;426 }427 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;428429 if let Some(last_tx_block) = <SponsorBasket<T>>::get(contract_address, who.as_eth()) {430 let limit = <SponsoringRateLimit<T>>::get(contract_address);431432 let timeout = last_tx_block + limit;433 if block_number < timeout {434 return None;435 }436 }437438 let sponsored_fee_limit = get_sponsoring_fee_limit::<T>(contract_address);439440 if call_context.max_fee > sponsored_fee_limit {441 return None;442 }443444 <SponsorBasket<T>>::insert(contract_address, who.as_eth(), block_number);445446 Some(sponsor)447 }448}449450fn get_sponsoring_fee_limit<T: Config>(contract_address: address) -> uint256 {451 <SponsoringFeeLimit<T>>::get(contract_address)452 .get(&0xffffffff)453 .cloned()454 .unwrap_or(U256::MAX)455}456457generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);458generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);tests/src/eth/collectionSponsoring.test.tsdiffbeforeafterboth--- a/tests/src/eth/collectionSponsoring.test.ts
+++ b/tests/src/eth/collectionSponsoring.test.ts
@@ -151,7 +151,7 @@
await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});
await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});
-
+
const newPermissions = (await collectionSub.getData())!.raw.permissions;
expect(newPermissions.mintMode).to.be.true;
expect(newPermissions.access).to.be.equal('AllowList');
@@ -332,16 +332,16 @@
nominal = helper.balance.getOneTokenNominal();
});
});
-
+
[
'mintCross',
'mintWithTokenURI',
- ].map(testCase =>
+ ].map(testCase =>
itEth(`[${testCase}] sponsors mint transactions`, async ({helper}) => {
const collection = await helper.rft.mintCollection(alice, {tokenPrefix: 'spnr', permissions: {mintMode: true}, tokenPropertyPermissions: [
{key: 'URI', permission: {tokenOwner: true, mutable: true, collectionAdmin: true}},
]});
-
+
const owner = await helper.eth.createAccountWithBalance(donor);
await collection.setSponsor(alice, alice.address);
await collection.confirmSponsorship(alice);
@@ -351,11 +351,11 @@
expect(await helper.balance.getEthereum(minter)).to.equal(0n);
const collectionAddress = helper.ethAddress.fromCollectionId(collection.collectionId);
- const contract = helper.ethNativeContract.collection(collectionAddress, 'rft', minter, true);
+ const contract = await helper.ethNativeContract.collection(collectionAddress, 'rft', minter, true);
await collection.addToAllowList(alice, {Ethereum: minter});
await collection.addAdmin(alice, {Ethereum: owner});
- const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
+ const collectionHelpers = await helper.ethNativeContract.collectionHelpers(owner);
await collectionHelpers.methods.makeCollectionERC721MetadataCompatible(collectionAddress, 'base/')
.send();
@@ -387,26 +387,26 @@
[
'setCollectionSponsorCross',
'setCollectionSponsor', // Soft-deprecated
- ].map(testCase =>
+ ].map(testCase =>
itEth(`[${testCase}] can remove collection sponsor`, async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
- const collectionHelpers = helper.ethNativeContract.collectionHelpers(owner);
-
+ const collectionHelpers = await helper.ethNativeContract.collectionHelpers(owner);
+
let result = await collectionHelpers.methods.createRFTCollection('Sponsor collection', '1', '1').send({value: Number(2n * nominal)});
const collectionIdAddress = helper.ethAddress.normalizeAddress(result.events.CollectionCreated.returnValues.collectionId);
const sponsor = await helper.eth.createAccountWithBalance(donor);
const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
- const collectionEvm = helper.ethNativeContract.collection(collectionIdAddress, 'rft', owner, testCase === 'setCollectionSponsor');
-
+ const collectionEvm = await helper.ethNativeContract.collection(collectionIdAddress, 'rft', owner, testCase === 'setCollectionSponsor');
+
expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
result = await collectionEvm.methods[testCase](testCase === 'setCollectionSponsor' ? sponsor : sponsorCross).send({from: owner});
expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.true;
-
+
await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
expect(await collectionEvm.methods.hasCollectionPendingSponsor().call({from: owner})).to.be.false;
-
+
await collectionEvm.methods.removeCollectionSponsor().send({from: owner});
-
+
const sponsorStruct = await collectionEvm.methods.collectionSponsor().call({from: owner});
expect(sponsorStruct.eth).to.be.eq('0x0000000000000000000000000000000000000000');
}));
@@ -414,35 +414,35 @@
[
'setCollectionSponsorCross',
'setCollectionSponsor', // Soft-deprecated
- ].map(testCase =>
+ ].map(testCase =>
itEth(`[${testCase}] Can sponsor from evm address via access list`, async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const sponsorEth = await helper.eth.createAccountWithBalance(donor);
const sponsorCrossEth = helper.ethCrossAccount.fromAddress(sponsorEth);
-
+
const {collectionId, collectionAddress} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner, 'Sponsor collection', '1', '1', '');
-
+
const collectionSub = helper.rft.getCollectionObject(collectionId);
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, testCase === 'setCollectionSponsor');
-
+ const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'rft', owner, testCase === 'setCollectionSponsor');
+
// Set collection sponsor:
await collectionEvm.methods[testCase](testCase === 'setCollectionSponsor' ? sponsorEth : sponsorCrossEth).send({from: owner});
let sponsorship = (await collectionSub.getData())!.raw.sponsorship;
expect(sponsorship.Unconfirmed).to.be.eq(helper.address.ethToSubstrate(sponsorEth, true));
// Account cannot confirm sponsorship if it is not set as a sponsor
await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('ConfirmSponsorshipFail');
-
+
// Sponsor can confirm sponsorship:
await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsorEth});
sponsorship = (await collectionSub.getData())!.raw.sponsorship;
expect(sponsorship.Confirmed).to.be.eq(helper.address.ethToSubstrate(sponsorEth, true));
-
+
// Create user with no balance:
const user = helper.eth.createAccount();
const userCross = helper.ethCrossAccount.fromAddress(user);
const nextTokenId = await collectionEvm.methods.nextTokenId().call();
expect(nextTokenId).to.be.equal('1');
-
+
// Set collection permissions:
const oldPermissions = (await collectionSub.getData())!.raw.permissions;
expect(oldPermissions.mintMode).to.be.false;
@@ -451,11 +451,11 @@
await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});
await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});
-
+
const newPermissions = (await collectionSub.getData())!.raw.permissions;
expect(newPermissions.mintMode).to.be.true;
expect(newPermissions.access).to.be.equal('AllowList');
-
+
const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
const sponsorBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsorEth));
const userBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(user));
@@ -474,11 +474,11 @@
tokenId: '1',
},
});
-
+
const ownerBalanceAfter = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
const sponsorBalanceAfter = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsorEth));
const userBalanceAfter = await helper.balance.getSubstrate(helper.address.ethToSubstrate(user));
-
+
expect(await collectionEvm.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');
expect(ownerBalanceBefore).to.be.eq(ownerBalanceAfter);
expect(userBalanceAfter).to.be.eq(userBalanceBefore);
@@ -489,16 +489,16 @@
[
'setCollectionSponsorCross',
'setCollectionSponsor', // Soft-deprecated
- ].map(testCase =>
+ ].map(testCase =>
itEth(`[${testCase}] Check that collection admin EVM transaction spend money from sponsor eth address`, async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
const sponsor = await helper.eth.createAccountWithBalance(donor);
const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
-
+
const {collectionAddress, collectionId} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner,'Sponsor collection', '1', '1', '');
const collectionSub = helper.rft.getCollectionObject(collectionId);
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, testCase === 'setCollectionSponsor');
+ const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'rft', owner, testCase === 'setCollectionSponsor');
// Set collection sponsor:
expect(await collectionEvm.methods.hasCollectionPendingSponsor().call()).to.be.false;
await collectionEvm.methods[testCase](testCase === 'setCollectionSponsor' ? sponsor : sponsorCross).send();
@@ -507,7 +507,7 @@
expect(collectionData.raw.sponsorship.Unconfirmed).to.be.eq(helper.address.ethToSubstrate(sponsor, true));
await expect(collectionEvm.methods.confirmCollectionSponsorship().call()).to.be.rejectedWith('ConfirmSponsorshipFail');
expect(await collectionEvm.methods.hasCollectionPendingSponsor().call()).to.be.true;
-
+
await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
collectionData = (await collectionSub.getData())!;
expect(collectionData.raw.sponsorship.Confirmed).to.be.eq(helper.address.ethToSubstrate(sponsor, true));
@@ -520,16 +520,16 @@
const user = helper.eth.createAccount();
const userCross = helper.ethCrossAccount.fromAddress(user);
await collectionEvm.methods.addCollectionAdminCross(userCross).send();
-
+
const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
const sponsorBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));
-
+
const mintingResult = await collectionEvm.methods.mintWithTokenURI(user, 'Test URI').send({from: user});
const tokenId = mintingResult.events.Transfer.returnValues.tokenId;
-
+
const events = helper.eth.normalizeEvents(mintingResult.events);
const address = helper.ethAddress.fromCollectionId(collectionId);
-
+
expect(events).to.deep.include({
address,
event: 'Transfer',
@@ -540,7 +540,7 @@
},
});
expect(await collectionEvm.methods.tokenURI(tokenId).call({from: user})).to.be.equal('Test URI');
-
+
const ownerBalanceAfter = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
expect(ownerBalanceAfter).to.be.eq(ownerBalanceBefore);
const sponsorBalanceAfter = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));
@@ -555,7 +555,7 @@
const {collectionAddress, collectionId} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner,'Sponsor collection', '1', '1', '');
const collectionSub = helper.rft.getCollectionObject(collectionId);
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, false);
+ const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'rft', owner, false);
// Set collection sponsor:
expect(await collectionEvm.methods.hasCollectionPendingSponsor().call()).to.be.false;
await collectionEvm.methods.setCollectionSponsorCross(sponsorCross).send();
@@ -577,7 +577,7 @@
const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
const sponsorBalanceBefore = await helper.balance.getSubstrate(sponsor.address);
-
+
const mintingResult = await collectionEvm.methods.mintWithTokenURI(user, 'Test URI').send({from: user});
const tokenId = mintingResult.events.Transfer.returnValues.tokenId;
@@ -608,7 +608,7 @@
const sponsorCross = helper.ethCrossAccount.fromKeyringPair(sponsor);
const {collectionAddress, collectionId} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner,'Sponsor collection', '1', '1', '');
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner, false);
+ const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'rft', owner, false);
await collectionEvm.methods.setCollectionSponsorCross(sponsorCross).send({from: owner});
@@ -619,7 +619,7 @@
expect(nextTokenId).to.be.equal('1');
await collectionEvm.methods.setCollectionAccess(1 /*'AllowList'*/).send({from: owner});
-
+
await collectionEvm.methods.addToCollectionAllowListCross(userCross).send({from: owner});
await collectionEvm.methods.setCollectionMintMode(true).send({from: owner});
@@ -636,8 +636,8 @@
).send({from: user});
const events = helper.eth.normalizeEvents(mintingResult.events);
-
+
expect(events).to.deep.include({
address: collectionAddress,
event: 'Transfer',
@@ -668,7 +668,7 @@
const {collectionAddress, collectionId} = await helper.eth.createERC721MetadataCompatibleRFTCollection(owner,'Sponsor collection', '1', '1', '');
const collectionSub = helper.rft.getCollectionObject(collectionId);
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+ const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
// Set and confirm sponsor:
await collectionEvm.methods.setCollectionSponsorCross(sponsorCrossEth).send({from: owner});
@@ -685,7 +685,7 @@
'transferCross',
'transferFrom',
'transferFromCross',
- ].map(testCase =>
+ ].map(testCase =>
itEth(`[${testCase}] Check that transfer via EVM spend money from sponsor address`, async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
@@ -693,7 +693,7 @@
const sponsor = await helper.eth.createAccountWithBalance(donor);
const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
const receiver = await helper.eth.createAccountWithBalance(donor);
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+ const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
await collectionEvm.methods.setCollectionSponsorCross(sponsorCross).send();
await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
@@ -704,7 +704,7 @@
const result = await collectionEvm.methods.mintWithTokenURI(user, 'Test URI').send({from: user});
const tokenId = result.events.Transfer.returnValues.tokenId;
-
+
const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
const sponsorBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));
const userBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(user));
@@ -748,7 +748,7 @@
'transferCross',
'transferFrom',
'transferFromCross',
- ].map(testCase =>
+ ].map(testCase =>
itEth(`[${testCase}] Check that token piece transfer via EVM spend money from sponsor address`, async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
@@ -756,7 +756,7 @@
const sponsor = await helper.eth.createAccountWithBalance(donor);
const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
const receiver = await helper.eth.createAccountWithBalance(donor);
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+ const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
await collectionEvm.methods.setCollectionSponsorCross(sponsorCross).send();
await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
@@ -768,9 +768,9 @@
const result = await collectionEvm.methods.mintWithTokenURI(user, 'Test URI').send({from: user});
const tokenId = result.events.Transfer.returnValues.tokenId;
- const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, user);
+ const tokenContract = await helper.ethNativeContract.rftTokenById(collectionId, tokenId, user);
await tokenContract.methods.repartition(2).send();
-
+
const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
const sponsorBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));
const userBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(user));
@@ -801,7 +801,7 @@
[
'approve',
'approveCross',
- ].map(testCase =>
+ ].map(testCase =>
itEth(`[${testCase}] Check that approve via EVM spend money from sponsor address`, async ({helper}) => {
const owner = await helper.eth.createAccountWithBalance(donor);
@@ -809,7 +809,7 @@
const sponsor = await helper.eth.createAccountWithBalance(donor);
const sponsorCross = helper.ethCrossAccount.fromAddress(sponsor);
const receiver = await helper.eth.createAccountWithBalance(donor);
- const collectionEvm = helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
+ const collectionEvm = await helper.ethNativeContract.collection(collectionAddress, 'rft', owner);
await collectionEvm.methods.setCollectionSponsorCross(sponsorCross).send();
await collectionEvm.methods.confirmCollectionSponsorship().send({from: sponsor});
@@ -821,9 +821,9 @@
const result = await collectionEvm.methods.mintWithTokenURI(user, 'Test URI').send({from: user});
const tokenId = result.events.Transfer.returnValues.tokenId;
- const tokenContract = helper.ethNativeContract.rftTokenById(collectionId, tokenId, user);
+ const tokenContract = await helper.ethNativeContract.rftTokenById(collectionId, tokenId, user);
await tokenContract.methods.repartition(2).send();
-
+
const ownerBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(owner));
const sponsorBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(sponsor));
const userBalanceBefore = await helper.balance.getSubstrate(helper.address.ethToSubstrate(user));