difftreelog
chore replace u128 with CallContext
in: master
19 files changed
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5794,6 +5794,7 @@
"pallet-common",
"pallet-evm 6.0.0-dev (git+https://github.com/uniquenetwork/frontier?rev=89a37c5a489f426cc7a42d7b94019974093a052d)",
"pallet-evm-coder-substrate",
+ "pallet-evm-transaction-payment",
"parity-scale-codec 3.1.5",
"scale-info",
"sp-core",
@@ -6409,7 +6410,7 @@
[[package]]
name = "pallet-template-transaction-payment"
version = "3.0.0"
-source = "git+https://github.com/uniquenetwork/pallet-sponsoring?rev=a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3#a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3"
+source = "git+https://github.com/uniquenetwork/pallet-sponsoring?rev=9ee7d6e57e03a2575cbab79431774b56f170018e#9ee7d6e57e03a2575cbab79431774b56f170018e"
dependencies = [
"frame-benchmarking",
"frame-support",
@@ -12577,7 +12578,7 @@
[[package]]
name = "up-sponsorship"
version = "0.1.0"
-source = "git+https://github.com/uniquenetwork/pallet-sponsoring?rev=a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3#a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3"
+source = "git+https://github.com/uniquenetwork/pallet-sponsoring?rev=9ee7d6e57e03a2575cbab79431774b56f170018e#9ee7d6e57e03a2575cbab79431774b56f170018e"
dependencies = [
"impl-trait-for-tuples",
]
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -21,12 +21,13 @@
# Unique
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
-up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3" }
+up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e" }
# Locals
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
pallet-common = { default-features = false, path = '../../pallets/common' }
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
+pallet-evm-transaction-payment = { default-features = false, path = '../../pallets/evm-transaction-payment' }
up-data-structs = { default-features = false, path = '../../primitives/data-structs', features = [
'serde1',
] }
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -20,12 +20,13 @@
use evm_coder::{
abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*, ToLog,
};
-use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};
use pallet_evm::{
ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, PrecompileHandle,
account::CrossAccountId,
};
-use sp_core::{H160, U256};
+use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder, dispatch_to_evm};
+use pallet_evm_transaction_payment::CallContext;
+use sp_core::H160;
use up_data_structs::SponsorshipState;
use crate::{
AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringFeeLimit,
@@ -254,17 +255,15 @@
&mut self,
caller: caller,
contract_address: address,
- fee_limit: uint128,
+ fee_limit: uint256,
) -> Result<void> {
<Pallet<T>>::ensure_owner(contract_address, caller).map_err(dispatch_to_evm::<T>)?;
<Pallet<T>>::set_sponsoring_fee_limit(contract_address, fee_limit.into());
Ok(())
}
- fn get_sponsoring_fee_limit(&self, contract_address: address) -> Result<uint128> {
- Ok(<SponsoringFeeLimit<T>>::get(contract_address)
- .try_into()
- .map_err(|_| "fee limit > u128::MAX")?)
+ fn get_sponsoring_fee_limit(&self, contract_address: address) -> Result<uint256> {
+ Ok(<SponsoringFeeLimit<T>>::get(contract_address))
}
/// Is specified user present in contract allow list
@@ -380,13 +379,13 @@
/// Bridge to pallet-sponsoring
pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>), u128>
+impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>), CallContext>
for HelpersContractSponsoring<T>
{
fn get_sponsor(
who: &T::CrossAccountId,
call: &(H160, Vec<u8>),
- fee_limit: &u128,
+ call_context: &CallContext,
) -> Option<T::CrossAccountId> {
let (contract_address, _) = call;
let mode = <Pallet<T>>::sponsoring_mode(*contract_address);
@@ -417,7 +416,7 @@
let sponsored_fee_limit = <SponsoringFeeLimit<T>>::get(contract_address);
- if *fee_limit > sponsored_fee_limit {
+ if call_context.max_fee > sponsored_fee_limit {
return None;
}
pallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -30,7 +30,7 @@
use crate::eth::ContractHelpersEvents;
use frame_support::pallet_prelude::*;
use pallet_evm_coder_substrate::DispatchResult;
- use sp_core::H160;
+ use sp_core::{H160, U256};
use pallet_evm::{account::CrossAccountId, Pallet as PalletEvm};
use up_data_structs::SponsorshipState;
use evm_coder::ToLog;
@@ -50,7 +50,7 @@
type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;
/// In case of enabled sponsoring, but no sponsoring fee limit set,
/// this value will be used implicitly
- type DefaultSponsoringFeeLimit: Get<u128>;
+ type DefaultSponsoringFeeLimit: Get<U256>;
}
#[pallet::error]
@@ -124,7 +124,7 @@
pub(super) type SponsoringFeeLimit<T: Config> = StorageMap<
Hasher = Twox128,
Key = H160,
- Value = u128,
+ Value = U256,
QueryKind = ValueQuery,
OnEmpty = T::DefaultSponsoringFeeLimit,
>;
@@ -366,7 +366,7 @@
}
/// Set maximum for gas limit of transaction
- pub fn set_sponsoring_fee_limit(contract: H160, fee_limit: u128) {
+ pub fn set_sponsoring_fee_limit(contract: H160, fee_limit: U256) {
<SponsoringFeeLimit<T>>::insert(contract, fee_limit);
}
pallets/evm-contract-helpers/src/stubs/ContractHelpers.rawdiffbeforeafterbothbinary blob — no preview
pallets/evm-contract-helpers/src/stubs/ContractHelpers.soldiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
+++ b/pallets/evm-contract-helpers/src/stubs/ContractHelpers.sol
@@ -32,7 +32,7 @@
}
/// @title Magic contract, which allows users to reconfigure other contracts
-/// @dev the ERC-165 identifier for this interface is 0xd77fab70
+/// @dev the ERC-165 identifier for this interface is 0x172cb4fb
contract ContractHelpers is Dummy, ERC165, ContractHelpersEvents {
/// Get user, which deployed specified contract
/// @dev May return zero address in case if contract is deployed
@@ -203,9 +203,9 @@
dummy = 0;
}
- /// @dev EVM selector for this function is: 0x1c362eb4,
- /// or in textual repr: setSponsoringFeeLimit(address,uint128)
- function setSponsoringFeeLimit(address contractAddress, uint128 feeLimit)
+ /// @dev EVM selector for this function is: 0x03aed665,
+ /// or in textual repr: setSponsoringFeeLimit(address,uint256)
+ function setSponsoringFeeLimit(address contractAddress, uint256 feeLimit)
public
{
require(false, stub_error);
@@ -219,7 +219,7 @@
function getSponsoringFeeLimit(address contractAddress)
public
view
- returns (uint128)
+ returns (uint256)
{
require(false, stub_error);
contractAddress;
pallets/evm-transaction-payment/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-transaction-payment/Cargo.toml
+++ b/pallets/evm-transaction-payment/Cargo.toml
@@ -17,7 +17,7 @@
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
fp-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
-up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev = "a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3" }
+up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev = "9ee7d6e57e03a2575cbab79431774b56f170018e" }
fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
[dependencies.codec]
pallets/evm-transaction-payment/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-transaction-payment/src/lib.rs
+++ b/pallets/evm-transaction-payment/src/lib.rs
@@ -22,7 +22,7 @@
use fp_evm::WithdrawReason;
use frame_support::traits::IsSubType;
pub use pallet::*;
-use pallet_evm::{account::CrossAccountId, EnsureAddressOrigin, FeeCalculator};
+use pallet_evm::{account::CrossAccountId, EnsureAddressOrigin};
use sp_core::{H160, U256};
use sp_runtime::{TransactionOutcome, DispatchError};
use up_sponsorship::SponsorshipHandler;
@@ -33,10 +33,20 @@
use sp_std::vec::Vec;
+ /// Contains call data
+ pub struct CallContext {
+ /// Max fee for transaction - gasLimit * gasPrice
+ pub max_fee: U256,
+ }
+
#[pallet::config]
pub trait Config: frame_system::Config + pallet_evm::account::Config {
/// Loosly-coupled handlers for evm call sponsoring
- type EvmSponsorshipHandler: SponsorshipHandler<Self::CrossAccountId, (H160, Vec<u8>), u128>;
+ type EvmSponsorshipHandler: SponsorshipHandler<
+ Self::CrossAccountId,
+ (H160, Vec<u8>),
+ CallContext,
+ >;
}
#[pallet::pallet]
@@ -55,10 +65,11 @@
match reason {
WithdrawReason::Call { target, input } => {
let origin_sub = T::CrossAccountId::from_eth(origin);
+ let call_context = CallContext { max_fee };
T::EvmSponsorshipHandler::get_sponsor(
&origin_sub,
&(*target, input.clone()),
- &max_fee.as_u128(),
+ &call_context,
)
}
_ => None,
@@ -68,12 +79,12 @@
/// Implements sponsoring for evm calls performed from pallet-evm (via api.tx.ethereum.transact/api.tx.evm.call)
pub struct BridgeSponsorshipHandler<T>(PhantomData<T>);
-impl<T, C> SponsorshipHandler<T::AccountId, C, u128> for BridgeSponsorshipHandler<T>
+impl<T, C> SponsorshipHandler<T::AccountId, C, ()> for BridgeSponsorshipHandler<T>
where
T: Config + pallet_evm::Config,
C: IsSubType<pallet_evm::Call<T>>,
{
- fn get_sponsor(who: &T::AccountId, call: &C, _fee_limit: &u128) -> Option<T::AccountId> {
+ fn get_sponsor(who: &T::AccountId, call: &C, _call_context: &()) -> Option<T::AccountId> {
match call.is_sub_type()? {
pallet_evm::Call::call {
source,
@@ -90,6 +101,7 @@
.ok()?;
let who = T::CrossAccountId::from_sub(who.clone());
let max_fee = max_fee_per_gas.saturating_mul((*gas_limit).into());
+ let call_context = CallContext { max_fee };
// Effects from EvmSponsorshipHandler are applied 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(|| {
@@ -97,7 +109,7 @@
T::EvmSponsorshipHandler::get_sponsor(
&who,
&(*target, input.clone()),
- &max_fee.try_into().unwrap(),
+ &call_context,
),
))
})
pallets/scheduler/Cargo.tomldiffbeforeafterboth--- a/pallets/scheduler/Cargo.toml
+++ b/pallets/scheduler/Cargo.toml
@@ -24,7 +24,7 @@
sp-core = { default-features = false, git = 'https://github.com/paritytech/substrate.git', branch = 'polkadot-v0.9.27' }
frame-benchmarking = { default-features = false, optional = true, git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.27" }
-up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3" }
+up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e" }
log = { version = "0.4.14", default-features = false }
[dev-dependencies]
runtime/common/config/sponsoring.rsdiffbeforeafterboth--- a/runtime/common/config/sponsoring.rs
+++ b/runtime/common/config/sponsoring.rs
@@ -14,16 +14,17 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-use frame_support::parameter_types;
use crate::{
runtime_common::{sponsoring::UniqueSponsorshipHandler},
Runtime,
};
-use up_common::{types::BlockNumber, constants::*};
+use frame_support::parameter_types;
+use sp_core::U256;
+use up_common::{constants::*, types::BlockNumber};
parameter_types! {
pub const DefaultSponsoringRateLimit: BlockNumber = 1 * DAYS;
- pub const DefaultSponsoringFeeLimit: u128 = u128::MAX;
+ pub const DefaultSponsoringFeeLimit: U256 = U256::MAX;
}
type SponsorshipHandler = (
runtime/common/ethereum/sponsoring.rsdiffbeforeafterboth--- a/runtime/common/ethereum/sponsoring.rs
+++ b/runtime/common/ethereum/sponsoring.rs
@@ -16,27 +16,31 @@
//! Implements EVM sponsoring logic via TransactionValidityHack
+use core::{convert::TryInto, marker::PhantomData};
use evm_coder::{Call, abi::AbiReader};
use pallet_common::{CollectionHandle, eth::map_eth_to_id};
+use pallet_evm::account::CrossAccountId;
+use pallet_evm_transaction_payment::CallContext;
+use pallet_nonfungible::{
+ Config as NonfungibleConfig,
+ erc::{
+ UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721MintableCall, ERC721Call,
+ TokenPropertiesCall,
+ },
+};
+use pallet_fungible::{
+ Config as FungibleConfig,
+ erc::{UniqueFungibleCall, ERC20Call},
+};
+use pallet_refungible::Config as RefungibleConfig;
+use pallet_unique::Config as UniqueConfig;
use sp_core::H160;
use sp_std::prelude::*;
+use up_data_structs::{CollectionMode, CreateItemData, CreateNftData, TokenId};
use up_sponsorship::SponsorshipHandler;
-use core::marker::PhantomData;
-use core::convert::TryInto;
-use pallet_evm::account::CrossAccountId;
-use up_data_structs::{TokenId, CreateItemData, CreateNftData, CollectionMode};
-use pallet_unique::Config as UniqueConfig;
use crate::{Runtime, runtime_common::sponsoring::*};
-use pallet_nonfungible::erc::{
- UniqueNFTCall, ERC721UniqueExtensionsCall, ERC721MintableCall, ERC721Call, TokenPropertiesCall,
-};
-use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
-use pallet_fungible::Config as FungibleConfig;
-use pallet_nonfungible::Config as NonfungibleConfig;
-use pallet_refungible::Config as RefungibleConfig;
-
pub type EvmSponsorshipHandler = (
UniqueEthSponsorshipHandler<Runtime>,
pallet_evm_contract_helpers::HelpersContractSponsoring<Runtime>,
@@ -44,12 +48,13 @@
pub struct UniqueEthSponsorshipHandler<T: UniqueConfig>(PhantomData<*const T>);
impl<T: UniqueConfig + FungibleConfig + NonfungibleConfig + RefungibleConfig>
- SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>), u128> for UniqueEthSponsorshipHandler<T>
+ SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>), CallContext>
+ for UniqueEthSponsorshipHandler<T>
{
fn get_sponsor(
who: &T::CrossAccountId,
call: &(H160, Vec<u8>),
- _fee_limit: &u128,
+ _fee_limit: &CallContext,
) -> Option<T::CrossAccountId> {
let collection_id = map_eth_to_id(&call.0)?;
let collection = <CollectionHandle<T>>::new(collection_id)?;
runtime/common/sponsoring.rsdiffbeforeafterboth--- a/runtime/common/sponsoring.rs
+++ b/runtime/common/sponsoring.rs
@@ -224,12 +224,12 @@
}
pub struct UniqueSponsorshipHandler<T>(PhantomData<T>);
-impl<T, C> SponsorshipHandler<T::AccountId, C, u128> for UniqueSponsorshipHandler<T>
+impl<T, C> SponsorshipHandler<T::AccountId, C, ()> for UniqueSponsorshipHandler<T>
where
T: Config,
C: IsSubType<UniqueCall<T>>,
{
- fn get_sponsor(who: &T::AccountId, call: &C, _fee_limit: &u128) -> Option<T::AccountId> {
+ fn get_sponsor(who: &T::AccountId, call: &C, _call_context: &()) -> Option<T::AccountId> {
match IsSubType::<UniqueCall<T>>::is_sub_type(call)? {
UniqueCall::set_token_properties {
collection_id,
runtime/opal/Cargo.tomldiffbeforeafterboth--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -431,7 +431,7 @@
pallet-proxy-rmrk-equip = { default-features = false, path = "../../pallets/proxy-rmrk-equip", package = "pallet-rmrk-equip" }
pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
-pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
+pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
@@ -442,7 +442,7 @@
fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
-up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3" }
+up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e" }
################################################################################
# Build Dependencies
runtime/quartz/Cargo.tomldiffbeforeafterboth--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -432,7 +432,7 @@
pallet-proxy-rmrk-equip = { default-features = false, path = "../../pallets/proxy-rmrk-equip", package = "pallet-rmrk-equip" }
pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
-pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
+pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
@@ -443,7 +443,7 @@
fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
-up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3" }
+up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e" }
################################################################################
# Build Dependencies
runtime/tests/Cargo.tomldiffbeforeafterboth--- a/runtime/tests/Cargo.toml
+++ b/runtime/tests/Cargo.toml
@@ -43,4 +43,4 @@
scale-info = "*"
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
-up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3" }
+up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e" }
runtime/unique/Cargo.tomldiffbeforeafterboth--- a/runtime/unique/Cargo.toml
+++ b/runtime/unique/Cargo.toml
@@ -425,7 +425,7 @@
pallet-proxy-rmrk-equip = { default-features = false, path = "../../pallets/proxy-rmrk-equip", package = "pallet-rmrk-equip" }
pallet-unique-scheduler = { path = '../../pallets/scheduler', default-features = false }
# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }
-pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
+pallet-charge-transaction = { git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e", package = "pallet-template-transaction-payment", default-features = false, version = "3.0.0" }
pallet-evm-migration = { path = '../../pallets/evm-migration', default-features = false }
pallet-evm-contract-helpers = { path = '../../pallets/evm-contract-helpers', default-features = false }
pallet-evm-transaction-payment = { path = '../../pallets/evm-transaction-payment', default-features = false }
@@ -437,7 +437,7 @@
fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
fp-evm-mapping = { default-features = false, git = "https://github.com/uniquenetwork/frontier", rev = "89a37c5a489f426cc7a42d7b94019974093a052d" }
evm-coder = { default-features = false, path = '../../crates/evm-coder' }
-up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="a8ec4bf8d5ded662d96da6d8fb211b0bbf6617b3" }
+up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", rev="9ee7d6e57e03a2575cbab79431774b56f170018e" }
################################################################################
# Build Dependencies
tests/src/eth/api/ContractHelpers.soldiffbeforeafterboth--- a/tests/src/eth/api/ContractHelpers.sol
+++ b/tests/src/eth/api/ContractHelpers.sol
@@ -23,7 +23,7 @@
}
/// @title Magic contract, which allows users to reconfigure other contracts
-/// @dev the ERC-165 identifier for this interface is 0xd77fab70
+/// @dev the ERC-165 identifier for this interface is 0x172cb4fb
interface ContractHelpers is Dummy, ERC165, ContractHelpersEvents {
/// Get user, which deployed specified contract
/// @dev May return zero address in case if contract is deployed
@@ -131,9 +131,9 @@
function setSponsoringRateLimit(address contractAddress, uint32 rateLimit)
external;
- /// @dev EVM selector for this function is: 0x1c362eb4,
- /// or in textual repr: setSponsoringFeeLimit(address,uint128)
- function setSponsoringFeeLimit(address contractAddress, uint128 feeLimit)
+ /// @dev EVM selector for this function is: 0x03aed665,
+ /// or in textual repr: setSponsoringFeeLimit(address,uint256)
+ function setSponsoringFeeLimit(address contractAddress, uint256 feeLimit)
external;
/// @dev EVM selector for this function is: 0xc3fdc9ee,
@@ -141,7 +141,7 @@
function getSponsoringFeeLimit(address contractAddress)
external
view
- returns (uint128);
+ returns (uint256);
/// Is specified user present in contract allow list
/// @dev Contract owner always implicitly included
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 * as solc from 'solc';18import {expect} from 'chai';19import {expectSubstrateEventsAtBlock} from '../util/helpers';20import Web3 from 'web3';2122import {23 contractHelpers,24 createEthAccountWithBalance,25 transferBalanceToEth,26 deployFlipper,27 itWeb3,28 SponsoringMode,29 createEthAccount,30 ethBalanceViaSub,31 normalizeEvents,32 CompiledContract,33 GAS_ARGS,34 subToEth,35} from './util/helpers';36import { submitTransactionAsync } from '../substrate/substrate-api';3738describe('Sponsoring EVM contracts', () => {39 itWeb3('Self sponsored can be set by the address that deployed the contract', async ({api, web3, privateKeyWrapper}) => {40 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);41 const flipper = await deployFlipper(web3, owner);42 const helpers = contractHelpers(web3, owner);43 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;44 await expect(helpers.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected;45 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;46 });4748 itWeb3('Set self sponsored events', async ({api, web3, privateKeyWrapper}) => {49 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);50 const flipper = await deployFlipper(web3, owner);51 const helpers = contractHelpers(web3, owner);52 53 const result = await helpers.methods.selfSponsoredEnable(flipper.options.address).send();54 // console.log(result);55 const ethEvents = normalizeEvents(result.events);56 expect(ethEvents).to.be.deep.equal([57 {58 address: flipper.options.address,59 event: 'ContractSponsorSet',60 args: {61 contractAddress: flipper.options.address,62 sponsor: flipper.options.address,63 },64 },65 {66 address: flipper.options.address,67 event: 'ContractSponsorshipConfirmed',68 args: {69 contractAddress: flipper.options.address,70 sponsor: flipper.options.address,71 },72 },73 ]);7475 await expectSubstrateEventsAtBlock(76 api, 77 result.blockNumber,78 'evmContractHelpers',79 ['ContractSponsorSet','ContractSponsorshipConfirmed'],80 );81 });8283 itWeb3('Self sponsored can not be set by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {84 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);85 const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);86 const flipper = await deployFlipper(web3, owner);87 const helpers = contractHelpers(web3, owner);88 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;89 await expect(helpers.methods.selfSponsoredEnable(flipper.options.address).call({from: notOwner})).to.be.rejectedWith('NoPermission');90 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;91 });9293 itWeb3('Sponsoring can be set by the address that has deployed the contract', async ({api, web3, privateKeyWrapper}) => {94 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);95 const flipper = await deployFlipper(web3, owner);96 const helpers = contractHelpers(web3, owner);97 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;98 await expect(helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner})).to.be.not.rejected;99 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;100 });101102 itWeb3('Sponsoring cannot be set by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {103 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);104 const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);105 const flipper = await deployFlipper(web3, owner);106 const helpers = contractHelpers(web3, owner);107 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;108 await expect(helpers.methods.setSponsoringMode(notOwner, SponsoringMode.Allowlisted).call({from: notOwner})).to.be.rejectedWith('NoPermission');109 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;110 });111 112 itWeb3('Sponsor can be set by the address that deployed the contract', async ({api, web3, privateKeyWrapper}) => {113 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);114 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);115 const flipper = await deployFlipper(web3, owner);116 const helpers = contractHelpers(web3, owner);117 expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.false;118 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;119 expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.true;120 });121 122 itWeb3('Set sponsor event', async ({api, web3, privateKeyWrapper}) => {123 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);124 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);125 const flipper = await deployFlipper(web3, owner);126 const helpers = contractHelpers(web3, owner);127 128 const result = await helpers.methods.setSponsor(flipper.options.address, sponsor).send();129 const events = normalizeEvents(result.events);130 expect(events).to.be.deep.equal([131 {132 address: flipper.options.address,133 event: 'ContractSponsorSet',134 args: {135 contractAddress: flipper.options.address,136 sponsor: sponsor,137 },138 },139 ]);140141 await expectSubstrateEventsAtBlock(142 api, 143 result.blockNumber,144 'evmContractHelpers',145 ['ContractSponsorSet'],146 );147 });148 149 itWeb3('Sponsor can not be set by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {150 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);151 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);152 const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);153 const flipper = await deployFlipper(web3, owner);154 const helpers = contractHelpers(web3, owner);155 expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.false;156 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).call({from: notOwner})).to.be.rejectedWith('NoPermission');157 expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.false;158 });159160 itWeb3('Sponsorship can be confirmed by the address that pending as sponsor', async ({api, web3, privateKeyWrapper}) => {161 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);162 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);163 const flipper = await deployFlipper(web3, owner);164 const helpers = contractHelpers(web3, owner);165 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;166 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;167 await expect(helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor})).to.be.not.rejected;168 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;169 });170171 itWeb3('Confirm sponsorship event', async ({api, web3, privateKeyWrapper}) => {172 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);173 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);174 const flipper = await deployFlipper(web3, owner);175 const helpers = contractHelpers(web3, owner);176 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;177 const result = await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});178 const events = normalizeEvents(result.events);179 expect(events).to.be.deep.equal([180 {181 address: flipper.options.address,182 event: 'ContractSponsorshipConfirmed',183 args: {184 contractAddress: flipper.options.address,185 sponsor: sponsor,186 },187 },188 ]);189190 await expectSubstrateEventsAtBlock(191 api, 192 result.blockNumber,193 'evmContractHelpers',194 ['ContractSponsorshipConfirmed'],195 );196 });197198 itWeb3('Sponsorship can not be confirmed by the address that not pending as sponsor', async ({api, web3, privateKeyWrapper}) => {199 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);200 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);201 const notSponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);202 const flipper = await deployFlipper(web3, owner);203 const helpers = contractHelpers(web3, owner);204 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;205 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;206 await expect(helpers.methods.confirmSponsorship(flipper.options.address).call({from: notSponsor})).to.be.rejectedWith('NoPermission');207 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;208 });209210 itWeb3('Sponsorship can not be confirmed by the address that not set as sponsor', async ({api, web3, privateKeyWrapper}) => {211 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);212 const notSponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);213 const flipper = await deployFlipper(web3, owner);214 const helpers = contractHelpers(web3, owner);215 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;216 await expect(helpers.methods.confirmSponsorship(flipper.options.address).call({from: notSponsor})).to.be.rejectedWith('NoPendingSponsor');217 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;218 });219220 itWeb3('Get self sponsored sponsor', async ({api, web3, privateKeyWrapper}) => {221 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);222 const flipper = await deployFlipper(web3, owner);223 const helpers = contractHelpers(web3, owner);224 await helpers.methods.selfSponsoredEnable(flipper.options.address).send();225 226 const result = await helpers.methods.getSponsor(flipper.options.address).call();227228 expect(result[0]).to.be.eq(flipper.options.address);229 expect(result[1]).to.be.eq('0');230 });231232 itWeb3('Get confirmed sponsor', async ({api, web3, privateKeyWrapper}) => {233 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);234 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);235 const flipper = await deployFlipper(web3, owner);236 const helpers = contractHelpers(web3, owner);237 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();238 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});239 240 const result = await helpers.methods.getSponsor(flipper.options.address).call();241242 expect(result[0]).to.be.eq(sponsor);243 expect(result[1]).to.be.eq('0');244 });245246 itWeb3('Sponsor can be removed by the address that deployed the contract', async ({api, web3, privateKeyWrapper}) => {247 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);248 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);249 const flipper = await deployFlipper(web3, owner);250 const helpers = contractHelpers(web3, owner);251252 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;253 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();254 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});255 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;256 257 await helpers.methods.removeSponsor(flipper.options.address).send();258 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;259 });260261 itWeb3('Remove sponsor event', async ({api, web3, privateKeyWrapper}) => {262 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);263 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);264 const flipper = await deployFlipper(web3, owner);265 const helpers = contractHelpers(web3, owner);266267 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();268 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});269 270 const result = await helpers.methods.removeSponsor(flipper.options.address).send();271 const events = normalizeEvents(result.events);272 expect(events).to.be.deep.equal([273 {274 address: flipper.options.address,275 event: 'ContractSponsorRemoved',276 args: {277 contractAddress: flipper.options.address,278 },279 },280 ]);281282 await expectSubstrateEventsAtBlock(283 api, 284 result.blockNumber,285 'evmContractHelpers',286 ['ContractSponsorRemoved'],287 );288 });289290 itWeb3('Sponsor can not be removed by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {291 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);292 const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);293 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);294 const flipper = await deployFlipper(web3, owner);295 const helpers = contractHelpers(web3, owner);296297 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;298 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();299 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});300 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;301 302 await expect(helpers.methods.removeSponsor(flipper.options.address).call({from: notOwner})).to.be.rejectedWith('NoPermission');303 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;304 });305306 itWeb3('In generous mode, non-allowlisted user transaction will be sponsored', async ({api, web3, privateKeyWrapper}) => {307 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);308 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);309 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);310311 const flipper = await deployFlipper(web3, owner);312313 const helpers = contractHelpers(web3, owner);314315 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();316 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});317318 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: owner});319 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});320321 const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);322 const callerBalanceBefore = await ethBalanceViaSub(api, caller);323324 await flipper.methods.flip().send({from: caller});325 expect(await flipper.methods.getValue().call()).to.be.true;326327 // Balance should be taken from sponsor instead of caller328 const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);329 const callerBalanceAfter = await ethBalanceViaSub(api, caller);330 expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;331 expect(callerBalanceAfter).to.be.eq(callerBalanceBefore);332 });333334 itWeb3('In generous mode, non-allowlisted user transaction will be self sponsored', async ({api, web3, privateKeyWrapper}) => {335 const alice = privateKeyWrapper('//Alice');336337 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);338 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);339340 const flipper = await deployFlipper(web3, owner);341342 const helpers = contractHelpers(web3, owner);343344 await helpers.methods.selfSponsoredEnable(flipper.options.address).send();345346 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: owner});347 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});348349 await transferBalanceToEth(api, alice, flipper.options.address);350351 const contractBalanceBefore = await ethBalanceViaSub(api, flipper.options.address);352 const callerBalanceBefore = await ethBalanceViaSub(api, caller);353354 await flipper.methods.flip().send({from: caller});355 expect(await flipper.methods.getValue().call()).to.be.true;356357 // Balance should be taken from sponsor instead of caller358 const contractBalanceAfter = await ethBalanceViaSub(api, flipper.options.address);359 const callerBalanceAfter = await ethBalanceViaSub(api, caller);360 expect(contractBalanceAfter < contractBalanceBefore).to.be.true;361 expect(callerBalanceAfter).to.be.eq(callerBalanceBefore);362 });363364 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, privateKeyWrapper}) => {365 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);366 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);367 const caller = createEthAccount(web3);368369 const flipper = await deployFlipper(web3, owner);370371 const helpers = contractHelpers(web3, owner);372 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});373 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});374375 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});376 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});377378 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();379 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});380381 const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);382 expect(sponsorBalanceBefore).to.be.not.equal('0');383384 await flipper.methods.flip().send({from: caller});385 expect(await flipper.methods.getValue().call()).to.be.true;386387 // Balance should be taken from flipper instead of caller388 const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);389 expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;390 });391392 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, privateKeyWrapper}) => {393 const alice = privateKeyWrapper('//Alice');394395 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);396 const caller = createEthAccount(web3);397398 const flipper = await deployFlipper(web3, owner);399400 const helpers = contractHelpers(web3, owner);401402 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});403 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});404405 await transferBalanceToEth(api, alice, flipper.options.address);406407 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);408 expect(originalFlipperBalance).to.be.not.equal('0');409410 await expect(flipper.methods.flip().send({from: caller})).to.be.rejectedWith(/InvalidTransaction::Payment/);411 expect(await flipper.methods.getValue().call()).to.be.false;412413 // Balance should be taken from flipper instead of caller414 const balanceAfter = await web3.eth.getBalance(flipper.options.address);415 expect(+balanceAfter).to.be.equals(+originalFlipperBalance);416 });417418 itWeb3('Sponsoring is set, an address that has UNQ can send a transaction and it works. User balance should not change', async ({api, web3, privateKeyWrapper}) => {419 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);420 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);421 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);422423 const flipper = await deployFlipper(web3, owner);424425 const helpers = contractHelpers(web3, owner);426 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});427 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});428429 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});430 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});431432 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();433 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});434435 const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);436 const callerBalanceBefore = await ethBalanceViaSub(api, caller);437438 await flipper.methods.flip().send({from: caller});439 expect(await flipper.methods.getValue().call()).to.be.true;440441 const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);442 const callerBalanceAfter = await ethBalanceViaSub(api, caller);443 expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;444 expect(callerBalanceAfter).to.be.equals(callerBalanceBefore);445 });446447 itWeb3('Sponsoring is limited, with setContractRateLimit. The limitation is working if transactions are sent more often, the sender pays the commission.', async ({api, web3, privateKeyWrapper}) => {448 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);449 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);450 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);451 const originalCallerBalance = await web3.eth.getBalance(caller);452453 const flipper = await deployFlipper(web3, owner);454455 const helpers = contractHelpers(web3, owner);456 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});457 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});458459 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});460 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 10).send({from: owner});461462 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();463 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});464465 const originalFlipperBalance = await web3.eth.getBalance(sponsor);466 expect(originalFlipperBalance).to.be.not.equal('0');467468 await flipper.methods.flip().send({from: caller});469 expect(await flipper.methods.getValue().call()).to.be.true;470 expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);471472 const newFlipperBalance = await web3.eth.getBalance(sponsor);473 expect(newFlipperBalance).to.be.not.equals(originalFlipperBalance);474475 await flipper.methods.flip().send({from: caller});476 expect(await web3.eth.getBalance(sponsor)).to.be.equal(newFlipperBalance);477 expect(await web3.eth.getBalance(caller)).to.be.not.equals(originalCallerBalance);478 });479480 // TODO: Find a way to calculate default rate limit481 itWeb3('Default rate limit equals 7200', async ({api, web3, privateKeyWrapper}) => {482 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);483 const flipper = await deployFlipper(web3, owner);484 const helpers = contractHelpers(web3, owner);485 expect(await helpers.methods.getSponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');486 });487});488489describe('Sponsoring Fee Limit', () => {490491 let testContract: CompiledContract;492 493 function compileTestContract() {494 if (!testContract) {495 const input = {496 language: 'Solidity',497 sources: {498 ['TestContract.sol']: {499 content:500 `501 // SPDX-License-Identifier: MIT502 pragma solidity ^0.8.0;503 504 contract TestContract {505 event Result(bool);506 function test1() public {507 uint256 counter = 0;508 while(true) {509 counter ++;510 }511 emit Result(true);512 }513514 function test2() public {515 uint256 counter = 0;516 while(true) {517 counter ++;518 if (counter > 1){519 break;520 }521 }522 emit Result(true);523 }524 }525 `,526 },527 },528 settings: {529 outputSelection: {530 '*': {531 '*': ['*'],532 },533 },534 },535 };536 const json = JSON.parse(solc.compile(JSON.stringify(input)));537 const out = json.contracts['TestContract.sol']['TestContract'];538 539 testContract = {540 abi: out.abi,541 object: '0x' + out.evm.bytecode.object,542 };543 }544 return testContract;545 }546 547 async function deployTestContract(web3: Web3, owner: string) {548 const compiled = compileTestContract();549 const testContract = new web3.eth.Contract(compiled.abi, undefined, {550 data: compiled.object,551 from: owner,552 ...GAS_ARGS,553 });554 return await testContract.deploy({data: compiled.object}).send({from: owner});555 }556557 itWeb3('Default fee limit', async ({api, web3, privateKeyWrapper}) => {558 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);559 const flipper = await deployFlipper(web3, owner);560 const helpers = contractHelpers(web3, owner);561 expect(await helpers.methods.getSponsoringFeeLimit(flipper.options.address).call()).to.be.equals('340282366920938463463374607431768211455');562 });563564 itWeb3('Set fee limit', async ({api, web3, privateKeyWrapper}) => {565 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);566 const flipper = await deployFlipper(web3, owner);567 const helpers = contractHelpers(web3, owner);568 await helpers.methods.setSponsoringFeeLimit(flipper.options.address, 100).send();569 expect(await helpers.methods.getSponsoringFeeLimit(flipper.options.address).call()).to.be.equals('100');570 });571572 itWeb3('Negative test - set fee limit by non-owner', async ({api, web3, privateKeyWrapper}) => {573 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);574 const stranger = await createEthAccountWithBalance(api, web3, privateKeyWrapper);575 const flipper = await deployFlipper(web3, owner);576 const helpers = contractHelpers(web3, owner);577 await expect(helpers.methods.setSponsoringFeeLimit(flipper.options.address, 100).send({from: stranger})).to.be.rejected;578 });579580 itWeb3('Negative test - check that eth transactions exceeding fee limit are not executed', async ({api, web3, privateKeyWrapper}) => {581 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);582 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);583 const user = await createEthAccountWithBalance(api, web3, privateKeyWrapper);584585 const testContract = await deployTestContract(web3, owner);586 const helpers = contractHelpers(web3, owner);587 588 await helpers.methods.setSponsoringMode(testContract.options.address, SponsoringMode.Generous).send({from: owner});589 await helpers.methods.setSponsoringRateLimit(testContract.options.address, 0).send({from: owner});590 591 await helpers.methods.setSponsor(testContract.options.address, sponsor).send();592 await helpers.methods.confirmSponsorship(testContract.options.address).send({from: sponsor});593594 const gasPrice = BigInt(await web3.eth.getGasPrice());595596 await helpers.methods.setSponsoringFeeLimit(testContract.options.address, 30000n * gasPrice).send();597598 const originalUserBalance = await web3.eth.getBalance(user);599 await testContract.methods.test2().send({from: user, gas: 30000});600 expect(await web3.eth.getBalance(user)).to.be.equal(originalUserBalance);601602 await testContract.methods.test2().send({from: user, gas: 40000});603 expect(await web3.eth.getBalance(user)).to.not.be.equal(originalUserBalance);604 });605606 itWeb3('Negative test - check that evm.call transactions exceeding fee limit are not executed', async ({api, web3, privateKeyWrapper}) => {607 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);608 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);609610 const testContract = await deployTestContract(web3, owner);611 const helpers = contractHelpers(web3, owner);612 613 await helpers.methods.setSponsoringMode(testContract.options.address, SponsoringMode.Generous).send({from: owner});614 await helpers.methods.setSponsoringRateLimit(testContract.options.address, 0).send({from: owner});615 616 await helpers.methods.setSponsor(testContract.options.address, sponsor).send();617 await helpers.methods.confirmSponsorship(testContract.options.address).send({from: sponsor});618619 const gasPrice = BigInt(await web3.eth.getGasPrice());620621 await helpers.methods.setSponsoringFeeLimit(testContract.options.address, 30000n * gasPrice).send();622623 const alice = privateKeyWrapper('//Alice');624 const originalAliceBalance = (await api.query.system.account(alice.address)).data.free.toBigInt();625 626 await submitTransactionAsync(627 alice,628 api.tx.evm.call(629 subToEth(alice.address),630 testContract.options.address,631 testContract.methods.test2().encodeABI(),632 Uint8Array.from([]),633 30000n,634 gasPrice,635 null,636 null,637 [],638 ),639 );640 expect((await api.query.system.account(alice.address)).data.free.toBigInt()).to.be.equal(originalAliceBalance);641 642 await submitTransactionAsync(643 alice,644 api.tx.evm.call(645 subToEth(alice.address),646 testContract.options.address,647 testContract.methods.test2().encodeABI(),648 Uint8Array.from([]),649 40000n,650 gasPrice,651 null,652 null,653 [],654 ),655 );656 expect((await api.query.system.account(alice.address)).data.free.toBigInt()).to.not.be.equal(originalAliceBalance);657 });658});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 * as solc from 'solc';18import {expect} from 'chai';19import {expectSubstrateEventsAtBlock} from '../util/helpers';20import Web3 from 'web3';2122import {23 contractHelpers,24 createEthAccountWithBalance,25 transferBalanceToEth,26 deployFlipper,27 itWeb3,28 SponsoringMode,29 createEthAccount,30 ethBalanceViaSub,31 normalizeEvents,32 CompiledContract,33 GAS_ARGS,34 subToEth,35} from './util/helpers';36import { submitTransactionAsync } from '../substrate/substrate-api';3738describe('Sponsoring EVM contracts', () => {39 itWeb3('Self sponsored can be set by the address that deployed the contract', async ({api, web3, privateKeyWrapper}) => {40 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);41 const flipper = await deployFlipper(web3, owner);42 const helpers = contractHelpers(web3, owner);43 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;44 await expect(helpers.methods.selfSponsoredEnable(flipper.options.address).send()).to.be.not.rejected;45 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;46 });4748 itWeb3('Set self sponsored events', async ({api, web3, privateKeyWrapper}) => {49 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);50 const flipper = await deployFlipper(web3, owner);51 const helpers = contractHelpers(web3, owner);52 53 const result = await helpers.methods.selfSponsoredEnable(flipper.options.address).send();54 // console.log(result);55 const ethEvents = normalizeEvents(result.events);56 expect(ethEvents).to.be.deep.equal([57 {58 address: flipper.options.address,59 event: 'ContractSponsorSet',60 args: {61 contractAddress: flipper.options.address,62 sponsor: flipper.options.address,63 },64 },65 {66 address: flipper.options.address,67 event: 'ContractSponsorshipConfirmed',68 args: {69 contractAddress: flipper.options.address,70 sponsor: flipper.options.address,71 },72 },73 ]);7475 await expectSubstrateEventsAtBlock(76 api, 77 result.blockNumber,78 'evmContractHelpers',79 ['ContractSponsorSet','ContractSponsorshipConfirmed'],80 );81 });8283 itWeb3('Self sponsored can not be set by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {84 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);85 const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);86 const flipper = await deployFlipper(web3, owner);87 const helpers = contractHelpers(web3, owner);88 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;89 await expect(helpers.methods.selfSponsoredEnable(flipper.options.address).call({from: notOwner})).to.be.rejectedWith('NoPermission');90 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;91 });9293 itWeb3('Sponsoring can be set by the address that has deployed the contract', async ({api, web3, privateKeyWrapper}) => {94 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);95 const flipper = await deployFlipper(web3, owner);96 const helpers = contractHelpers(web3, owner);97 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;98 await expect(helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner})).to.be.not.rejected;99 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.true;100 });101102 itWeb3('Sponsoring cannot be set by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {103 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);104 const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);105 const flipper = await deployFlipper(web3, owner);106 const helpers = contractHelpers(web3, owner);107 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;108 await expect(helpers.methods.setSponsoringMode(notOwner, SponsoringMode.Allowlisted).call({from: notOwner})).to.be.rejectedWith('NoPermission');109 expect(await helpers.methods.sponsoringEnabled(flipper.options.address).call()).to.be.false;110 });111 112 itWeb3('Sponsor can be set by the address that deployed the contract', async ({api, web3, privateKeyWrapper}) => {113 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);114 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);115 const flipper = await deployFlipper(web3, owner);116 const helpers = contractHelpers(web3, owner);117 expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.false;118 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;119 expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.true;120 });121 122 itWeb3('Set sponsor event', async ({api, web3, privateKeyWrapper}) => {123 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);124 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);125 const flipper = await deployFlipper(web3, owner);126 const helpers = contractHelpers(web3, owner);127 128 const result = await helpers.methods.setSponsor(flipper.options.address, sponsor).send();129 const events = normalizeEvents(result.events);130 expect(events).to.be.deep.equal([131 {132 address: flipper.options.address,133 event: 'ContractSponsorSet',134 args: {135 contractAddress: flipper.options.address,136 sponsor: sponsor,137 },138 },139 ]);140141 await expectSubstrateEventsAtBlock(142 api, 143 result.blockNumber,144 'evmContractHelpers',145 ['ContractSponsorSet'],146 );147 });148 149 itWeb3('Sponsor can not be set by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {150 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);151 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);152 const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);153 const flipper = await deployFlipper(web3, owner);154 const helpers = contractHelpers(web3, owner);155 expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.false;156 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).call({from: notOwner})).to.be.rejectedWith('NoPermission');157 expect(await helpers.methods.hasPendingSponsor(flipper.options.address).call()).to.be.false;158 });159160 itWeb3('Sponsorship can be confirmed by the address that pending as sponsor', async ({api, web3, privateKeyWrapper}) => {161 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);162 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);163 const flipper = await deployFlipper(web3, owner);164 const helpers = contractHelpers(web3, owner);165 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;166 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;167 await expect(helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor})).to.be.not.rejected;168 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;169 });170171 itWeb3('Confirm sponsorship event', async ({api, web3, privateKeyWrapper}) => {172 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);173 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);174 const flipper = await deployFlipper(web3, owner);175 const helpers = contractHelpers(web3, owner);176 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;177 const result = await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});178 const events = normalizeEvents(result.events);179 expect(events).to.be.deep.equal([180 {181 address: flipper.options.address,182 event: 'ContractSponsorshipConfirmed',183 args: {184 contractAddress: flipper.options.address,185 sponsor: sponsor,186 },187 },188 ]);189190 await expectSubstrateEventsAtBlock(191 api, 192 result.blockNumber,193 'evmContractHelpers',194 ['ContractSponsorshipConfirmed'],195 );196 });197198 itWeb3('Sponsorship can not be confirmed by the address that not pending as sponsor', async ({api, web3, privateKeyWrapper}) => {199 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);200 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);201 const notSponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);202 const flipper = await deployFlipper(web3, owner);203 const helpers = contractHelpers(web3, owner);204 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;205 await expect(helpers.methods.setSponsor(flipper.options.address, sponsor).send()).to.be.not.rejected;206 await expect(helpers.methods.confirmSponsorship(flipper.options.address).call({from: notSponsor})).to.be.rejectedWith('NoPermission');207 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;208 });209210 itWeb3('Sponsorship can not be confirmed by the address that not set as sponsor', async ({api, web3, privateKeyWrapper}) => {211 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);212 const notSponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);213 const flipper = await deployFlipper(web3, owner);214 const helpers = contractHelpers(web3, owner);215 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;216 await expect(helpers.methods.confirmSponsorship(flipper.options.address).call({from: notSponsor})).to.be.rejectedWith('NoPendingSponsor');217 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;218 });219220 itWeb3('Get self sponsored sponsor', async ({api, web3, privateKeyWrapper}) => {221 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);222 const flipper = await deployFlipper(web3, owner);223 const helpers = contractHelpers(web3, owner);224 await helpers.methods.selfSponsoredEnable(flipper.options.address).send();225 226 const result = await helpers.methods.getSponsor(flipper.options.address).call();227228 expect(result[0]).to.be.eq(flipper.options.address);229 expect(result[1]).to.be.eq('0');230 });231232 itWeb3('Get confirmed sponsor', async ({api, web3, privateKeyWrapper}) => {233 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);234 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);235 const flipper = await deployFlipper(web3, owner);236 const helpers = contractHelpers(web3, owner);237 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();238 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});239 240 const result = await helpers.methods.getSponsor(flipper.options.address).call();241242 expect(result[0]).to.be.eq(sponsor);243 expect(result[1]).to.be.eq('0');244 });245246 itWeb3('Sponsor can be removed by the address that deployed the contract', async ({api, web3, privateKeyWrapper}) => {247 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);248 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);249 const flipper = await deployFlipper(web3, owner);250 const helpers = contractHelpers(web3, owner);251252 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;253 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();254 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});255 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;256 257 await helpers.methods.removeSponsor(flipper.options.address).send();258 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;259 });260261 itWeb3('Remove sponsor event', async ({api, web3, privateKeyWrapper}) => {262 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);263 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);264 const flipper = await deployFlipper(web3, owner);265 const helpers = contractHelpers(web3, owner);266267 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();268 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});269 270 const result = await helpers.methods.removeSponsor(flipper.options.address).send();271 const events = normalizeEvents(result.events);272 expect(events).to.be.deep.equal([273 {274 address: flipper.options.address,275 event: 'ContractSponsorRemoved',276 args: {277 contractAddress: flipper.options.address,278 },279 },280 ]);281282 await expectSubstrateEventsAtBlock(283 api, 284 result.blockNumber,285 'evmContractHelpers',286 ['ContractSponsorRemoved'],287 );288 });289290 itWeb3('Sponsor can not be removed by the address that did not deployed the contract', async ({api, web3, privateKeyWrapper}) => {291 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);292 const notOwner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);293 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);294 const flipper = await deployFlipper(web3, owner);295 const helpers = contractHelpers(web3, owner);296297 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.false;298 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();299 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});300 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;301 302 await expect(helpers.methods.removeSponsor(flipper.options.address).call({from: notOwner})).to.be.rejectedWith('NoPermission');303 expect(await helpers.methods.hasSponsor(flipper.options.address).call()).to.be.true;304 });305306 itWeb3('In generous mode, non-allowlisted user transaction will be sponsored', async ({api, web3, privateKeyWrapper}) => {307 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);308 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);309 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);310311 const flipper = await deployFlipper(web3, owner);312313 const helpers = contractHelpers(web3, owner);314315 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();316 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});317318 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: owner});319 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});320321 const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);322 const callerBalanceBefore = await ethBalanceViaSub(api, caller);323324 await flipper.methods.flip().send({from: caller});325 expect(await flipper.methods.getValue().call()).to.be.true;326327 // Balance should be taken from sponsor instead of caller328 const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);329 const callerBalanceAfter = await ethBalanceViaSub(api, caller);330 expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;331 expect(callerBalanceAfter).to.be.eq(callerBalanceBefore);332 });333334 itWeb3('In generous mode, non-allowlisted user transaction will be self sponsored', async ({api, web3, privateKeyWrapper}) => {335 const alice = privateKeyWrapper('//Alice');336337 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);338 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);339340 const flipper = await deployFlipper(web3, owner);341342 const helpers = contractHelpers(web3, owner);343344 await helpers.methods.selfSponsoredEnable(flipper.options.address).send();345346 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Generous).send({from: owner});347 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});348349 await transferBalanceToEth(api, alice, flipper.options.address);350351 const contractBalanceBefore = await ethBalanceViaSub(api, flipper.options.address);352 const callerBalanceBefore = await ethBalanceViaSub(api, caller);353354 await flipper.methods.flip().send({from: caller});355 expect(await flipper.methods.getValue().call()).to.be.true;356357 // Balance should be taken from sponsor instead of caller358 const contractBalanceAfter = await ethBalanceViaSub(api, flipper.options.address);359 const callerBalanceAfter = await ethBalanceViaSub(api, caller);360 expect(contractBalanceAfter < contractBalanceBefore).to.be.true;361 expect(callerBalanceAfter).to.be.eq(callerBalanceBefore);362 });363364 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, privateKeyWrapper}) => {365 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);366 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);367 const caller = createEthAccount(web3);368369 const flipper = await deployFlipper(web3, owner);370371 const helpers = contractHelpers(web3, owner);372 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});373 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});374375 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});376 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});377378 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();379 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});380381 const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);382 expect(sponsorBalanceBefore).to.be.not.equal('0');383384 await flipper.methods.flip().send({from: caller});385 expect(await flipper.methods.getValue().call()).to.be.true;386387 // Balance should be taken from flipper instead of caller388 const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);389 expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;390 });391392 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, privateKeyWrapper}) => {393 const alice = privateKeyWrapper('//Alice');394395 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);396 const caller = createEthAccount(web3);397398 const flipper = await deployFlipper(web3, owner);399400 const helpers = contractHelpers(web3, owner);401402 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});403 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});404405 await transferBalanceToEth(api, alice, flipper.options.address);406407 const originalFlipperBalance = await web3.eth.getBalance(flipper.options.address);408 expect(originalFlipperBalance).to.be.not.equal('0');409410 await expect(flipper.methods.flip().send({from: caller})).to.be.rejectedWith(/InvalidTransaction::Payment/);411 expect(await flipper.methods.getValue().call()).to.be.false;412413 // Balance should be taken from flipper instead of caller414 const balanceAfter = await web3.eth.getBalance(flipper.options.address);415 expect(+balanceAfter).to.be.equals(+originalFlipperBalance);416 });417418 itWeb3('Sponsoring is set, an address that has UNQ can send a transaction and it works. User balance should not change', async ({api, web3, privateKeyWrapper}) => {419 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);420 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);421 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);422423 const flipper = await deployFlipper(web3, owner);424425 const helpers = contractHelpers(web3, owner);426 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});427 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});428429 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});430 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 0).send({from: owner});431432 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();433 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});434435 const sponsorBalanceBefore = await ethBalanceViaSub(api, sponsor);436 const callerBalanceBefore = await ethBalanceViaSub(api, caller);437438 await flipper.methods.flip().send({from: caller});439 expect(await flipper.methods.getValue().call()).to.be.true;440441 const sponsorBalanceAfter = await ethBalanceViaSub(api, sponsor);442 const callerBalanceAfter = await ethBalanceViaSub(api, caller);443 expect(sponsorBalanceAfter < sponsorBalanceBefore).to.be.true;444 expect(callerBalanceAfter).to.be.equals(callerBalanceBefore);445 });446447 itWeb3('Sponsoring is limited, with setContractRateLimit. The limitation is working if transactions are sent more often, the sender pays the commission.', async ({api, web3, privateKeyWrapper}) => {448 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);449 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);450 const caller = await createEthAccountWithBalance(api, web3, privateKeyWrapper);451 const originalCallerBalance = await web3.eth.getBalance(caller);452453 const flipper = await deployFlipper(web3, owner);454455 const helpers = contractHelpers(web3, owner);456 await helpers.methods.toggleAllowlist(flipper.options.address, true).send({from: owner});457 await helpers.methods.toggleAllowed(flipper.options.address, caller, true).send({from: owner});458459 await helpers.methods.setSponsoringMode(flipper.options.address, SponsoringMode.Allowlisted).send({from: owner});460 await helpers.methods.setSponsoringRateLimit(flipper.options.address, 10).send({from: owner});461462 await helpers.methods.setSponsor(flipper.options.address, sponsor).send();463 await helpers.methods.confirmSponsorship(flipper.options.address).send({from: sponsor});464465 const originalFlipperBalance = await web3.eth.getBalance(sponsor);466 expect(originalFlipperBalance).to.be.not.equal('0');467468 await flipper.methods.flip().send({from: caller});469 expect(await flipper.methods.getValue().call()).to.be.true;470 expect(await web3.eth.getBalance(caller)).to.be.equals(originalCallerBalance);471472 const newFlipperBalance = await web3.eth.getBalance(sponsor);473 expect(newFlipperBalance).to.be.not.equals(originalFlipperBalance);474475 await flipper.methods.flip().send({from: caller});476 expect(await web3.eth.getBalance(sponsor)).to.be.equal(newFlipperBalance);477 expect(await web3.eth.getBalance(caller)).to.be.not.equals(originalCallerBalance);478 });479480 // TODO: Find a way to calculate default rate limit481 itWeb3('Default rate limit equals 7200', async ({api, web3, privateKeyWrapper}) => {482 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);483 const flipper = await deployFlipper(web3, owner);484 const helpers = contractHelpers(web3, owner);485 expect(await helpers.methods.getSponsoringRateLimit(flipper.options.address).call()).to.be.equals('7200');486 });487});488489describe('Sponsoring Fee Limit', () => {490491 let testContract: CompiledContract;492 493 function compileTestContract() {494 if (!testContract) {495 const input = {496 language: 'Solidity',497 sources: {498 ['TestContract.sol']: {499 content:500 `501 // SPDX-License-Identifier: MIT502 pragma solidity ^0.8.0;503 504 contract TestContract {505 event Result(bool);506 function test1() public {507 uint256 counter = 0;508 while(true) {509 counter ++;510 }511 emit Result(true);512 }513514 function test2() public {515 uint256 counter = 0;516 while(true) {517 counter ++;518 if (counter > 1){519 break;520 }521 }522 emit Result(true);523 }524 }525 `,526 },527 },528 settings: {529 outputSelection: {530 '*': {531 '*': ['*'],532 },533 },534 },535 };536 const json = JSON.parse(solc.compile(JSON.stringify(input)));537 const out = json.contracts['TestContract.sol']['TestContract'];538 539 testContract = {540 abi: out.abi,541 object: '0x' + out.evm.bytecode.object,542 };543 }544 return testContract;545 }546 547 async function deployTestContract(web3: Web3, owner: string) {548 const compiled = compileTestContract();549 const testContract = new web3.eth.Contract(compiled.abi, undefined, {550 data: compiled.object,551 from: owner,552 ...GAS_ARGS,553 });554 return await testContract.deploy({data: compiled.object}).send({from: owner});555 }556557 itWeb3('Default fee limit', async ({api, web3, privateKeyWrapper}) => {558 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);559 const flipper = await deployFlipper(web3, owner);560 const helpers = contractHelpers(web3, owner);561 expect(await helpers.methods.getSponsoringFeeLimit(flipper.options.address).call()).to.be.equals('115792089237316195423570985008687907853269984665640564039457584007913129639935');562 });563564 itWeb3('Set fee limit', async ({api, web3, privateKeyWrapper}) => {565 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);566 const flipper = await deployFlipper(web3, owner);567 const helpers = contractHelpers(web3, owner);568 await helpers.methods.setSponsoringFeeLimit(flipper.options.address, 100).send();569 expect(await helpers.methods.getSponsoringFeeLimit(flipper.options.address).call()).to.be.equals('100');570 });571572 itWeb3('Negative test - set fee limit by non-owner', async ({api, web3, privateKeyWrapper}) => {573 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);574 const stranger = await createEthAccountWithBalance(api, web3, privateKeyWrapper);575 const flipper = await deployFlipper(web3, owner);576 const helpers = contractHelpers(web3, owner);577 await expect(helpers.methods.setSponsoringFeeLimit(flipper.options.address, 100).send({from: stranger})).to.be.rejected;578 });579580 itWeb3('Negative test - check that eth transactions exceeding fee limit are not executed', async ({api, web3, privateKeyWrapper}) => {581 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);582 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);583 const user = await createEthAccountWithBalance(api, web3, privateKeyWrapper);584585 const testContract = await deployTestContract(web3, owner);586 const helpers = contractHelpers(web3, owner);587 588 await helpers.methods.setSponsoringMode(testContract.options.address, SponsoringMode.Generous).send({from: owner});589 await helpers.methods.setSponsoringRateLimit(testContract.options.address, 0).send({from: owner});590 591 await helpers.methods.setSponsor(testContract.options.address, sponsor).send();592 await helpers.methods.confirmSponsorship(testContract.options.address).send({from: sponsor});593594 const gasPrice = BigInt(await web3.eth.getGasPrice());595596 await helpers.methods.setSponsoringFeeLimit(testContract.options.address, 30000n * gasPrice).send();597598 const originalUserBalance = await web3.eth.getBalance(user);599 await testContract.methods.test2().send({from: user, gas: 30000});600 expect(await web3.eth.getBalance(user)).to.be.equal(originalUserBalance);601602 await testContract.methods.test2().send({from: user, gas: 40000});603 expect(await web3.eth.getBalance(user)).to.not.be.equal(originalUserBalance);604 });605606 itWeb3('Negative test - check that evm.call transactions exceeding fee limit are not executed', async ({api, web3, privateKeyWrapper}) => {607 const sponsor = await createEthAccountWithBalance(api, web3, privateKeyWrapper);608 const owner = await createEthAccountWithBalance(api, web3, privateKeyWrapper);609610 const testContract = await deployTestContract(web3, owner);611 const helpers = contractHelpers(web3, owner);612 613 await helpers.methods.setSponsoringMode(testContract.options.address, SponsoringMode.Generous).send({from: owner});614 await helpers.methods.setSponsoringRateLimit(testContract.options.address, 0).send({from: owner});615 616 await helpers.methods.setSponsor(testContract.options.address, sponsor).send();617 await helpers.methods.confirmSponsorship(testContract.options.address).send({from: sponsor});618619 const gasPrice = BigInt(await web3.eth.getGasPrice());620621 await helpers.methods.setSponsoringFeeLimit(testContract.options.address, 30000n * gasPrice).send();622623 const alice = privateKeyWrapper('//Alice');624 const originalAliceBalance = (await api.query.system.account(alice.address)).data.free.toBigInt();625 626 await submitTransactionAsync(627 alice,628 api.tx.evm.call(629 subToEth(alice.address),630 testContract.options.address,631 testContract.methods.test2().encodeABI(),632 Uint8Array.from([]),633 30000n,634 gasPrice,635 null,636 null,637 [],638 ),639 );640 expect((await api.query.system.account(alice.address)).data.free.toBigInt()).to.be.equal(originalAliceBalance);641 642 await submitTransactionAsync(643 alice,644 api.tx.evm.call(645 subToEth(alice.address),646 testContract.options.address,647 testContract.methods.test2().encodeABI(),648 Uint8Array.from([]),649 40000n,650 gasPrice,651 null,652 null,653 [],654 ),655 );656 expect((await api.query.system.account(alice.address)).data.free.toBigInt()).to.not.be.equal(originalAliceBalance);657 });658});tests/src/eth/util/contractHelpersAbi.jsondiffbeforeafterboth--- a/tests/src/eth/util/contractHelpersAbi.json
+++ b/tests/src/eth/util/contractHelpersAbi.json
@@ -135,7 +135,7 @@
}
],
"name": "getSponsoringFeeLimit",
- "outputs": [{ "internalType": "uint128", "name": "", "type": "uint128" }],
+ "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
"stateMutability": "view",
"type": "function"
},
@@ -225,7 +225,7 @@
"name": "contractAddress",
"type": "address"
},
- { "internalType": "uint128", "name": "feeLimit", "type": "uint128" }
+ { "internalType": "uint256", "name": "feeLimit", "type": "uint256" }
],
"name": "setSponsoringFeeLimit",
"outputs": [],