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.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -17,14 +17,17 @@
use core::marker::PhantomData;
use evm_coder::{abi::AbiWriter, execution::Result, generate_stubgen, solidity_interface, types::*};
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
-use pallet_evm::{ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure};
+use pallet_evm::{
+ ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, AddressMapping
+};
use sp_core::H160;
use crate::{
AllowlistEnabled, Config, Owner, Pallet, SponsorBasket, SponsoringRateLimit, SponsoringModeT,
};
use frame_support::traits::Get;
use up_sponsorship::SponsorshipHandler;
-use sp_std::{convert::TryInto, vec::Vec};
+use up_evm_mapping::EvmBackwardsAddressMapping;
+use sp_std::vec::Vec;
struct ContractHelpers<T: Config>(SubstrateRecorder<T>);
impl<T: Config> WithRecorder<T> for ContractHelpers<T> {
@@ -177,13 +180,15 @@
}
pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<H160, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
- fn get_sponsor(who: &H160, call: &(H160, Vec<u8>)) -> Option<H160> {
+impl<T: Config> SponsorshipHandler<T::AccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
+ fn get_sponsor(who: &T::AccountId, call: &(H160, Vec<u8>)) -> Option<T::AccountId> {
let mode = <Pallet<T>>::sponsoring_mode(call.0);
if mode == SponsoringModeT::Disabled {
return None;
}
- if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who) {
+
+ let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());
+ if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, who) {
return None;
}
let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;
@@ -199,7 +204,8 @@
<SponsorBasket<T>>::insert(&call.0, who, block_number);
- Some(call.0)
+ let sponsor = T::EvmAddressMapping::into_account_id(call.0);
+ Some(sponsor)
}
}
pallets/evm-contract-helpers/src/lib.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/lib.rs
+++ b/pallets/evm-contract-helpers/src/lib.rs
@@ -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.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use core::marker::PhantomData;20use fp_evm::WithdrawReason;21use frame_support::traits::{Currency, IsSubType};22pub use pallet::*;23use pallet_evm::{EVMCurrencyAdapter, EnsureAddressOrigin};24use sp_core::{H160, U256};25use sp_runtime::TransactionOutcome;26use up_sponsorship::SponsorshipHandler;27use up_evm_mapping::EvmBackwardsAddressMapping;28use pallet_evm::AddressMapping;2930#[frame_support::pallet]31pub mod pallet {32 use super::*;3334 use frame_support::traits::Currency;35 use sp_std::vec::Vec;3637 #[pallet::config]38 pub trait Config: frame_system::Config {39 type EvmSponsorshipHandler: SponsorshipHandler<H160, (H160, Vec<u8>)>;40 type Currency: Currency<Self::AccountId>;41 type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping<Self::AccountId>;42 type EvmAddressMapping: AddressMapping<Self::AccountId>;43 }4445 #[pallet::pallet]46 #[pallet::generate_store(pub(super) trait Store)]47 pub struct Pallet<T>(_);48}4950type NegativeImbalanceOf<C, T> =51 <C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;5253pub struct ChargeEvmLiquidityInfo<T>54where55 T: Config,56 T: pallet_evm::Config,57{58 who: H160,59 negative_imbalance: NegativeImbalanceOf<<T as Config>::Currency, T>,60}6162pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);63impl<T: Config> fp_evm::TransactionValidityHack for TransactionValidityHack<T> {64 fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<H160> {65 match reason {66 WithdrawReason::Call { target, input } => {67 // This method is only used for checking, we shouldn't touch storage in it68 frame_support::storage::with_transaction(|| {69 TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(70 &origin,71 &(*target, input.clone()),72 ))73 })74 }75 _ => None,76 }77 }78}79pub struct OnChargeTransaction<T: Config>(PhantomData<*const T>);80impl<T> pallet_evm::OnChargeEVMTransaction<T> for OnChargeTransaction<T>81where82 T: Config,83 T: pallet_evm::Config,84{85 type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;8687 fn withdraw_fee(88 who: &H160,89 reason: WithdrawReason,90 fee: U256,91 ) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {92 let mut who_pays_fee = *who;93 if let WithdrawReason::Call { target, input } = &reason {94 who_pays_fee = T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))95 .unwrap_or(who_pays_fee);96 }97 let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(98 &who_pays_fee,99 reason,100 fee,101 )?;102 Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {103 who: who_pays_fee,104 negative_imbalance: i,105 }))106 }107108 fn correct_and_deposit_fee(109 who: &H160,110 corrected_fee: U256,111 already_withdrawn: Self::LiquidityInfo,112 ) {113 <EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::correct_and_deposit_fee(114 &already_withdrawn.as_ref().map(|e| e.who).unwrap_or(*who),115 corrected_fee,116 already_withdrawn.map(|e| e.negative_imbalance),117 )118 }119120 fn pay_priority_fee(tip: U256) {121 <EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::pay_priority_fee(tip)122 }123}124125/// Implements sponsoring for evm calls performed from pallet-evm (via api.tx.ethereum.transact/api.tx.evm.call)126pub struct BridgeSponsorshipHandler<T>(PhantomData<T>);127impl<T, C> SponsorshipHandler<T::AccountId, C> for BridgeSponsorshipHandler<T>128where129 T: Config + pallet_evm::Config,130 C: IsSubType<pallet_evm::Call<T>>,131{132 fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {133 match call.is_sub_type()? {134 pallet_evm::Call::call {135 source,136 target,137 input,138 ..139 } => {140 let _ = T::CallOrigin::ensure_address_origin(141 source,142 <frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),143 )144 .ok()?;145 let who = T::EvmBackwardsAddressMapping::from_account_id(who.clone());146 // Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner147 // TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?148 let sponsor = frame_support::storage::with_transaction(|| {149 TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(150 &who,151 &(*target, input.clone()),152 ))153 })?;154 let sponsor = T::EvmAddressMapping::into_account_id(sponsor);155 Some(sponsor)156 }157 _ => None,158 }159 }160}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/>.1617#![cfg_attr(not(feature = "std"), no_std)]1819use core::marker::PhantomData;20use fp_evm::WithdrawReason;21use frame_support::traits::{Currency, IsSubType};22pub use pallet::*;23use pallet_evm::{EVMCurrencyAdapter, EnsureAddressOrigin};24use sp_core::{H160, U256};25use sp_runtime::TransactionOutcome;26use up_sponsorship::SponsorshipHandler;27use up_evm_mapping::EvmBackwardsAddressMapping;28use pallet_evm::AddressMapping;2930#[frame_support::pallet]31pub mod pallet {32 use super::*;3334 use frame_support::traits::Currency;35 use sp_std::vec::Vec;3637 #[pallet::config]38 pub trait Config: frame_system::Config {39 type EvmSponsorshipHandler: SponsorshipHandler<Self::AccountId, (H160, Vec<u8>)>;40 type Currency: Currency<Self::AccountId>;41 type EvmBackwardsAddressMapping: EvmBackwardsAddressMapping<Self::AccountId>;42 type EvmAddressMapping: AddressMapping<Self::AccountId>;43 }4445 #[pallet::pallet]46 #[pallet::generate_store(pub(super) trait Store)]47 pub struct Pallet<T>(_);48}4950type NegativeImbalanceOf<C, T> =51 <C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;5253pub struct ChargeEvmLiquidityInfo<T>54where55 T: Config,56 T: pallet_evm::Config,57{58 who: H160,59 negative_imbalance: NegativeImbalanceOf<<T as Config>::Currency, T>,60}6162pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);63impl<T: Config> fp_evm::TransactionValidityHack<T::AccountId> for TransactionValidityHack<T> {64 fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::AccountId> {65 match reason {66 WithdrawReason::Call { target, input } => {67 // This method is only used for checking, we shouldn't touch storage in it68 frame_support::storage::with_transaction(|| {69 let origin_sub = T::EvmAddressMapping::into_account_id(origin);70 TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(71 &origin_sub,72 &(*target, input.clone()),73 ))74 })75 }76 _ => None,77 }78 }79}80pub struct OnChargeTransaction<T: Config>(PhantomData<*const T>);81impl<T> pallet_evm::OnChargeEVMTransaction<T> for OnChargeTransaction<T>82where83 T: Config,84 T: pallet_evm::Config,85{86 type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;8788 fn withdraw_fee(89 who: &T::AccountId,90 reason: WithdrawReason,91 fee: U256,92 ) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {93 let mut who_pays_fee = who.clone();94 if let WithdrawReason::Call { target, input } = &reason {95 who_pays_fee = T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))96 .unwrap_or(who_pays_fee);97 }9899 let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(100 &who_pays_fee,101 reason,102 fee,103 )?;104105 let who_pays_fee_eth = T::EvmBackwardsAddressMapping::from_account_id(who_pays_fee);106 Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {107 who: who_pays_fee_eth,108 negative_imbalance: i,109 }))110 }111112 fn correct_and_deposit_fee(113 who: &T::AccountId,114 corrected_fee: U256,115 already_withdrawn: Self::LiquidityInfo,116 ) {117 <EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::correct_and_deposit_fee(118 &already_withdrawn.as_ref().map(|e| T::EvmAddressMapping::into_account_id(e.who)).unwrap_or(who.clone()),119 corrected_fee,120 already_withdrawn.map(|e| e.negative_imbalance),121 )122 }123124 fn pay_priority_fee(tip: U256) {125 <EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::pay_priority_fee(tip)126 }127}128129/// Implements sponsoring for evm calls performed from pallet-evm (via api.tx.ethereum.transact/api.tx.evm.call)130pub struct BridgeSponsorshipHandler<T>(PhantomData<T>);131impl<T, C> SponsorshipHandler<T::AccountId, C> for BridgeSponsorshipHandler<T>132where133 T: Config + pallet_evm::Config,134 C: IsSubType<pallet_evm::Call<T>>,135{136 fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {137 match call.is_sub_type()? {138 pallet_evm::Call::call {139 source,140 target,141 input,142 ..143 } => {144 let _ = T::CallOrigin::ensure_address_origin(145 source,146 <frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),147 )148 .ok()?;149 // Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner150 // TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?151 let sponsor = frame_support::storage::with_transaction(|| {152 TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(153 &who,154 &(*target, input.clone()),155 ))156 })?;157 Some(sponsor)158 }159 _ => None,160 }161 }162}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!(