difftreelog
Merge branch 'develop' into tests/increase_timeout
in: master
3 files changed
pallets/unique/src/eth/mod.rsdiffbeforeafterboth25use pallet_common::{25use pallet_common::{26 CollectionById,26 CollectionById, dispatch::CollectionDispatch, erc::static_property::key, Pallet as PalletCommon,27 dispatch::CollectionDispatch,28 erc::{static_property::key, CollectionHelpersEvents},29 Pallet as PalletCommon,30};27};31use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};28use pallet_evm::{account::CrossAccountId, OnMethodCall, PrecompileHandle, PrecompileResult};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.rsdiffbeforeafterboth--- a/runtime/common/scheduler.rs
+++ b/runtime/common/scheduler.rs
@@ -14,16 +14,19 @@
// You should have received a copy of the GNU General Public License
// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.
-use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo, DispatchInfo};
+use frame_support::{
+ traits::NamedReservableCurrency,
+ dispatch::{GetDispatchInfo, PostDispatchInfo, DispatchInfo},
+};
use sp_runtime::{
traits::{Dispatchable, Applyable, Member},
generic::Era,
transaction_validity::TransactionValidityError,
- DispatchErrorWithPostInfo,
+ DispatchErrorWithPostInfo, DispatchError,
};
use codec::Encode;
-use crate::{Runtime, RuntimeCall, RuntimeOrigin};
-use up_common::types::AccountId;
+use crate::{Runtime, RuntimeCall, RuntimeOrigin, Balances};
+use up_common::types::{AccountId, Balance};
use fp_self_contained::SelfContainedCall;
use pallet_unique_scheduler::DispatchCall;
use pallet_transaction_payment::ChargeTransactionPayment;