difftreelog
Support sponsoring from frontier
in: master
9 files changed
.gitignorediffbeforeafterboth--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
*store_key*.json
/.idea/
+/.cargo/
tests/.vscode
cumulus-parachain/
Cargo.lockdiffbeforeafterboth--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6146,6 +6146,7 @@
"sp-core",
"sp-runtime",
"sp-std",
+ "up-evm-mapping",
"up-sponsorship",
]
pallets/common/src/account.rsdiffbeforeafterboth--- a/pallets/common/src/account.rs
+++ b/pallets/common/src/account.rs
@@ -23,6 +23,7 @@
use pallet_evm::AddressMapping;
use sp_std::vec::Vec;
use sp_std::clone::Clone;
+
pub use up_evm_mapping::EvmBackwardsAddressMapping;
pub trait CrossAccountId<AccountId>:
pallets/evm-contract-helpers/Cargo.tomldiffbeforeafterboth--- a/pallets/evm-contract-helpers/Cargo.toml
+++ b/pallets/evm-contract-helpers/Cargo.toml
@@ -17,6 +17,7 @@
pallet-evm-coder-substrate = { default-features = false, path = '../../pallets/evm-coder-substrate' }
pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.18" }
up-sponsorship = { version = "0.1.0", default-features = false, git = "https://github.com/UniqueNetwork/pallet-sponsoring", branch = 'polkadot-v0.9.18' }
+up-evm-mapping = { default-features = false, path = "../../primitives/evm-mapping" }
log = "0.4.14"
[dependencies.codec]
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};19use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};20use pallet_evm::{ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure};21use sp_core::H160;22use crate::{23 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,24};25use frame_support::traits::Get;26use up_sponsorship::SponsorshipHandler;27use sp_std::{convert::TryInto, vec::Vec};2829struct ContractHelpers<T: Config>(SubstrateRecorder<T>);30impl<T: Config> WithRecorder<T> for ContractHelpers<T> {31 fn recorder(&self) -> &SubstrateRecorder<T> {32 &self.033 }3435 fn into_recorder(self) -> SubstrateRecorder<T> {36 self.037 }38}3940#[solidity_interface(name = "ContractHelpers")]41impl<T: Config> ContractHelpers<T> {42 fn contract_owner(&self, contract_address: address) -> Result<address> {43 Ok(<Owner<T>>::get(contract_address))44 }4546 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {47 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)48 }4950 /// Deprecated51 fn toggle_sponsoring(52 &mut self,53 caller: caller,54 contract_address: address,55 enabled: bool,56 ) -> Result<void> {57 <Pallet<T>>::ensure_owner(contract_address, caller)?;58 <Pallet<T>>::toggle_sponsoring(contract_address, enabled);59 Ok(())60 }6162 fn set_sponsoring_mode(63 &mut self,64 caller: caller,65 contract_address: address,66 mode: uint8,67 ) -> Result<void> {68 <Pallet<T>>::ensure_owner(contract_address, caller)?;69 let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;70 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);71 Ok(())72 }7374 fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {75 Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())76 }7778 fn set_sponsoring_rate_limit(79 &mut self,80 caller: caller,81 contract_address: address,82 rate_limit: uint32,83 ) -> Result<void> {84 <Pallet<T>>::ensure_owner(contract_address, caller)?;85 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());86 Ok(())87 }8889 fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {90 Ok(<SponsoringRateLimit<T>>::get(contract_address)91 .try_into()92 .map_err(|_| "rate limit > u32::MAX")?)93 }9495 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {96 self.0.consume_sload()?;97 Ok(<Pallet<T>>::allowed(contract_address, user))98 }99100 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {101 Ok(<AllowlistEnabled<T>>::get(contract_address))102 }103104 fn toggle_allowlist(105 &mut self,106 caller: caller,107 contract_address: address,108 enabled: bool,109 ) -> Result<void> {110 <Pallet<T>>::ensure_owner(contract_address, caller)?;111 <Pallet<T>>::toggle_allowlist(contract_address, enabled);112 Ok(())113 }114115 fn toggle_allowed(116 &mut self,117 caller: caller,118 contract_address: address,119 user: address,120 allowed: bool,121 ) -> Result<void> {122 <Pallet<T>>::ensure_owner(contract_address, caller)?;123 <Pallet<T>>::toggle_allowed(contract_address, user, allowed);124 Ok(())125 }126}127128pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);129impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {130 fn is_reserved(contract: &sp_core::H160) -> bool {131 contract == &T::ContractAddress::get()132 }133134 fn is_used(contract: &sp_core::H160) -> bool {135 contract == &T::ContractAddress::get()136 }137138 fn call(139 source: &sp_core::H160,140 target: &sp_core::H160,141 gas_left: u64,142 input: &[u8],143 value: sp_core::U256,144 ) -> Option<PrecompileResult> {145 // TODO: Extract to another OnMethodCall handler146 if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {147 return Some(Err(PrecompileFailure::Revert {148 exit_status: ExitRevert::Reverted,149 cost: 0,150 output: {151 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));152 writer.string("Target contract is allowlisted");153 writer.finish()154 },155 }));156 }157158 if target != &T::ContractAddress::get() {159 return None;160 }161162 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));163 pallet_evm_coder_substrate::call(*source, helpers, value, input)164 }165166 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {167 (contract == &T::ContractAddress::get())168 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())169 }170}171172pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);173impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {174 fn on_create(owner: H160, contract: H160) {175 <Owner<T>>::insert(contract, owner);176 }177}178179pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);180impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {181 fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {182 let mode = <Pallet<T>>::sponsoring_mode(call.0);183 if mode == SponsoringModeT::Disabled {184 return None;185 }186 if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who) {187 return None;188 }189 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;190191 if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {192 let limit = <SponsoringRateLimit<T>>::get(&call.0);193194 let timeout = last_tx_block + limit;195 if block_number < timeout {196 return None;197 }198 }199200 <SponsorBasket<T>>::insert(&call.0, who, block_number);201202 Some(call.0)203 }204}205206generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);207generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617use core::marker::PhantomData;18use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};19use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};20use pallet_evm::{21 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, AddressMapping22};23use sp_core::H160;24use crate::{25 AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,26};27use frame_support::traits::Get;28use up_sponsorship::SponsorshipHandler;29use up_evm_mapping::EvmBackwardsAddressMapping;30use sp_std::vec::Vec;3132struct ContractHelpers<T: Config>(SubstrateRecorder<T>);33impl<T: Config> WithRecorder<T> for ContractHelpers<T> {34 fn recorder(&self) -> &SubstrateRecorder<T> {35 &self.036 }3738 fn into_recorder(self) -> SubstrateRecorder<T> {39 self.040 }41}4243#[solidity_interface(name = "ContractHelpers")]44impl<T: Config> ContractHelpers<T> {45 fn contract_owner(&self, contract_address: address) -> Result<address> {46 Ok(<Owner<T>>::get(contract_address))47 }4849 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {50 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)51 }5253 /// Deprecated54 fn toggle_sponsoring(55 &mut self,56 caller: caller,57 contract_address: address,58 enabled: bool,59 ) -> Result<void> {60 <Pallet<T>>::ensure_owner(contract_address, caller)?;61 <Pallet<T>>::toggle_sponsoring(contract_address, enabled);62 Ok(())63 }6465 fn set_sponsoring_mode(66 &mut self,67 caller: caller,68 contract_address: address,69 mode: uint8,70 ) -> Result<void> {71 <Pallet<T>>::ensure_owner(contract_address, caller)?;72 let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;73 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);74 Ok(())75 }7677 fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {78 Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())79 }8081 fn set_sponsoring_rate_limit(82 &mut self,83 caller: caller,84 contract_address: address,85 rate_limit: uint32,86 ) -> Result<void> {87 <Pallet<T>>::ensure_owner(contract_address, caller)?;88 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());89 Ok(())90 }9192 fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {93 Ok(<SponsoringRateLimit<T>>::get(contract_address)94 .try_into()95 .map_err(|_| "rate limit > u32::MAX")?)96 }9798 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {99 self.0.consume_sload()?;100 Ok(<Pallet<T>>::allowed(contract_address, user))101 }102103 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {104 Ok(<AllowlistEnabled<T>>::get(contract_address))105 }106107 fn toggle_allowlist(108 &mut self,109 caller: caller,110 contract_address: address,111 enabled: bool,112 ) -> Result<void> {113 <Pallet<T>>::ensure_owner(contract_address, caller)?;114 <Pallet<T>>::toggle_allowlist(contract_address, enabled);115 Ok(())116 }117118 fn toggle_allowed(119 &mut self,120 caller: caller,121 contract_address: address,122 user: address,123 allowed: bool,124 ) -> Result<void> {125 <Pallet<T>>::ensure_owner(contract_address, caller)?;126 <Pallet<T>>::toggle_allowed(contract_address, user, allowed);127 Ok(())128 }129}130131pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);132impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {133 fn is_reserved(contract: &sp_core::H160) -> bool {134 contract == &T::ContractAddress::get()135 }136137 fn is_used(contract: &sp_core::H160) -> bool {138 contract == &T::ContractAddress::get()139 }140141 fn call(142 source: &sp_core::H160,143 target: &sp_core::H160,144 gas_left: u64,145 input: &[u8],146 value: sp_core::U256,147 ) -> Option<PrecompileResult> {148 // TODO: Extract to another OnMethodCall handler149 if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {150 return Some(Err(PrecompileFailure::Revert {151 exit_status: ExitRevert::Reverted,152 cost: 0,153 output: {154 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));155 writer.string("Target contract is allowlisted");156 writer.finish()157 },158 }));159 }160161 if target != &T::ContractAddress::get() {162 return None;163 }164165 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));166 pallet_evm_coder_substrate::call(*source, helpers, value, input)167 }168169 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {170 (contract == &T::ContractAddress::get())171 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())172 }173}174175pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);176impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {177 fn on_create(owner: H160, contract: H160) {178 <Owner<T>>::insert(contract, owner);179 }180}181182pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);183impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {184 fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {185 let mode = <Pallet<T>>::sponsoring_mode(call.0);186 if mode == SponsoringModeT::Disabled {187 return None;188 }189190 let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());191 if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, who) {192 return None;193 }194 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;195196 if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who) {197 let limit = <SponsoringRateLimit<T>>::get(&call.0);198199 let timeout = last_tx_block + limit;200 if block_number < timeout {201 return None;202 }203 }204205 <SponsorBasket<T>>::insert(&call.0, who, block_number);206207 let sponsor = T::EvmAddressMapping::into_account_id(call.0);208 Some(sponsor)209 }210}211212generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);213generate_stubgen!(contract_helpers_iface, ContractHelpersCall<()>, false);pallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -33,6 +33,8 @@
pub trait Config: frame_system::Config + pallet_evm_coder_substrate::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
@@ -36,7 +36,7 @@
#[pallet::config]
pub trait Config: frame_system::Config {
- type EvmSponsorshipHandler: SponsorshipHandler<H160, (H160, Vec<u8>)>;
+ type EvmSponsorshipHandler: SponsorshipHandler<Self::AccountId, (H160, Vec<u8>)>;
type Currency: Currency<Self::AccountId>;
type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping<Self::AccountId>;
type EvmAddressMapping: AddressMapping<Self::AccountId>;
@@ -60,14 +60,15 @@
}
pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);
-impl<T: Config> fp_evm::TransactionValidityHack for TransactionValidityHack<T> {
- fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<H160> {
+impl<T: Config> fp_evm::TransactionValidityHack<T::AccountId> for TransactionValidityHack<T> {
+ fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::AccountId> {
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);
TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(
- &origin,
+ &origin_sub,
&(*target, input.clone()),
))
})
@@ -85,33 +86,36 @@
type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;
fn withdraw_fee(
- who: &H160,
+ who: &T::AccountId,
reason: WithdrawReason,
fee: U256,
) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
- let mut who_pays_fee = *who;
+ let mut who_pays_fee = who.clone();
if let WithdrawReason::Call { target, input } = &reason {
who_pays_fee = T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))
.unwrap_or(who_pays_fee);
}
+
let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(
&who_pays_fee,
reason,
fee,
)?;
+
+ let who_pays_fee_eth = T::EvmBackwardsAddressMapping::from_account_id(who_pays_fee);
Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {
- who: who_pays_fee,
+ who: who_pays_fee_eth,
negative_imbalance: i,
}))
}
fn correct_and_deposit_fee(
- who: &H160,
+ who: &T::AccountId,
corrected_fee: U256,
already_withdrawn: Self::LiquidityInfo,
) {
<EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::correct_and_deposit_fee(
- &already_withdrawn.as_ref().map(|e| e.who).unwrap_or(*who),
+ &already_withdrawn.as_ref().map(|e| T::EvmAddressMapping::into_account_id(e.who)).unwrap_or(who.clone()),
corrected_fee,
already_withdrawn.map(|e| e.negative_imbalance),
)
@@ -142,7 +146,6 @@
<frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),
)
.ok()?;
- let who = T::EvmBackwardsAddressMapping::from_account_id(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(|| {
@@ -151,7 +154,6 @@
&(*target, input.clone()),
))
})?;
- let sponsor = T::EvmAddressMapping::into_account_id(sponsor);
Some(sponsor)
}
_ => None,
pallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -32,14 +32,12 @@
use pallet_fungible::erc::{UniqueFungibleCall, ERC20Call};
pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
- fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {
+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> {
let collection_id = map_eth_to_id(&call.0)?;
let collection = <CollectionHandle<T>>::new(collection_id)?;
let sponsor = collection.sponsorship.sponsor()?.clone();
- let sponsor =
- <T as pallet_common::Config>::EvmBackwardsAddressMapping::from_account_id(sponsor);
- let who = T::CrossAccountId::from_eth(*who);
+ let who = T::CrossAccountId::from_sub(who.clone());
let (method_id, mut reader) = AbiReader::new_call(&call.1).ok()?;
match &collection.mode {
crate::CollectionMode::NFT => {
runtime/opal/src/lib.rsdiffbeforeafterboth--- a/runtime/opal/src/lib.rs
+++ b/runtime/opal/src/lib.rs
@@ -933,6 +933,8 @@
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!(