git.delta.rocks / unique-network / refs/commits / da93be287b96

difftreelog

Merge branch 'develop' into tests/increase_timeout

Max Andreev2022-11-02parents: #ec33a1f #1e082e3.patch.diff
in: master

3 files changed

modifiedpallets/unique/src/eth/mod.rsdiffbeforeafterboth
25use 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};
modifiedruntime/common/config/pallets/scheduler.rsdiffbeforeafterboth
25use codec::Decode;25use codec::Decode;
26use crate::{26use crate::{
27 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},27 runtime_common::{scheduler::SchedulerPaymentExecutor, config::substrate::RuntimeBlockWeights},
28 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller,28 Runtime, RuntimeCall, RuntimeEvent, RuntimeOrigin, OriginCaller, Balances,
29};29};
30use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;30use pallet_unique_scheduler::ScheduledEnsureOriginSuccess;
31use up_common::types::AccountId;31use up_common::types::AccountId;
modifiedruntime/common/scheduler.rsdiffbeforeafterboth
14// You should have received a copy of the GNU General Public License14// You should have received a copy of the GNU General Public License
15// 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/>.
1616
17use 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;