difftreelog
Fix SponsorshipHandler
in: master
8 files changed
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -18,7 +18,7 @@
use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use pallet_evm::{
- ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, AddressMapping
+ ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, account::CrossAccountId
};
use sp_core::H160;
use crate::{
@@ -26,7 +26,6 @@
};
use frame_support::traits::Get;
use up_sponsorship::SponsorshipHandler;
-use up_evm_mapping::EvmBackwardsAddressMapping;
use sp_std::vec::Vec;
struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
@@ -180,20 +179,19 @@
}
pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
- fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {
+impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
+ fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
let mode = <Pallet<T>>::sponsoring_mode(call.0);
if mode == SponsoringModeT::Disabled {
return None;
}
- let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());
- if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, who) {
+ if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who.as_eth()) {
return None;
}
let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
- if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {
+ if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who.as_eth()) {
let limit = <SponsoringRateLimit<T>>::get(&call.0);
let timeout = last_tx_block + limit;
@@ -202,9 +200,9 @@
}
}
- <SponsorBasket<T>>::insert(&call.0, who, block_number);
+ <SponsorBasket<T>>::insert(&call.0, who.as_eth(), block_number);
- let sponsor = T::EvmAddressMapping::into_account_id(call.0);
+ let sponsor = T::CrossAccountId::from_eth(call.0);
Some(sponsor)
}
}
pallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -30,11 +30,9 @@
use sp_core::H160;
#[pallet::config]
- pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config {
+ pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config {
type ContractAddress: Get<H160>;
type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;
- type EvmAddressMapping: pallet_evm::AddressMapping<Self::AccountId>;
- type EvmBackwardsAddressMapping: up_evm_mapping::EvmBackwardsAddressMapping<Self::AccountId>;
}
#[pallet::error]
pallets/evm-transaction-payment/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-transaction-payment/src/lib.rs
+++ b/pallets/evm-transaction-payment/src/lib.rs
@@ -24,8 +24,6 @@
use sp_core::{H160, U256};
use sp_runtime::TransactionOutcome;
use up_sponsorship::SponsorshipHandler;
-use up_evm_mapping::EvmBackwardsAddressMapping;
-use pallet_evm::AddressMapping;
#[frame_support::pallet]
pub mod pallet {
@@ -36,7 +34,7 @@
#[pallet::config]
pub trait Config: frame_system::Config + pallet_evm::account::Config {
- type EvmSponsorshipHandler: SponsorshipHandler<Self::AccountId, (H160, Vec<u8>)>;
+ type EvmSponsorshipHandler: SponsorshipHandler<Self::CrossAccountId, (H160, Vec<u8>)>;
type Currency: Currency<Self::AccountId>;
}
@@ -58,13 +56,13 @@
}
pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);
-impl<T: Config> fp_evm::TransactionValidityHack<T::AccountId> for TransactionValidityHack<T> {
- fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::AccountId> {
+impl<T: Config> fp_evm::TransactionValidityHack<T::CrossAccountId> for TransactionValidityHack<T> {
+ fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::CrossAccountId> {
match reason {
WithdrawReason::Call { target, input } => {
// This method is only used for checking, we shouldn't touch storage in it
frame_support::storage::with_transaction(|| {
- let origin_sub = T::EvmAddressMapping::into_account_id(origin);
+ let origin_sub = T::CrossAccountId::from_eth(origin);
TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(
&origin_sub,
&(*target, input.clone()),
@@ -88,13 +86,11 @@
reason: WithdrawReason,
fee: U256,
) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
- let who_pays_fee;
- if let WithdrawReason::Call { target, input } = &reason {
- who_pays_fee = <T as pallet_evm::account::Config>::CrossAccountId::from_sub(T::EvmSponsorshipHandler::get_sponsor(&who.as_sub(), &(*target, input.clone()))
- .unwrap_or(who.as_sub().clone()));
+ let who_pays_fee = if let WithdrawReason::Call { target, input } = &reason {
+ T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone())).unwrap_or(who.clone())
} else {
- who_pays_fee = who.clone();
- }
+ who.clone()
+ };
let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(
&who_pays_fee,
@@ -145,6 +141,7 @@
<frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),
)
.ok()?;
+ let who = T::CrossAccountId::from_sub(who.clone());
// Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner
// TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?
let sponsor = frame_support::storage::with_transaction(|| {
@@ -153,7 +150,7 @@
&(*target, input.clone()),
))
})?;
- Some(sponsor)
+ Some(sponsor.as_sub().clone())
}
_ => None,
}
pallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -31,14 +31,13 @@
use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
- fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {
+impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
+ fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
let collection_id = map_eth_to_id(&call.0)?;
let collection = <CollectionHandle<T>>::new(collection_id)?;
let sponsor = collection.sponsorship.sponsor()?.clone();
- let who = T::CrossAccountId::from_sub(who.clone());
let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;
- match &collection.mode {
+ Some(T::CrossAccountId::from_sub(match &collection.mode {
crate::CollectionMode::NFT => {
let call = <UniqueNFTCall<T>>::parse(method_id, &mut reader).ok()??;
match call {
@@ -66,7 +65,7 @@
#[allow(clippy::single_match)]
match call {
UniqueFungibleCall::ERC20(ERC20Call::Transfer { .. }) => {
- withdraw_transfer::<T>(&collection, &who, &TokenId::default())
+ withdraw_transfer::<T>(&collection, who, &TokenId::default())
.map(|()| sponsor)
}
UniqueFungibleCall::ERC20(ERC20Call::TransferFrom { from, .. }) => {
@@ -82,6 +81,6 @@
}
}
_ => None,
- }
+ }?))
}
}
pallets/unique/src/tests.rsdiffbeforeafterboth--- a/pallets/unique/src/tests.rs
+++ b/pallets/unique/src/tests.rs
@@ -2866,8 +2866,7 @@
let origin2 = Origin::signed(user2);
let account2 = account(user2);
- let collection_id =
- create_test_collection_for_owner(&CollectionMode::NFT, user1, CollectionId(1));
+ let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, user1, CollectionId(1));
assert_ok!(TemplateModule::set_collection_sponsor(origin1.clone(), collection_id, user1));
assert_ok!(TemplateModule::confirm_sponsorship(origin1.clone(), collection_id));
@@ -2877,12 +2876,7 @@
assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), collection_id, AccessMode::AllowList));
assert_ok!(TemplateModule::add_to_allow_list(origin1.clone(), collection_id, account2.clone()));
assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), collection_id, true));
-
- assert_eq!(<pallet_balances::Pallet<Test>>::free_balance(user2), 0);
- let balance_before = <pallet_balances::Pallet<Test>>::free_balance(user1);
assert_ok!(TemplateModule::create_item(origin2, collection_id, account2, default_nft_data().into()));
- let balance_after = <pallet_balances::Pallet<Test>>::free_balance(user1);
- assert_ne!(balance_before, balance_after);
});
}
\ No newline at end of file
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -948,8 +948,6 @@
impl pallet_evm_contract_helpers::Config for Runtime {
type ContractAddress = HelpersContractAddress;
type DefaultSponsoringRateLimit = DefaultSponsoringRateLimit;
- type EvmAddressMapping = pallet_evm::HashedAddressMapping<Self::Hashing>;
- type EvmBackwardsAddressMapping = up_evm_mapping::MapBackwardsAddressTruncated;
}
construct_runtime!(
tests/README.mddiffbeforeafterboth--- a/tests/README.md
+++ b/tests/README.md
@@ -20,7 +20,7 @@
git clone https://github.com/paritytech/polkadot-launch && cd polkadot-launch
```
-5. Run launch-test-env.sh from the root of this project
+5. Run launch-testnet.sh from the root of this project
## How to run tests
tests/src/eth/contractSponsoring.test.tsdiffbeforeafterboth1// 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/>.1617import privateKey from '../substrate/privateKey';18import {expect} from 'chai';19import {20 contractHelpers,21 createEthAccountWithBalance,22 transferBalanceToEth,23 deployFlipper,24 itWeb3,25 SponsoringMode,26 createEthAccount,27 collectionIdToAddress,28 GAS_ARGS,29 normalizeEvents,30} from './util/helpers';31import {32 createCollectionExpectSuccess,33 createItemExpectSuccess,34 getCreateCollectionResult,35 normalizeAccountId,36 toSubstrateAddress,37} from '../util/helpers';38import nonFungibleAbi from './nonFungibleAbi.json';39import {40 submitTransactionAsync,41} from '../substrate/substrate-api';42import { evmToAddress } from '@polkadot/util-crypto';4344describe('Sponsoring EVM contracts', () => {45 itWeb3('Sponsoring can be set by the address that has deployed the contract', async ({api, web3}) => {46 const owner = await createEthAccountWithBalance(api, web3);47 const flipper = await deployFlipper(web3, owner);48 const helpers = contractHelpers(web3, owner);49 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;50 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});51 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;52 });5354 itWeb3('Sponsoring cannot be set by the address that did not deployed the contract', async ({api, web3}) => {55 const owner = await createEthAccountWithBalance(api, web3);56 const notOwner = await createEthAccountWithBalance(api, web3);57 const flipper = await deployFlipper(web3, owner);58 const helpers = contractHelpers(web3, owner);59 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;60 await expect(helpers.methods.setSponsoringMode(notOwner, SponsoringMode.Allowlisted).send({from: notOwner})).to.rejected;61 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;62 });6364 itWeb3('In generous mode, non-allowlisted user transaction will be sponsored', async ({api, web3}) => {65 const alice = privateKey('//Alice');6667 const owner = await createEthAccountWithBalance(api, web3);68 const caller = await createEthAccountWithBalance(api, web3);6970 const flipper = await deployFlipper(web3, owner);7172 const helpers = contractHelpers(web3, owner);7374 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;75 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: owner});76 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});77 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;7879 await transferBalanceToEth(api, alice, flipper.options.address);8081 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);82 expect(originalFlipperBalance).to.be.not.equal('0');8384 await flipper.methods.flip().send({from: caller});85 expect(await flipper.methods.getValue().call()).to.be.true;8687 // Balance should be taken from flipper instead of caller88 const balanceAfter = await web3.eth.getBalance(flipper.options.address);89 expect(+balanceAfter).to.be.lessThan(+originalFlipperBalance);90 });9192 itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should decrease (allowlisted)', async ({api, web3}) => {93 const alice = privateKey('//Alice');9495 const owner = await createEthAccountWithBalance(api, web3);96 const caller = createEthAccount(web3);9798 const flipper = await deployFlipper(web3, owner);99100 const helpers = contractHelpers(web3, owner);101 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});102 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});103104 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;105 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});106 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});107 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;108109 await transferBalanceToEth(api, alice, flipper.options.address);110111 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);112 expect(originalFlipperBalance).to.be.not.equal('0');113114 await flipper.methods.flip().send({from: caller});115 expect(await flipper.methods.getValue().call()).to.be.true;116117 // Balance should be taken from flipper instead of caller118 const balanceAfter = await web3.eth.getBalance(flipper.options.address);119 expect(+balanceAfter).to.be.lessThan(+originalFlipperBalance);120 });121122 itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should not decrease (non-allowlisted)', async ({api, web3}) => {123 const alice = privateKey('//Alice');124125 const owner = await createEthAccountWithBalance(api, web3);126 const caller = createEthAccount(web3);127128 const flipper = await deployFlipper(web3, owner);129130 const helpers = contractHelpers(web3, owner);131132 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;133 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});134 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});135 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;136137 await transferBalanceToEth(api, alice, flipper.options.address);138139 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);140 expect(originalFlipperBalance).to.be.not.equal('0');141142 await expect(flipper.methods.flip().send({from: caller})).to.be.rejectedWith(/InvalidTransaction::Payment/);143 expect(await flipper.methods.getValue().call()).to.be.false;144145 // Balance should be taken from flipper instead of caller146 const balanceAfter = await web3.eth.getBalance(flipper.options.address);147 expect(+balanceAfter).to.be.equals(+originalFlipperBalance);148 });149150 itWeb3('Sponsoring is set, an address that has UNQ can send a transaction and it works. User balance should not change', async ({api, web3}) => {151 const alice = privateKey('//Alice');152153 const owner = await createEthAccountWithBalance(api, web3);154 const caller = await createEthAccountWithBalance(api, web3);155 const originalCallerBalance = await web3.eth.getBalance(caller);156157 const flipper = await deployFlipper(web3, owner);158159 const helpers = contractHelpers(web3, owner);160 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});161 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});162163 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;164 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});165 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});166 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;167168 await transferBalanceToEth(api, alice, flipper.options.address);169170 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);171 expect(originalFlipperBalance).to.be.not.equal('0');172173 await flipper.methods.flip().send({from: caller});174 expect(await flipper.methods.getValue().call()).to.be.true;175176 expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);177 });178179 itWeb3('Sponsoring is limited, with setContractRateLimit. The limitation is working if transactions are sent more often, the sender pays the commission.', async ({api, web3}) => {180 const alice = privateKey('//Alice');181182 const owner = await createEthAccountWithBalance(api, web3);183 const caller = await createEthAccountWithBalance(api, web3);184 const originalCallerBalance = await web3.eth.getBalance(caller);185186 const flipper = await deployFlipper(web3, owner);187188 const helpers = contractHelpers(web3, owner);189 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});190 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});191192 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;193 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});194 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 10).send({from: owner});195 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;196197 await transferBalanceToEth(api, alice, flipper.options.address);198199 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);200 expect(originalFlipperBalance).to.be.not.equal('0');201202 await flipper.methods.flip().send({from: caller});203 expect(await flipper.methods.getValue().call()).to.be.true;204 expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);205206 await flipper.methods.flip().send({from: caller});207 expect(await web3.eth.getBalance(caller)).to.be.not.equals(originalCallerBalance);208 });209210 // TODO: Find a way to calculate default rate limit211 itWeb3('Default rate limit equals 7200', async ({api, web3}) => {212 const owner = await createEthAccountWithBalance(api, web3);213 const flipper = await deployFlipper(web3, owner);214 const helpers = contractHelpers(web3, owner);215 expect(await helpers.methods.getSponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');216 });217218219220221222223224 225 itWeb3.only('Sponsoring evm address from substrate collection', async ({api, web3}) => {226 const owner = privateKey('//Alice');227 const userEth = createEthAccount(web3);228 const userSub = evmToAddress(userEth);229 const collectionId = await createCollectionExpectSuccess();230231 {232 const tx = api.tx.unique.setCollectionSponsor(collectionId, owner.address);233 const events = await submitTransactionAsync(owner, tx);234 const result = getCreateCollectionResult(events);235 expect(result.success).to.be.true;236 }237 {238 const tx = api.tx.unique.confirmSponsorship(collectionId);239 const events = await submitTransactionAsync(owner, tx);240 const result = getCreateCollectionResult(events);241 expect(result.success).to.be.true;242 }243244 const address = collectionIdToAddress(collectionId);245 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: userEth, ...GAS_ARGS});246 const receiver = createEthAccount(web3);247248 {249 const nextTokenId = await contract.methods.nextTokenId().call();250 expect(nextTokenId).to.be.equal('1');251 // const result = await contract.methods.mintWithTokenURI(252 // receiver,253 // nextTokenId,254 // 'Test URI',255 // ).send({from: userEth});256 // const events = normalizeEvents(result.events);257258 // expect(events).to.be.deep.equal([259 // {260 // address,261 // event: 'Transfer',262 // args: {263 // from: '0x0000000000000000000000000000000000000000',264 // to: receiver,265 // tokenId: nextTokenId,266 // },267 // },268 // ]);269270 // expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');271 }272273 {274 const tx = api.tx.unique.setPublicAccessMode(collectionId, 'AllowList');275 const events = await submitTransactionAsync(owner, tx);276 const result = getCreateCollectionResult(events);277 expect(result.success).to.be.true;278 }279 {280 const tx = api.tx.unique.addToAllowList(collectionId, {Ethereum: userEth});281 const events = await submitTransactionAsync(owner, tx);282 const result = getCreateCollectionResult(events);283 expect(result.success).to.be.true;284 }285 {286 const tx = api.tx.unique.setMintPermission(collectionId, true);287 const events = await submitTransactionAsync(owner, tx);288 const result = getCreateCollectionResult(events);289 expect(result.success).to.be.true;290 }291 {292 const nextTokenId = await contract.methods.nextTokenId().call();293 expect(nextTokenId).to.be.equal('1');294 // const result = await contract.methods.mintWithTokenURI(295 // receiver,296 // nextTokenId,297 // 'Test URI',298 // ).send({from: userEth});299 // const events = normalizeEvents(result.events);300301 // expect(events).to.be.deep.equal([302 // {303 // address,304 // event: 'Transfer',305 // args: {306 // from: '0x0000000000000000000000000000000000000000',307 // to: receiver,308 // tokenId: nextTokenId,309 // },310 // },311 // ]);312313 // expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');314 }315316 });317});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/>.1617import privateKey from '../substrate/privateKey';18import {expect} from 'chai';19import {20 contractHelpers,21 createEthAccountWithBalance,22 transferBalanceToEth,23 deployFlipper,24 itWeb3,25 SponsoringMode,26 createEthAccount,27 collectionIdToAddress,28 GAS_ARGS,29 normalizeEvents,30} from './util/helpers';31import {32 createCollectionExpectSuccess,33 createItemExpectSuccess,34 getCreateCollectionResult,35 normalizeAccountId,36 toSubstrateAddress,37} from '../util/helpers';38import nonFungibleAbi from './nonFungibleAbi.json';39import {40 submitTransactionAsync,41} from '../substrate/substrate-api';42import { evmToAddress } from '@polkadot/util-crypto';4344describe('Sponsoring EVM contracts', () => {45 itWeb3('Sponsoring can be set by the address that has deployed the contract', async ({api, web3}) => {46 const owner = await createEthAccountWithBalance(api, web3);47 const flipper = await deployFlipper(web3, owner);48 const helpers = contractHelpers(web3, owner);49 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;50 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});51 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;52 });5354 itWeb3('Sponsoring cannot be set by the address that did not deployed the contract', async ({api, web3}) => {55 const owner = await createEthAccountWithBalance(api, web3);56 const notOwner = await createEthAccountWithBalance(api, web3);57 const flipper = await deployFlipper(web3, owner);58 const helpers = contractHelpers(web3, owner);59 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;60 await expect(helpers.methods.setSponsoringMode(notOwner, SponsoringMode.Allowlisted).send({from: notOwner})).to.rejected;61 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;62 });6364 itWeb3('In generous mode, non-allowlisted user transaction will be sponsored', async ({api, web3}) => {65 const alice = privateKey('//Alice');6667 const owner = await createEthAccountWithBalance(api, web3);68 const caller = await createEthAccountWithBalance(api, web3);6970 const flipper = await deployFlipper(web3, owner);7172 const helpers = contractHelpers(web3, owner);7374 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;75 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: owner});76 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});77 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;7879 await transferBalanceToEth(api, alice, flipper.options.address);8081 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);82 expect(originalFlipperBalance).to.be.not.equal('0');8384 await flipper.methods.flip().send({from: caller});85 expect(await flipper.methods.getValue().call()).to.be.true;8687 // Balance should be taken from flipper instead of caller88 const balanceAfter = await web3.eth.getBalance(flipper.options.address);89 expect(+balanceAfter).to.be.lessThan(+originalFlipperBalance);90 });9192 itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should decrease (allowlisted)', async ({api, web3}) => {93 const alice = privateKey('//Alice');9495 const owner = await createEthAccountWithBalance(api, web3);96 const caller = createEthAccount(web3);9798 const flipper = await deployFlipper(web3, owner);99100 const helpers = contractHelpers(web3, owner);101 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});102 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});103104 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;105 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});106 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});107 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;108109 await transferBalanceToEth(api, alice, flipper.options.address);110111 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);112 expect(originalFlipperBalance).to.be.not.equal('0');113114 await flipper.methods.flip().send({from: caller});115 expect(await flipper.methods.getValue().call()).to.be.true;116117 // Balance should be taken from flipper instead of caller118 const balanceAfter = await web3.eth.getBalance(flipper.options.address);119 expect(+balanceAfter).to.be.lessThan(+originalFlipperBalance);120 });121122 itWeb3('Sponsoring is set, an address that has no UNQ can send a transaction and it works. Sponsor balance should not decrease (non-allowlisted)', async ({api, web3}) => {123 const alice = privateKey('//Alice');124125 const owner = await createEthAccountWithBalance(api, web3);126 const caller = createEthAccount(web3);127128 const flipper = await deployFlipper(web3, owner);129130 const helpers = contractHelpers(web3, owner);131132 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;133 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});134 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});135 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;136137 await transferBalanceToEth(api, alice, flipper.options.address);138139 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);140 expect(originalFlipperBalance).to.be.not.equal('0');141142 await expect(flipper.methods.flip().send({from: caller})).to.be.rejectedWith(/InvalidTransaction::Payment/);143 expect(await flipper.methods.getValue().call()).to.be.false;144145 // Balance should be taken from flipper instead of caller146 const balanceAfter = await web3.eth.getBalance(flipper.options.address);147 expect(+balanceAfter).to.be.equals(+originalFlipperBalance);148 });149150 itWeb3('Sponsoring is set, an address that has UNQ can send a transaction and it works. User balance should not change', async ({api, web3}) => {151 const alice = privateKey('//Alice');152153 const owner = await createEthAccountWithBalance(api, web3);154 const caller = await createEthAccountWithBalance(api, web3);155 const originalCallerBalance = await web3.eth.getBalance(caller);156157 const flipper = await deployFlipper(web3, owner);158159 const helpers = contractHelpers(web3, owner);160 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});161 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});162163 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;164 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});165 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});166 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;167168 await transferBalanceToEth(api, alice, flipper.options.address);169170 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);171 expect(originalFlipperBalance).to.be.not.equal('0');172173 await flipper.methods.flip().send({from: caller});174 expect(await flipper.methods.getValue().call()).to.be.true;175176 expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);177 });178179 itWeb3('Sponsoring is limited, with setContractRateLimit. The limitation is working if transactions are sent more often, the sender pays the commission.', async ({api, web3}) => {180 const alice = privateKey('//Alice');181182 const owner = await createEthAccountWithBalance(api, web3);183 const caller = await createEthAccountWithBalance(api, web3);184 const originalCallerBalance = await web3.eth.getBalance(caller);185186 const flipper = await deployFlipper(web3, owner);187188 const helpers = contractHelpers(web3, owner);189 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});190 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});191192 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;193 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});194 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 10).send({from: owner});195 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;196197 await transferBalanceToEth(api, alice, flipper.options.address);198199 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);200 expect(originalFlipperBalance).to.be.not.equal('0');201202 await flipper.methods.flip().send({from: caller});203 expect(await flipper.methods.getValue().call()).to.be.true;204 expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);205206 await flipper.methods.flip().send({from: caller});207 expect(await web3.eth.getBalance(caller)).to.be.not.equals(originalCallerBalance);208 });209210 // TODO: Find a way to calculate default rate limit211 itWeb3('Default rate limit equals 7200', async ({api, web3}) => {212 const owner = await createEthAccountWithBalance(api, web3);213 const flipper = await deployFlipper(web3, owner);214 const helpers = contractHelpers(web3, owner);215 expect(await helpers.methods.getSponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');216 });217218219220221222223224 225 itWeb3.only('Sponsoring evm address from substrate collection', async ({api, web3}) => {226 const owner = privateKey('//Alice');227 const userEth = createEthAccount(web3);228 const userSub = evmToAddress(userEth);229 const collectionId = await createCollectionExpectSuccess();230231 {232 const tx = api.tx.unique.setCollectionSponsor(collectionId, owner.address);233 const events = await submitTransactionAsync(owner, tx);234 const result = getCreateCollectionResult(events);235 expect(result.success).to.be.true;236 }237 {238 const tx = api.tx.unique.confirmSponsorship(collectionId);239 const events = await submitTransactionAsync(owner, tx);240 const result = getCreateCollectionResult(events);241 expect(result.success).to.be.true;242 }243244 const address = collectionIdToAddress(collectionId);245 const contract = new web3.eth.Contract(nonFungibleAbi as any, address, {from: userEth, ...GAS_ARGS});246 const receiver = createEthAccount(web3);247248 {249 const nextTokenId = await contract.methods.nextTokenId().call();250 expect(nextTokenId).to.be.equal('1');251 // const result = await contract.methods.mintWithTokenURI(252 // receiver,253 // nextTokenId,254 // 'Test URI',255 // ).send({from: userEth});256 // const events = normalizeEvents(result.events);257258 // expect(events).to.be.deep.equal([259 // {260 // address,261 // event: 'Transfer',262 // args: {263 // from: '0x0000000000000000000000000000000000000000',264 // to: receiver,265 // tokenId: nextTokenId,266 // },267 // },268 // ]);269270 // expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');271 }272273 {274 const tx = api.tx.unique.setPublicAccessMode(collectionId, 'AllowList');275 const events = await submitTransactionAsync(owner, tx);276 const result = getCreateCollectionResult(events);277 expect(result.success).to.be.true;278 }279 {280 const tx = api.tx.unique.addToAllowList(collectionId, {Ethereum: userEth});281 const events = await submitTransactionAsync(owner, tx);282 const result = getCreateCollectionResult(events);283 expect(result.success).to.be.true;284 }285 {286 const tx = api.tx.unique.setMintPermission(collectionId, true);287 const events = await submitTransactionAsync(owner, tx);288 const result = getCreateCollectionResult(events);289 expect(result.success).to.be.true;290 }291292 {293 const nextTokenId = await contract.methods.nextTokenId().call();294 expect(nextTokenId).to.be.equal('1');295 const result = await contract.methods.mintWithTokenURI(296 receiver,297 nextTokenId,298 'Test URI',299 ).send({from: userEth});300 // const events = normalizeEvents(result.events);301302 // expect(events).to.be.deep.equal([303 // {304 // address,305 // event: 'Transfer',306 // args: {307 // from: '0x0000000000000000000000000000000000000000',308 // to: receiver,309 // tokenId: nextTokenId,310 // },311 // },312 // ]);313314 // expect(await contract.methods.tokenURI(nextTokenId).call()).to.be.equal('Test URI');315 }316317 });318});