Update to latest substrate (#504)

* Update cargo files

* First round of build fixes

* update lock file
This commit is contained in:
Kian Paimani
2019-10-28 14:28:13 +01:00
committed by Gavin Wood
parent ca8aa4c4cd
commit 8fb635b5e5
21 changed files with 1038 additions and 984 deletions
+12 -1
View File
@@ -58,6 +58,7 @@ use srml_support::{
};
use im_online::sr25519::AuthorityId as ImOnlineId;
use system::offchain::TransactionSubmitter;
use srml_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo;
#[cfg(feature = "std")]
pub use staking::StakerStatus;
@@ -540,7 +541,7 @@ impl nicks::Trait for Runtime {
type Currency = Balances;
type ReservationFee = ReservationFee;
type Slashed = Treasury;
type KillOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
type ForceOrigin = collective::EnsureMember<AccountId, CouncilCollective>;
type MinLength = MinLength;
type MaxLength = MaxLength;
}
@@ -742,4 +743,14 @@ impl_runtime_apis! {
System::account_nonce(account)
}
}
impl srml_transaction_payment_rpc_runtime_api::TransactionPaymentApi<
Block,
Balance,
UncheckedExtrinsic,
> for Runtime {
fn query_info(uxt: UncheckedExtrinsic, len: u32) -> RuntimeDispatchInfo<Balance> {
TransactionPayment::query_info(uxt, len)
}
}
}