difftreelog
orml-vesting pallet
in: master
2 files changed
runtime/Cargo.tomldiffbeforeafterboth1################################################################################2# Package34[package]5authors = ['Unique Network <support@uniquenetwork.io>']6build = 'build.rs'7description = 'Substrate node nft'8edition = '2018'9homepage = 'https://unique.network'10license = 'All Rights Reserved'11name = 'nft-runtime'12repository = 'https://github.com/usetech-llc/nft_private/'13version = '0.9.12'1415[package.metadata.docs.rs]16targets = ['x86_64-unknown-linux-gnu']1718[features]19default = ['std']20runtime-benchmarks = [21 'hex-literal',22 'frame-benchmarking',23 'frame-support/runtime-benchmarks',24 'frame-system-benchmarking',25 'frame-system/runtime-benchmarks',26 'pallet-evm-migration/runtime-benchmarks',27 'pallet-balances/runtime-benchmarks',28 'pallet-timestamp/runtime-benchmarks',29 'pallet-common/runtime-benchmarks',30 'pallet-fungible/runtime-benchmarks',31 'pallet-refungible/runtime-benchmarks',32 'pallet-nonfungible/runtime-benchmarks',33 'pallet-nft/runtime-benchmarks',34 'pallet-inflation/runtime-benchmarks',35 'pallet-xcm/runtime-benchmarks',36 'sp-runtime/runtime-benchmarks',37 'xcm-builder/runtime-benchmarks',38]39std = [40 'codec/std',41 'cumulus-pallet-aura-ext/std',42 'cumulus-pallet-parachain-system/std',43 'cumulus-pallet-xcm/std',44 'cumulus-pallet-xcmp-queue/std',45 'cumulus-primitives-core/std',46 'cumulus-primitives-utility/std',47 'frame-executive/std',48 'frame-support/std',49 'frame-system/std',50 'frame-system-rpc-runtime-api/std',51 'pallet-aura/std',52 'pallet-balances/std',53 # 'pallet-contracts/std',54 # 'pallet-contracts-primitives/std',55 # 'pallet-contracts-rpc-runtime-api/std',56 # 'pallet-contract-helpers/std',57 'pallet-randomness-collective-flip/std',58 'pallet-sudo/std',59 'pallet-timestamp/std',60 'pallet-transaction-payment/std',61 'pallet-transaction-payment-rpc-runtime-api/std',62 'pallet-treasury/std',63 'pallet-vesting/std',64 'pallet-evm/std',65 'pallet-evm-migration/std',66 'pallet-evm-contract-helpers/std',67 'pallet-evm-transaction-payment/std',68 'pallet-evm-coder-substrate/std',69 'pallet-ethereum/std',70 'fp-rpc/std',71 'up-rpc/std',72 'fp-self-contained/std',73 'parachain-info/std',74 'serde',75 'pallet-inflation/std',76 'pallet-common/std',77 'pallet-fungible/std',78 'pallet-refungible/std',79 'pallet-nonfungible/std',80 'pallet-nft/std',81 'pallet-unq-scheduler/std',82 'pallet-nft-charge-transaction/std',83 'pallet-nft-transaction-payment/std',84 'nft-data-structs/std',85 'sp-api/std',86 'sp-block-builder/std',87 "sp-consensus-aura/std",88 'sp-core/std',89 'sp-inherents/std',90 'sp-io/std',91 'sp-offchain/std',92 'sp-runtime/std',93 'sp-session/std',94 'sp-std/std',95 'sp-transaction-pool/std',96 'sp-version/std',97 'xcm/std',98 'xcm-builder/std',99 'xcm-executor/std',100]101limit-testing = ['pallet-nft/limit-testing', 'nft-data-structs/limit-testing']102103################################################################################104# Substrate Dependencies105106[dependencies.codec]107default-features = false108features = ['derive']109package = 'parity-scale-codec'110version = '2.3.0'111112[dependencies.frame-benchmarking]113default-features = false114git = 'https://github.com/paritytech/substrate.git'115optional = true116branch = 'polkadot-v0.9.12'117118[dependencies.frame-executive]119default-features = false120git = 'https://github.com/paritytech/substrate.git'121branch = 'polkadot-v0.9.12'122123[dependencies.frame-support]124default-features = false125git = 'https://github.com/paritytech/substrate.git'126branch = 'polkadot-v0.9.12'127128[dependencies.frame-system]129default-features = false130git = 'https://github.com/paritytech/substrate.git'131branch = 'polkadot-v0.9.12'132133[dependencies.frame-system-benchmarking]134default-features = false135git = 'https://github.com/paritytech/substrate.git'136optional = true137branch = 'polkadot-v0.9.12'138139[dependencies.frame-system-rpc-runtime-api]140default-features = false141git = 'https://github.com/paritytech/substrate.git'142branch = 'polkadot-v0.9.12'143144[dependencies.hex-literal]145optional = true146version = '0.3.3'147148[dependencies.serde]149default-features = false150features = ['derive']151optional = true152version = '1.0.130'153154[dependencies.pallet-aura]155default-features = false156git = 'https://github.com/paritytech/substrate.git'157branch = 'polkadot-v0.9.12'158159[dependencies.pallet-balances]160default-features = false161git = 'https://github.com/paritytech/substrate.git'162branch = 'polkadot-v0.9.12'163164# Contracts specific packages165# [dependencies.pallet-contracts]166# git = 'https://github.com/paritytech/substrate.git'167# default-features = false168# branch = 'polkadot-v0.9.12'169# version = '4.0.0-dev'170171# [dependencies.pallet-contracts-primitives]172# git = 'https://github.com/paritytech/substrate.git'173# default-features = false174# branch = 'polkadot-v0.9.12'175# version = '4.0.0-dev'176177# [dependencies.pallet-contracts-rpc-runtime-api]178# git = 'https://github.com/paritytech/substrate.git'179# default-features = false180# branch = 'polkadot-v0.9.12'181# version = '4.0.0-dev'182183[dependencies.pallet-randomness-collective-flip]184default-features = false185git = 'https://github.com/paritytech/substrate.git'186branch = 'polkadot-v0.9.12'187188[dependencies.pallet-sudo]189default-features = false190git = 'https://github.com/paritytech/substrate.git'191branch = 'polkadot-v0.9.12'192193[dependencies.pallet-timestamp]194default-features = false195git = 'https://github.com/paritytech/substrate.git'196branch = 'polkadot-v0.9.12'197198[dependencies.pallet-transaction-payment]199default-features = false200git = 'https://github.com/paritytech/substrate.git'201branch = 'polkadot-v0.9.12'202203[dependencies.pallet-transaction-payment-rpc-runtime-api]204default-features = false205git = 'https://github.com/paritytech/substrate.git'206branch = 'polkadot-v0.9.12'207208[dependencies.pallet-treasury]209default-features = false210git = 'https://github.com/paritytech/substrate.git'211branch = 'polkadot-v0.9.12'212213[dependencies.pallet-vesting]214default-features = false215git = 'https://github.com/paritytech/substrate.git'216branch = 'polkadot-v0.9.12'217218[dependencies.sp-arithmetic]219default-features = false220git = 'https://github.com/paritytech/substrate.git'221branch = 'polkadot-v0.9.12'222223[dependencies.sp-api]224default-features = false225git = 'https://github.com/paritytech/substrate.git'226branch = 'polkadot-v0.9.12'227228[dependencies.sp-block-builder]229default-features = false230git = 'https://github.com/paritytech/substrate.git'231branch = 'polkadot-v0.9.12'232233[dependencies.sp-core]234default-features = false235git = 'https://github.com/paritytech/substrate.git'236branch = 'polkadot-v0.9.12'237238[dependencies.sp-consensus-aura]239default-features = false240git = 'https://github.com/paritytech/substrate.git'241branch = 'polkadot-v0.9.12'242243[dependencies.sp-inherents]244default-features = false245git = 'https://github.com/paritytech/substrate.git'246branch = 'polkadot-v0.9.12'247248[dependencies.sp-io]249default-features = false250git = 'https://github.com/paritytech/substrate.git'251branch = 'polkadot-v0.9.12'252253[dependencies.sp-offchain]254default-features = false255git = 'https://github.com/paritytech/substrate.git'256branch = 'polkadot-v0.9.12'257258[dependencies.sp-runtime]259default-features = false260git = 'https://github.com/paritytech/substrate.git'261branch = 'polkadot-v0.9.12'262263[dependencies.sp-session]264default-features = false265git = 'https://github.com/paritytech/substrate.git'266branch = 'polkadot-v0.9.12'267268[dependencies.sp-std]269default-features = false270git = 'https://github.com/paritytech/substrate.git'271branch = 'polkadot-v0.9.12'272273[dependencies.sp-transaction-pool]274default-features = false275git = 'https://github.com/paritytech/substrate.git'276branch = 'polkadot-v0.9.12'277278[dependencies.sp-version]279default-features = false280git = 'https://github.com/paritytech/substrate.git'281branch = 'polkadot-v0.9.12'282283[dependencies.smallvec]284version = '1.6.1'285286################################################################################287# Cumulus dependencies288289[dependencies.parachain-info]290default-features = false291git = 'https://github.com/paritytech/cumulus.git'292branch = 'polkadot-v0.9.12'293294[dependencies.cumulus-pallet-aura-ext]295git = 'https://github.com/paritytech/cumulus.git'296branch = 'polkadot-v0.9.12'297default-features = false298299[dependencies.cumulus-pallet-parachain-system]300git = 'https://github.com/paritytech/cumulus.git'301branch = 'polkadot-v0.9.12'302default-features = false303304[dependencies.cumulus-primitives-core]305git = 'https://github.com/paritytech/cumulus.git'306branch = 'polkadot-v0.9.12'307default-features = false308309[dependencies.cumulus-pallet-xcm]310git = 'https://github.com/paritytech/cumulus.git'311branch = 'polkadot-v0.9.12'312default-features = false313314[dependencies.cumulus-pallet-dmp-queue]315git = 'https://github.com/paritytech/cumulus.git'316branch = 'polkadot-v0.9.12'317default-features = false318319[dependencies.cumulus-pallet-xcmp-queue]320git = 'https://github.com/paritytech/cumulus.git'321branch = 'polkadot-v0.9.12'322default-features = false323324[dependencies.cumulus-primitives-utility]325git = 'https://github.com/paritytech/cumulus.git'326branch = 'polkadot-v0.9.12'327default-features = false328329[dependencies.cumulus-primitives-timestamp]330git = 'https://github.com/paritytech/cumulus.git'331branch = 'polkadot-v0.9.12'332default-features = false333334################################################################################335# Polkadot dependencies336337[dependencies.polkadot-parachain]338git = 'https://github.com/paritytech/polkadot'339branch = 'release-v0.9.12'340default-features = false341342[dependencies.xcm]343git = 'https://github.com/paritytech/polkadot'344branch = 'release-v0.9.12'345default-features = false346347[dependencies.xcm-builder]348git = 'https://github.com/paritytech/polkadot'349branch = 'release-v0.9.12'350default-features = false351352[dependencies.xcm-executor]353git = 'https://github.com/paritytech/polkadot'354branch = 'release-v0.9.12'355default-features = false356357[dependencies.pallet-xcm]358git = 'https://github.com/paritytech/polkadot'359branch = 'release-v0.9.12'360default-features = false361362363################################################################################364# local dependencies365366[dependencies]367scale-info = { version = "1.0.0", default-features = false, features = [368 "derive",369] }370derivative = "2.2.0"371pallet-nft = { path = '../pallets/nft', default-features = false, version = '3.0.0' }372up-rpc = { path = "../primitives/rpc", default-features = false }373pallet-inflation = { path = '../pallets/inflation', default-features = false, version = '3.0.0' }374nft-data-structs = { path = '../primitives/nft', default-features = false, version = '0.9.0' }375pallet-common = { default-features = false, path = "../pallets/common" }376pallet-fungible = { default-features = false, path = "../pallets/fungible" }377pallet-refungible = { default-features = false, path = "../pallets/refungible" }378pallet-nonfungible = { default-features = false, path = "../pallets/nonfungible" }379pallet-unq-scheduler = { path = '../pallets/scheduler', default-features = false, version = '3.0.0' }380# pallet-contract-helpers = { path = '../pallets/contract-helpers', default-features = false, version = '0.1.0' }381pallet-nft-transaction-payment = { path = '../pallets/nft-transaction-payment', default-features = false, version = '3.0.0' }382pallet-nft-charge-transaction = {git = "https://github.com/UniqueNetwork/pallet-sponsoring", package = "pallet-template-transaction-payment", default-features = false, version = '3.0.0' }383pallet-evm-migration = { path = '../pallets/evm-migration', default-features = false }384pallet-evm-contract-helpers = { path = '../pallets/evm-contract-helpers', default-features = false }385pallet-evm-transaction-payment = { path = '../pallets/evm-transaction-payment', default-features = false }386pallet-evm-coder-substrate = { default-features = false, path = "../pallets/evm-coder-substrate" }387388pallet-evm = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }389pallet-ethereum = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }390fp-rpc = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }391fp-self-contained = { default-features = false, git = "https://github.com/uniquenetwork/frontier.git", branch = "unique-polkadot-v0.9.12" }392393################################################################################394# Build Dependencies395396[build-dependencies.substrate-wasm-builder]397git = 'https://github.com/paritytech/substrate.git'398branch = 'polkadot-v0.9.12'runtime/src/lib.rsdiffbeforeafterboth--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -22,8 +22,7 @@
use sp_runtime::{
Permill, Perbill, Percent, create_runtime_str, generic, impl_opaque_keys,
traits::{
- AccountIdLookup, ConvertInto, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify,
- AccountIdConversion,
+ AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, Verify, AccountIdConversion,
},
transaction_validity::{TransactionSource, TransactionValidity},
ApplyExtrinsicResult, MultiSignature,
@@ -70,7 +69,7 @@
use fp_rpc::TransactionStatus;
use sp_core::crypto::Public;
use sp_runtime::{
- traits::{Dispatchable, PostDispatchInfoOf},
+ traits::{BlockNumberProvider, Dispatchable, PostDispatchInfoOf},
transaction_validity::TransactionValidityError,
};
@@ -515,17 +514,33 @@
type Call = Call;
}
+pub struct RelayChainBlockNumberProvider<T>(sp_std::marker::PhantomData<T>);
+
+impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider
+ for RelayChainBlockNumberProvider<T>
+{
+ type BlockNumber = BlockNumber;
+
+ fn current_block_number() -> Self::BlockNumber {
+ cumulus_pallet_parachain_system::Pallet::<T>::validation_data()
+ .map(|d| d.relay_parent_number)
+ .unwrap_or_default()
+ }
+}
+
parameter_types! {
pub const MinVestedTransfer: Balance = 10 * UNIQUE;
+ pub const MaxVestingSchedules: u32 = 28;
}
-impl pallet_vesting::Config for Runtime {
+impl orml_vesting::Config for Runtime {
type Event = Event;
- type Currency = Balances;
- type BlockNumberToBalance = ConvertInto;
+ type Currency = pallet_balances::Pallet<Runtime>;
type MinVestedTransfer = MinVestedTransfer;
+ type VestedTransferOrigin = EnsureSigned<AccountId>;
type WeightInfo = ();
- const MAX_VESTING_SCHEDULES: u32 = 28;
+ type MaxVestingSchedules = MaxVestingSchedules;
+ type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;
}
parameter_types! {
@@ -841,7 +856,8 @@
Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,
Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,
System: system::{Pallet, Call, Storage, Config, Event<T>} = 36,
- Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,
+ Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,
+ // Vesting: pallet_vesting::{Pallet, Call, Config<T>, Storage, Event<T>} = 37,
// Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,
// XCM helpers.