difftreelog
Merge branch 'develop' into tests/increase_timeout
in: master
3 files changed
pallets/unique/src/eth/mod.rsdiffbeforeafterboth--- a/pallets/unique/src/eth/mod.rs
+++ b/pallets/unique/src/eth/mod.rs
@@ -23,10 +23,7 @@
use crate::Pallet;
use pallet_common::{
- CollectionById,
- dispatch::CollectionDispatch,
- erc::{static_property::key, CollectionHelpersEvents},
- Pallet as PalletCommon,
+ CollectionById, dispatch::CollectionDispatch, erc::static_property::key, Pallet as PalletCommon,
};
use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};
use pallet_evm_coder_substrate::{dispatch_to_evm, SubstrateRecorder, WithRecorder};
runtime/common/config/pallets/scheduler.rsdiffbeforeafterboth--- a/runtime/common/config/pallets/scheduler.rs
+++ b/runtime/common/config/pallets/scheduler.rs
@@ -25,7 +25,7 @@
use codec::Decode;
use crate::{
runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},
- Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller,
+ Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller, Balances,
};
use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;
use up_common::types::AccountId;
runtime/common/scheduler.rsdiffbeforeafterboth14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.161617use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo, DispatchInfo};17use frame_support::{18 traits::NamedReservableCurrency,19 dispatch::{GetDispatchInfo, PostDispatchInfo, DispatchInfo},20};18use sp_runtime::{21use sp_runtime::{19 traits::{Dispatchable, Applyable, Member},22 traits::{Dispatchable, Applyable, Member},20 generic::Era,23 generic::Era,21 transaction_validity::TransactionValidityError,24 transaction_validity::TransactionValidityError,22 DispatchErrorWithPostInfo,25 DispatchErrorWithPostInfo, DispatchError,23};26};24use codec::Encode;27use codec::Encode;25use crate::{Runtime, RuntimeCall, RuntimeOrigin};28use crate::{Runtime, RuntimeCall, RuntimeOrigin, Balances};26use up_common::types::AccountId;29use up_common::types::{AccountId, Balance};27use fp_self_contained::SelfContainedCall;30use fp_self_contained::SelfContainedCall;28use pallet_unique_scheduler::DispatchCall;31use pallet_unique_scheduler::DispatchCall;29use pallet_transaction_payment::ChargeTransactionPayment;32use pallet_transaction_payment::ChargeTransactionPayment;