difftreelog
cargo fmt
in: master
10 files changed
pallets/common/src/lib.rsdiffbeforeafterboth--- a/pallets/common/src/lib.rs
+++ b/pallets/common/src/lib.rs
@@ -168,7 +168,9 @@
use scale_info::TypeInfo;
#[pallet::config]
- pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config {
+ pub trait Config:
+ frame_system::Config + pallet_evm_coder_substrate::Config + TypeInfo + account::Config
+ {
type Event: IsType<<Self as frame_system::Config>::Event> + From<Event<Self>>;
type Currency: Currency<Self::AccountId>;
pallets/evm-contract-helpers/src/eth.rsdiffbeforeafterboth--- a/pallets/evm-contract-helpers/src/eth.rs
+++ b/pallets/evm-contract-helpers/src/eth.rs
@@ -18,7 +18,8 @@
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, account::CrossAccountId
+ ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure,
+ account::CrossAccountId,
};
use sp_core::H160;
use crate::{
@@ -179,7 +180,9 @@
}
pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {
+impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)>
+ for HelpersContractSponsoring<T>
+{
fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
let mode = <Pallet<T>>::sponsoring_mode(call.0);
if mode == SponsoringModeT::Disabled {
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,9 @@
use sp_core::H160;
#[pallet::config]
- pub trait Config: frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config {
+ pub trait Config:
+ frame_system::Config + pallet_evm_coder_substrate::Config + pallet_evm::account::Config
+ {
type ContractAddress: Get<H160>;
type DefaultSponsoringRateLimit: Get<Self::BlockNumber>;
}
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, account::CrossAccountId};24use sp_core::{H160, U256};25use sp_runtime::TransactionOutcome;26use up_sponsorship::SponsorshipHandler;2728#[frame_support::pallet]29pub mod pallet {30 use super::*;3132 use frame_support::traits::Currency;33 use sp_std::vec::Vec;3435 #[pallet::config]36 pub trait Config: frame_system::Config + pallet_evm::account::Config {37 type EvmSponsorshipHandler: SponsorshipHandler<Self::CrossAccountId, (H160, Vec<u8>)>;38 type Currency: Currency<Self::AccountId>;39 }4041 #[pallet::pallet]42 #[pallet::generate_store(pub(super) trait Store)]43 pub struct Pallet<T>(_);44}4546type NegativeImbalanceOf<C, T> =47 <C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;4849pub struct ChargeEvmLiquidityInfo<T>50where51 T: Config,52 T: pallet_evm::Config,53{54 who: H160,55 negative_imbalance: NegativeImbalanceOf<<T as Config>::Currency, T>,56}5758pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);59impl<T: Config> fp_evm::TransactionValidityHack<T::CrossAccountId> for TransactionValidityHack<T> {60 fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::CrossAccountId> {61 match reason {62 WithdrawReason::Call { target, input } => {63 // This method is only used for checking, we shouldn't touch storage in it64 frame_support::storage::with_transaction(|| {65 let origin_sub = T::CrossAccountId::from_eth(origin);66 TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(67 &origin_sub,68 &(*target, input.clone()),69 ))70 })71 }72 _ => None,73 }74 }75}76pub struct OnChargeTransaction<T: Config>(PhantomData<*const T>);77impl<T> pallet_evm::OnChargeEVMTransaction<T> for OnChargeTransaction<T>78where79 T: Config,80 T: pallet_evm::Config,81{82 type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;8384 fn withdraw_fee(85 who: &T::CrossAccountId,86 reason: WithdrawReason,87 fee: U256,88 ) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {89 let who_pays_fee = if let WithdrawReason::Call { target, input } = &reason {90 T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone())).unwrap_or(who.clone())91 } else {92 who.clone()93 };9495 let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(96 &who_pays_fee,97 reason,98 fee,99 )?;100101 Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {102 who: who_pays_fee.as_eth().clone(),103 negative_imbalance: i,104 }))105 }106107 fn correct_and_deposit_fee(108 who: &T::CrossAccountId,109 corrected_fee: U256,110 already_withdrawn: Self::LiquidityInfo,111 ) {112 <EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::correct_and_deposit_fee(113 &already_withdrawn.as_ref().map(|e| T::CrossAccountId::from_eth(e.who)).unwrap_or(who.clone()),114 corrected_fee,115 already_withdrawn.map(|e| e.negative_imbalance),116 )117 }118119 fn pay_priority_fee(tip: U256) {120 <EVMCurrencyAdapter<<T as Config>::Currency, ()> as pallet_evm::OnChargeEVMTransaction<T>>::pay_priority_fee(tip)121 }122}123124/// Implements sponsoring for evm calls performed from pallet-evm (via api.tx.ethereum.transact/api.tx.evm.call)125pub struct BridgeSponsorshipHandler<T>(PhantomData<T>);126impl<T, C> SponsorshipHandler<T::AccountId, C> for BridgeSponsorshipHandler<T>127where128 T: Config + pallet_evm::Config,129 C: IsSubType<pallet_evm::Call<T>>,130{131 fn get_sponsor(who: &T::AccountId, call: &C) -> Option<T::AccountId> {132 match call.is_sub_type()? {133 pallet_evm::Call::call {134 source,135 target,136 input,137 ..138 } => {139 let _ = T::CallOrigin::ensure_address_origin(140 source,141 <frame_system::RawOrigin<T::AccountId>>::Signed(who.clone()).into(),142 )143 .ok()?;144 let who = T::CrossAccountId::from_sub(who.clone());145 // Effects from EvmSponsorshipHandler are applied in OnChargeEvmTransaction by pallet_evm::runner146 // TODO: Should we implement simulation mode (test, but do not apply effects) in `up-sponsorship`?147 let sponsor = frame_support::storage::with_transaction(|| {148 TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(149 &who,150 &(*target, input.clone()),151 ))152 })?;153 Some(sponsor.as_sub().clone())154 }155 _ => None,156 }157 }158}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, account::CrossAccountId};24use sp_core::{H160, U256};25use sp_runtime::TransactionOutcome;26use up_sponsorship::SponsorshipHandler;2728#[frame_support::pallet]29pub mod pallet {30 use super::*;3132 use frame_support::traits::Currency;33 use sp_std::vec::Vec;3435 #[pallet::config]36 pub trait Config: frame_system::Config + pallet_evm::account::Config {37 type EvmSponsorshipHandler: SponsorshipHandler<Self::CrossAccountId, (H160, Vec<u8>)>;38 type Currency: Currency<Self::AccountId>;39 }4041 #[pallet::pallet]42 #[pallet::generate_store(pub(super) trait Store)]43 pub struct Pallet<T>(_);44}4546type NegativeImbalanceOf<C, T> =47 <C as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;4849pub struct ChargeEvmLiquidityInfo<T>50where51 T: Config,52 T: pallet_evm::Config,53{54 who: H160,55 negative_imbalance: NegativeImbalanceOf<<T as Config>::Currency, T>,56}5758pub struct TransactionValidityHack<T: Config>(PhantomData<*const T>);59impl<T: Config> fp_evm::TransactionValidityHack<T::CrossAccountId> for TransactionValidityHack<T> {60 fn who_pays_fee(origin: H160, reason: &WithdrawReason) -> Option<T::CrossAccountId> {61 match reason {62 WithdrawReason::Call { target, input } => {63 // This method is only used for checking, we shouldn't touch storage in it64 frame_support::storage::with_transaction(|| {65 let origin_sub = T::CrossAccountId::from_eth(origin);66 TransactionOutcome::Rollback(T::EvmSponsorshipHandler::get_sponsor(67 &origin_sub,68 &(*target, input.clone()),69 ))70 })71 }72 _ => None,73 }74 }75}76pub struct OnChargeTransaction<T: Config>(PhantomData<*const T>);77impl<T> pallet_evm::OnChargeEVMTransaction<T> for OnChargeTransaction<T>78where79 T: Config,80 T: pallet_evm::Config,81{82 type LiquidityInfo = Option<ChargeEvmLiquidityInfo<T>>;8384 fn withdraw_fee(85 who: &T::CrossAccountId,86 reason: WithdrawReason,87 fee: U256,88 ) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {89 let who_pays_fee = if let WithdrawReason::Call { target, input } = &reason {90 T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))91 .unwrap_or(who.clone())92 } else {93 who.clone()94 };9596 let negative_imbalance = EVMCurrencyAdapter::<<T as Config>::Currency, ()>::withdraw_fee(97 &who_pays_fee,98 reason,99 fee,100 )?;101102 Ok(negative_imbalance.map(|i| ChargeEvmLiquidityInfo {103 who: who_pays_fee.as_eth().clone(),104 negative_imbalance: i,105 }))106 }107108 fn correct_and_deposit_fee(109 who: &T::CrossAccountId,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| T::CrossAccountId::from_eth(e.who)).unwrap_or(who.clone()),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::CrossAccountId::from_sub(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 Some(sponsor.as_sub().clone())155 }156 _ => None,157 }158 }159}pallets/fungible/src/lib.rsdiffbeforeafterboth--- a/pallets/fungible/src/lib.rs
+++ b/pallets/fungible/src/lib.rs
@@ -19,9 +19,7 @@
use core::ops::Deref;
use frame_support::{ensure};
use up_data_structs::{AccessMode, CollectionId, TokenId, CreateCollectionData};
-use pallet_common::{
- Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
-};
+use pallet_common::{Error as CommonError, Event as CommonEvent, Pallet as PalletCommon};
use pallet_evm::account::CrossAccountId;
use pallet_evm_coder_substrate::WithRecorder;
use sp_core::H160;
pallets/nonfungible/src/lib.rsdiffbeforeafterboth--- a/pallets/nonfungible/src/lib.rs
+++ b/pallets/nonfungible/src/lib.rs
@@ -21,9 +21,7 @@
use up_data_structs::{
AccessMode, CollectionId, CustomDataLimit, TokenId, CreateCollectionData, CreateNftExData,
};
-use pallet_common::{
- Error as CommonError, Pallet as PalletCommon, Event as CommonEvent,
-};
+use pallet_common::{Error as CommonError, Pallet as PalletCommon, Event as CommonEvent};
use pallet_evm::account::CrossAccountId;
use pallet_evm_coder_substrate::{SubstrateRecorder, WithRecorder};
use sp_core::H160;
pallets/refungible/src/lib.rsdiffbeforeafterboth--- a/pallets/refungible/src/lib.rs
+++ b/pallets/refungible/src/lib.rs
@@ -21,9 +21,7 @@
AccessMode, CollectionId, CustomDataLimit, MAX_REFUNGIBLE_PIECES, TokenId,
CreateCollectionData, CreateRefungibleExData,
};
-use pallet_common::{
- Error as CommonError, Event as CommonEvent, Pallet as PalletCommon,
-};
+use pallet_common::{Error as CommonError, Event as CommonEvent, Pallet as PalletCommon};
use pallet_evm::account::CrossAccountId;
use sp_runtime::{ArithmeticError, DispatchError, DispatchResult};
use sp_std::{vec::Vec, vec, collections::btree_map::BTreeMap};
pallets/unique/src/eth/sponsoring.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/sponsoring.rs
+++ b/pallets/unique/src/eth/sponsoring.rs
@@ -32,7 +32,9 @@
use up_data_structs::{CreateItemData, CreateNftData};
pub struct UniqueEthSponsorshipHandler<T: Config>(PhantomData<*const T>);
-impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for UniqueEthSponsorshipHandler<T> {
+impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)>
+ for UniqueEthSponsorshipHandler<T>
+{
fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {
let collection_id = map_eth_to_id(&call.0)?;
let collection = <CollectionHandle<T>>::new(collection_id)?;
@@ -59,16 +61,17 @@
.map(|()| sponsor)
}
UniqueNFTCall::ERC721Mintable(call) => match call {
- pallet_nonfungible::erc::ERC721MintableCall::Mint { .. } |
- pallet_nonfungible::erc::ERC721MintableCall::MintWithTokenUri { .. } => {
- withdraw_create_item(
- &collection,
- who.as_sub(),
- &CreateItemData::NFT(CreateNftData::default()))
- .map(|()| sponsor)
- }
+ pallet_nonfungible::erc::ERC721MintableCall::Mint { .. }
+ | pallet_nonfungible::erc::ERC721MintableCall::MintWithTokenUri {
+ ..
+ } => withdraw_create_item(
+ &collection,
+ who.as_sub(),
+ &CreateItemData::NFT(CreateNftData::default()),
+ )
+ .map(|()| sponsor),
_ => None,
- }
+ },
_ => None,
}
}
pallets/unique/src/lib.rsdiffbeforeafterboth--- a/pallets/unique/src/lib.rs
+++ b/pallets/unique/src/lib.rs
@@ -53,10 +53,7 @@
CollectionMode, TokenId, SchemaVersion, SponsorshipState, MetaUpdatePermission,
CreateCollectionData, CustomDataLimit, CreateItemExData,
};
-use pallet_common::{
- CollectionHandle, Pallet as PalletCommon, Error as CommonError,
- CommonWeightInfo,
-};
+use pallet_common::{CollectionHandle, Pallet as PalletCommon, Error as CommonError, CommonWeightInfo};
use pallet_evm::account::CrossAccountId;
use pallet_refungible::{Pallet as PalletRefungible, RefungibleHandle};
use pallet_fungible::{Pallet as PalletFungible, FungibleHandle};
pallets/unique/src/tests.rsdiffbeforeafterboth--- a/pallets/unique/src/tests.rs
+++ b/pallets/unique/src/tests.rs
@@ -2865,18 +2865,49 @@
let origin1 = Origin::signed(user1);
let origin2 = Origin::signed(user2);
let account2 = account(user2);
-
- let collection_id = create_test_collection_for_owner(&CollectionMode::NFT, user1, CollectionId(1));
- assert_ok!(TemplateModule::set_collection_sponsor(origin1.clone(), collection_id, user1));
- assert_ok!(TemplateModule::confirm_sponsorship(origin1.clone(), collection_id));
+ let collection_id =
+ create_test_collection_for_owner(&CollectionMode::NFT, user1, CollectionId(1));
+ assert_ok!(TemplateModule::set_collection_sponsor(
+ origin1.clone(),
+ collection_id,
+ user1
+ ));
+ assert_ok!(TemplateModule::confirm_sponsorship(
+ origin1.clone(),
+ collection_id
+ ));
+
// Expect error while have no permissions
- assert!(TemplateModule::create_item(origin2.clone(), collection_id, account2.clone(), default_nft_data().into()).is_err());
+ assert!(TemplateModule::create_item(
+ origin2.clone(),
+ collection_id,
+ account2.clone(),
+ default_nft_data().into()
+ )
+ .is_err());
- assert_ok!(TemplateModule::set_public_access_mode(origin1.clone(), collection_id, AccessMode::AllowList));
- assert_ok!(TemplateModule::add_to_allow_list(origin1.clone(), collection_id, account2.clone()));
- assert_ok!(TemplateModule::set_mint_permission(origin1.clone(), collection_id, true));
-
- assert_ok!(TemplateModule::create_item(origin2, collection_id, account2, default_nft_data().into()));
+ assert_ok!(TemplateModule::set_public_access_mode(
+ origin1.clone(),
+ collection_id,
+ AccessMode::AllowList
+ ));
+ assert_ok!(TemplateModule::add_to_allow_list(
+ origin1.clone(),
+ collection_id,
+ account2.clone()
+ ));
+ assert_ok!(TemplateModule::set_mint_permission(
+ origin1.clone(),
+ collection_id,
+ true
+ ));
+
+ assert_ok!(TemplateModule::create_item(
+ origin2,
+ collection_id,
+ account2,
+ default_nft_data().into()
+ ));
});
-}
\ No newline at end of file
+}