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.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::{21 ExitRevert, OnCreate, OnMethodCall, PrecompileResult, PrecompileFailure, account::CrossAccountId22};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 sp_std::vec::Vec;3031struct ContractHelpers<T: Config>(SubstrateRecorder<T>);32impl<T: Config> WithRecorder<T> for ContractHelpers<T> {33 fn recorder(&self) -> &SubstrateRecorder<T> {34 &self.035 }3637 fn into_recorder(self) -> SubstrateRecorder<T> {38 self.039 }40}4142#[solidity_interface(name = "ContractHelpers")]43impl<T: Config> ContractHelpers<T> {44 fn contract_owner(&self, contract_address: address) -> Result<address> {45 Ok(<Owner<T>>::get(contract_address))46 }4748 fn sponsoring_enabled(&self, contract_address: address) -> Result<bool> {49 Ok(<Pallet<T>>::sponsoring_mode(contract_address) != SponsoringModeT::Disabled)50 }5152 /// Deprecated53 fn toggle_sponsoring(54 &mut self,55 caller: caller,56 contract_address: address,57 enabled: bool,58 ) -> Result<void> {59 <Pallet<T>>::ensure_owner(contract_address, caller)?;60 <Pallet<T>>::toggle_sponsoring(contract_address, enabled);61 Ok(())62 }6364 fn set_sponsoring_mode(65 &mut self,66 caller: caller,67 contract_address: address,68 mode: uint8,69 ) -> Result<void> {70 <Pallet<T>>::ensure_owner(contract_address, caller)?;71 let mode = SponsoringModeT::from_eth(mode).ok_or("unknown mode")?;72 <Pallet<T>>::set_sponsoring_mode(contract_address, mode);73 Ok(())74 }7576 fn sponsoring_mode(&self, contract_address: address) -> Result<uint8> {77 Ok(<Pallet<T>>::sponsoring_mode(contract_address).to_eth())78 }7980 fn set_sponsoring_rate_limit(81 &mut self,82 caller: caller,83 contract_address: address,84 rate_limit: uint32,85 ) -> Result<void> {86 <Pallet<T>>::ensure_owner(contract_address, caller)?;87 <Pallet<T>>::set_sponsoring_rate_limit(contract_address, rate_limit.into());88 Ok(())89 }9091 fn get_sponsoring_rate_limit(&self, contract_address: address) -> Result<uint32> {92 Ok(<SponsoringRateLimit<T>>::get(contract_address)93 .try_into()94 .map_err(|_| "rate limit > u32::MAX")?)95 }9697 fn allowed(&self, contract_address: address, user: address) -> Result<bool> {98 self.0.consume_sload()?;99 Ok(<Pallet<T>>::allowed(contract_address, user))100 }101102 fn allowlist_enabled(&self, contract_address: address) -> Result<bool> {103 Ok(<AllowlistEnabled<T>>::get(contract_address))104 }105106 fn toggle_allowlist(107 &mut self,108 caller: caller,109 contract_address: address,110 enabled: bool,111 ) -> Result<void> {112 <Pallet<T>>::ensure_owner(contract_address, caller)?;113 <Pallet<T>>::toggle_allowlist(contract_address, enabled);114 Ok(())115 }116117 fn toggle_allowed(118 &mut self,119 caller: caller,120 contract_address: address,121 user: address,122 allowed: bool,123 ) -> Result<void> {124 <Pallet<T>>::ensure_owner(contract_address, caller)?;125 <Pallet<T>>::toggle_allowed(contract_address, user, allowed);126 Ok(())127 }128}129130pub struct HelpersOnMethodCall<T: Config>(PhantomData<*const T>);131impl<T: Config> OnMethodCall<T> for HelpersOnMethodCall<T> {132 fn is_reserved(contract: &sp_core::H160) -> bool {133 contract == &T::ContractAddress::get()134 }135136 fn is_used(contract: &sp_core::H160) -> bool {137 contract == &T::ContractAddress::get()138 }139140 fn call(141 source: &sp_core::H160,142 target: &sp_core::H160,143 gas_left: u64,144 input: &[u8],145 value: sp_core::U256,146 ) -> Option<PrecompileResult> {147 // TODO: Extract to another OnMethodCall handler148 if <AllowlistEnabled<T>>::get(target) && !<Pallet<T>>::allowed(*target, *source) {149 return Some(Err(PrecompileFailure::Revert {150 exit_status: ExitRevert::Reverted,151 cost: 0,152 output: {153 let mut writer = AbiWriter::new_call(evm_coder::fn_selector!(Error(string)));154 writer.string("Target contract is allowlisted");155 writer.finish()156 },157 }));158 }159160 if target != &T::ContractAddress::get() {161 return None;162 }163164 let helpers = ContractHelpers::<T>(SubstrateRecorder::<T>::new(*target, gas_left));165 pallet_evm_coder_substrate::call(*source, helpers, value, input)166 }167168 fn get_code(contract: &sp_core::H160) -> Option<Vec<u8>> {169 (contract == &T::ContractAddress::get())170 .then(|| include_bytes!("./stubs/ContractHelpers.raw").to_vec())171 }172}173174pub struct HelpersOnCreate<T: Config>(PhantomData<*const T>);175impl<T: Config> OnCreate<T> for HelpersOnCreate<T> {176 fn on_create(owner: H160, contract: H160) {177 <Owner<T>>::insert(contract, owner);178 }179}180181pub struct HelpersContractSponsoring<T: Config>(PhantomData<*const T>);182impl<T: Config> SponsorshipHandler<T::CrossAccountId, (H160, Vec<u8>)> for HelpersContractSponsoring<T> {183 fn get_sponsor(who: &T::CrossAccountId, call: &(H160, Vec<u8>)) -> Option<T::CrossAccountId> {184 let mode = <Pallet<T>>::sponsoring_mode(call.0);185 if mode == SponsoringModeT::Disabled {186 return None;187 }188189 if mode == SponsoringModeT::Allowlisted && !<Pallet<T>>::allowed(call.0, *who.as_eth()) {190 return None;191 }192 let block_number = <frame_system::Pallet<T>>::block_number() as T::BlockNumber;193194 if let Some(last_tx_block) = <SponsorBasket<T>>::get(&call.0, who.as_eth()) {195 let limit = <SponsoringRateLimit<T>>::get(&call.0);196197 let timeout = last_tx_block + limit;198 if block_number < timeout {199 return None;200 }201 }202203 <SponsorBasket<T>>::insert(&call.0, who.as_eth(), block_number);204205 let sponsor = T::CrossAccountId::from_eth(call.0);206 Some(sponsor)207 }208}209210generate_stubgen!(contract_helpers_impl, ContractHelpersCall<()>, true);211generate_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
@@ -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.rsdiffbeforeafterboth--- a/pallets/evm-transaction-payment/src/lib.rs
+++ b/pallets/evm-transaction-payment/src/lib.rs
@@ -87,7 +87,8 @@
fee: U256,
) -> core::result::Result<Self::LiquidityInfo, pallet_evm::Error<T>> {
let who_pays_fee = if let WithdrawReason::Call { target, input } = &reason {
- T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone())).unwrap_or(who.clone())
+ T::EvmSponsorshipHandler::get_sponsor(who, &(*target, input.clone()))
+ .unwrap_or(who.clone())
} else {
who.clone()
};
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
+}