pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-06 21:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

v0.17.18: Update latest substrate (#776)

Browse Source 
* update latest substrate polkadot-master

* fix test compilation

* bump version to 0.7.18

* bump impl_version

* update substrate

* Revert "Instantiate environment with asynchronous API (#768)"

This reverts commit a5d9645bf4.

* update substrate

* remove unused parameter type

* bump trie-db version for tests

* fix collator test

* update substrate

* remove unnecessary service changes
This commit is contained in:
André Silva
2020-01-17 18:37:55 +00:00
committed by GitHub
parent b9cc23a6e0
commit 2b081f9edd
24 changed files with 656 additions and 595 deletions
Download Patch File Download Diff File Expand all files Collapse all files
polkadot/Cargo.lock
Generated
+600 -552
View File
File diff suppressed because it is too large Load Diff
polkadot/Cargo.toml
+1 -1
View File
@@ -4,7 +4,7 @@ path = "src/main.rs"
[package]
name = "polkadot"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
build = "build.rs"
edition = "2018"
polkadot/availability-store/Cargo.toml
+1 -1
View File
@@ -1,7 +1,7 @@
[package]
name = "polkadot-availability-store"
description = "Persistent database for parachain data"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
polkadot/cli/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-cli"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot node implementation in Rust."
edition = "2018"
@@ -23,7 +23,7 @@ sc-client-db = { git = "https://github.com/paritytech/substrate", branch = "polk
sc-executor = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
service = { package = "polkadot-service", path = "../service", default-features = false }
tokio = { version = "0.2", features = ["rt-threaded"], optional = true }
tokio = { version = "0.1.22", optional = true }
wasm-bindgen = { version = "0.2.57", optional = true }
wasm-bindgen-futures = { version = "0.4.7", optional = true }
polkadot/cli/src/lib.rs
+22 -8
View File
@@ -24,7 +24,9 @@ mod chain_spec;
mod browser;
use chain_spec::ChainSpec;
use futures::{Future, future::{select, Either}, channel::oneshot};
use futures::{
Future, FutureExt, TryFutureExt, future::select, channel::oneshot,
};
#[cfg(feature = "cli")]
use tokio::runtime::Runtime;
use log::info;
@@ -215,22 +217,34 @@ pub fn run_until_exit(
) -> error::Result<()> {
let (exit_send, exit) = oneshot::channel();
let executor = runtime.executor();
let informant = sc_cli::informant::build(&service);
let future = select(exit, informant)
.map(|_| Ok(()))
.compat();
let handle = runtime.spawn(select(exit, informant));
executor.spawn(future);
// we eagerly drop the service so that the internal exit future is fired,
// but we need to keep holding a reference to the global telemetry guard
let _telemetry = service.telemetry();
let service_res = runtime.block_on(select(service, e));
let service_res = {
let service = service
.map_err(|err| error::Error::Service(err));
let select = select(service, e)
.map(|_| Ok(()))
.compat();
runtime.block_on(select)
};
let _ = exit_send.send(());
runtime.block_on(handle);
use futures01::Future;
// TODO [andre]: timeout this future substrate/#1318
let _ = runtime.shutdown_on_idle().wait();
match service_res {
Either::Left((res, _)) => res.map_err(error::Error::Service),
Either::Right((_, _)) => Ok(())
}
service_res
}
polkadot/collator/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-collator"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Collator node implementation"
edition = "2018"
@@ -21,7 +21,7 @@ polkadot-network = { path = "../network" }
polkadot-validation = { path = "../validation" }
polkadot-service = { path = "../service" }
log = "0.4.8"
tokio = "0.2"
tokio = "0.1.22"
futures-timer = "1.0"
codec = { package = "parity-scale-codec", version = "1.1.0" }
polkadot/collator/src/lib.rs
+2 -2
View File
@@ -425,7 +425,7 @@ fn run_collator_node<S, E, P, Extrinsic>(
);
let exit = inner_exit_2.clone();
tokio::spawn(future::select(res.boxed(), exit).map(drop));
tokio::spawn(future::select(res.boxed(), exit).map(drop).map(|_| Ok(())).compat());
})
});
@@ -449,7 +449,7 @@ fn run_collator_node<S, E, P, Extrinsic>(
inner_exit.clone()
).map(drop);
tokio::spawn(future);
tokio::spawn(future.map(|_| Ok(())).compat());
future::ready(())
});
polkadot/erasure-coding/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-erasure-coding"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
polkadot/network/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-network"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Polkadot-specific networking protocol"
edition = "2018"
polkadot/network/src/tests/validation.rs
+4 -5
View File
@@ -35,7 +35,8 @@ use polkadot_primitives::parachain::{
use parking_lot::Mutex;
use sp_blockchain::Result as ClientResult;
use sp_api::{ApiRef, Core, RuntimeVersion, StorageProof, ApiErrorExt, ApiExt, ProvideRuntimeApi};
use sp_runtime::traits::Block as BlockT;
use sp_runtime::traits::{Block as BlockT, HasherFor, NumberFor};
use sp_state_machine::ChangesTrieState;
use std::collections::HashMap;
use std::sync::Arc;
@@ -225,12 +226,10 @@ impl ApiExt<Block> for RuntimeApi {
None
}
fn into_storage_changes<
T: sp_api::ChangesTrieStorage<sp_api::HasherFor<Block>, sp_api::NumberFor<Block>>
>(
fn into_storage_changes(
&self,
_: &Self::StateBackend,
_: Option<&T>,
_: Option<&ChangesTrieState<HasherFor<Block>, NumberFor<Block>>>,
_: <Block as sp_api::BlockT>::Hash,
) -> std::result::Result<sp_api::StorageChanges<Self::StateBackend, Block>, String>
where Self: Sized
polkadot/parachain/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-parachain"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Types and utilities for creating and working with parachains"
edition = "2018"
polkadot/parachain/src/wasm_executor/mod.rs
+1 -1
View File
@@ -156,7 +156,7 @@ pub fn validate_candidate_internal<E: Externalities + 'static>(
) -> Result<ValidationResult, Error> {
let mut ext = ValidationExternalities(ParachainExt::new(externalities));
let res = sc_executor::call_in_wasm::<_, HostFunctions>(
let res = sc_executor::call_in_wasm::<HostFunctions>(
"validate_block",
encoded_call_data,
sc_executor::WasmExecutionMethod::Interpreted,
polkadot/primitives/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-primitives"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
polkadot/rpc/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-rpc"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
polkadot/runtime/common/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-runtime-common"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
@@ -41,7 +41,7 @@ babe = { package = "pallet-babe", git = "https://github.com/paritytech/substrate
randomness-collective-flip = { package = "pallet-randomness-collective-flip", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
pallet-staking-reward-curve = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
treasury = { package = "pallet-treasury", git = "https://github.com/paritytech/substrate", default-features = false, branch = "polkadot-master" }
trie-db = "0.18.0"
trie-db = "0.19.2"
serde_json = "1.0.41"
[features]
polkadot/runtime/kusama/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "kusama-runtime"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
@@ -69,7 +69,7 @@ libsecp256k1 = "0.3.2"
tiny-keccak = "1.5.0"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
trie-db = "0.18.0"
trie-db = "0.19.2"
serde_json = "1.0.41"
[build-dependencies]
polkadot/runtime/kusama/src/lib.rs
+1 -2
View File
@@ -78,7 +78,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
impl_name: create_runtime_str!("parity-kusama"),
authoring_version: 2,
spec_version: 1041,
impl_version: 2,
impl_version: 3,
apis: RUNTIME_API_VERSIONS,
};
@@ -571,7 +571,6 @@ parameter_types! {
pub const PeriodSpend: Balance = 500 * DOLLARS;
pub const MaxLockDuration: BlockNumber = 36 * 30 * DAYS;
pub const ChallengePeriod: BlockNumber = 7 * DAYS;
pub const MaxMembers: u32 = 999;
}
impl society::Trait for Runtime {
polkadot/runtime/polkadot/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-runtime"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
build = "build.rs"
@@ -66,7 +66,7 @@ libsecp256k1 = "0.3.2"
tiny-keccak = "1.5.0"
keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
sp-trie = { git = "https://github.com/paritytech/substrate", branch = "polkadot-master" }
trie-db = "0.18.0"
trie-db = "0.19.2"
serde_json = "1.0.41"
[build-dependencies]
polkadot/service/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-service"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
polkadot/service/src/lib.rs
+4 -3
View File
@@ -21,7 +21,7 @@ pub mod chain_spec;
use futures::{
FutureExt, TryFutureExt,
task::{Spawn, SpawnError, FutureObj},
compat::Future01CompatExt,
compat::{Future01CompatExt, Stream01CompatExt},
};
use sc_client::LongestChain;
use std::sync::Arc;
@@ -455,8 +455,9 @@ pub fn new_full<Runtime, Dispatch, Extrinsic>(config: Configuration)
if authority_discovery_enabled {
let network = service.network();
let dht_event_stream = network.event_stream().filter_map(|e| async move { match e {
Event::Dht(e) => Some(e),
let network_event_stream = network.event_stream().compat();
let dht_event_stream = network_event_stream.filter_map(|e| async move { match e {
Ok(Event::Dht(e)) => Some(e),
_ => None,
}}).boxed();
let authority_discovery = authority_discovery::AuthorityDiscovery::new(
polkadot/statement-table/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-statement-table"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
polkadot/test-parachains/adder/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "adder"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which adds to a number as its state transition"
edition = "2018"
polkadot/test-parachains/halt/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "halt"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
description = "Test parachain which executes forever"
edition = "2018"
polkadot/validation/Cargo.toml
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "polkadot-validation"
version = "0.7.17"
version = "0.7.18"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"