mirror of
https://github.com/pezkuwichain/pezkuwi-subxt.git
synced 2026-06-12 15:51:12 +00:00
Bump Substrate to RC5 (#243)
* Bump Substrate to rc5 * Bump async-std to v1.6.2 There was a bug in v.1.6.0 which kept us locked to v1.5 releases. I think that's fixed now so I'm bumping this. * Update bridge node runtime * Update node service * Update CLI * Add SystemWeightInfo type to test runtimes * Add RPC extension builder to service * Directly return rpc_extensions_builder * Allow complex types in service This comes from Substrate, so I'd rather just keep the code as is * Update benchmarking code for new CLI
This commit is contained in:
Hernando Castano
committed by
Bastian Köcher
Bastian Köcher
parent
80cc9e793e
commit
6fd1651b21
@@ -29,14 +29,14 @@ features = ["derive"]
|
||||
|
||||
# Substrate Dependencies
|
||||
[dependencies.pallet-aura]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.pallet-balances]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
@@ -51,75 +51,75 @@ default-features = false
|
||||
path = "../../../modules/currency-exchange"
|
||||
|
||||
[dependencies.frame-support]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.pallet-grandpa]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.pallet-randomness-collective-flip]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.pallet-sudo]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.pallet-session]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.frame-system]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.frame-system-rpc-runtime-api]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.pallet-timestamp]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.pallet-transaction-payment]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.frame-executive]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
# Substrate Primitives
|
||||
[dependencies.sp-api]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-block-builder]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
@@ -134,75 +134,75 @@ default-features = false
|
||||
path = "../../../primitives/currency-exchange"
|
||||
|
||||
[dependencies.sp-consensus-aura]
|
||||
version = "0.8.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "0.8.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-core]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-inherents]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-io]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-offchain]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-runtime]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-session]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-staking]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-std]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-transaction-pool]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.sp-version]
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
[dependencies.frame-benchmarking]
|
||||
optional = true
|
||||
version = "2.0.0-rc4"
|
||||
tag = 'v2.0.0-rc4'
|
||||
version = "2.0.0-rc5"
|
||||
tag = 'v2.0.0-rc5'
|
||||
default-features = false
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
@@ -219,7 +219,7 @@ path = "../../../primitives/ethereum-poa"
|
||||
|
||||
[build-dependencies.wasm-builder-runner]
|
||||
version = "1.0.5"
|
||||
tag = 'v2.0.0-rc4'
|
||||
tag = 'v2.0.0-rc5'
|
||||
package = "substrate-wasm-builder-runner"
|
||||
git = "https://github.com/paritytech/substrate/"
|
||||
|
||||
|
||||
@@ -35,9 +35,6 @@ pub mod benches;
|
||||
pub mod kovan;
|
||||
pub mod rialto;
|
||||
|
||||
#[cfg(feature = "runtime-benchmarks")]
|
||||
pub use benches as bridge;
|
||||
|
||||
use codec::{Decode, Encode};
|
||||
use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList};
|
||||
use sp_api::impl_runtime_apis;
|
||||
@@ -223,6 +220,8 @@ impl frame_system::Trait for Runtime {
|
||||
type OnKilledAccount = ();
|
||||
/// The data to be stored in an account.
|
||||
type AccountData = pallet_balances::AccountData<Balance>;
|
||||
/// Weight information for the extrinsics of this pallet.
|
||||
type SystemWeightInfo = ();
|
||||
}
|
||||
|
||||
impl pallet_aura::Trait for Runtime {
|
||||
@@ -349,6 +348,7 @@ impl pallet_timestamp::Trait for Runtime {
|
||||
type Moment = u64;
|
||||
type OnTimestampSet = Aura;
|
||||
type MinimumPeriod = MinimumPeriod;
|
||||
type WeightInfo = ();
|
||||
}
|
||||
|
||||
parameter_types! {
|
||||
@@ -363,6 +363,7 @@ impl pallet_balances::Trait for Runtime {
|
||||
type DustRemoval = ();
|
||||
type ExistentialDeposit = ExistentialDeposit;
|
||||
type AccountStore = System;
|
||||
type WeightInfo = ();
|
||||
}
|
||||
|
||||
parameter_types! {
|
||||
@@ -398,6 +399,7 @@ impl pallet_session::Trait for Runtime {
|
||||
type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
|
||||
type Keys = SessionKeys;
|
||||
type DisabledValidatorsThreshold = ();
|
||||
type WeightInfo = ();
|
||||
}
|
||||
|
||||
pub struct ShiftSessionManager;
|
||||
@@ -464,7 +466,7 @@ construct_runtime!(
|
||||
System: frame_system::{Module, Call, Config, Storage, Event<T>},
|
||||
RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Module, Call, Storage},
|
||||
Timestamp: pallet_timestamp::{Module, Call, Storage, Inherent},
|
||||
Aura: pallet_aura::{Module, Config<T>, Inherent(Timestamp)},
|
||||
Aura: pallet_aura::{Module, Config<T>, Inherent},
|
||||
Grandpa: pallet_grandpa::{Module, Call, Storage, Config, Event},
|
||||
Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
|
||||
TransactionPayment: pallet_transaction_payment::{Module, Storage},
|
||||
@@ -650,14 +652,19 @@ impl_runtime_apis! {
|
||||
Grandpa::grandpa_authorities()
|
||||
}
|
||||
|
||||
fn submit_report_equivocation_extrinsic(
|
||||
_equivocation_proof: fg_primitives::EquivocationProof<
|
||||
fn submit_report_equivocation_unsigned_extrinsic(
|
||||
equivocation_proof: fg_primitives::EquivocationProof<
|
||||
<Block as BlockT>::Hash,
|
||||
NumberFor<Block>,
|
||||
>,
|
||||
_key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof,
|
||||
key_owner_proof: fg_primitives::OpaqueKeyOwnershipProof,
|
||||
) -> Option<()> {
|
||||
None
|
||||
let key_owner_proof = key_owner_proof.decode()?;
|
||||
|
||||
Grandpa::submit_unsigned_equivocation_report(
|
||||
equivocation_proof,
|
||||
key_owner_proof,
|
||||
)
|
||||
}
|
||||
|
||||
fn generate_key_ownership_proof(
|
||||
@@ -737,8 +744,13 @@ impl_runtime_apis! {
|
||||
}
|
||||
}
|
||||
|
||||
add_benchmark!(params, batches, b"bridge-eth-poa", BridgeKovan);
|
||||
add_benchmark!(params, batches, b"bridge-currency-exchange", BridgeCurrencyExchangeBench::<Runtime, KovanCurrencyExchange>);
|
||||
add_benchmark!(params, batches, pallet_bridge_eth_poa, BridgeKovan);
|
||||
add_benchmark!(
|
||||
params,
|
||||
batches,
|
||||
pallet_bridge_currency_exchange,
|
||||
BridgeCurrencyExchangeBench::<Runtime, KovanCurrencyExchange>
|
||||
);
|
||||
|
||||
if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
|
||||
Ok(batches)
|
||||
|
||||
Reference in New Issue
Block a user