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

Bump deps and fix build

Browse Source
This commit is contained in:
Demi M. Obenour
2020-06-25 21:14:00 -04:00
parent f15c5f6373
commit d3df9eabe0
13 changed files with 97 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.toml
+21 -21
View File
@@ -24,41 +24,41 @@ client = ["substrate-subxt-client"]
[dependencies]
log = "0.4.8"
thiserror = "1.0.20"
futures = "0.3.5"
futures = { version = "0.3.5", package = "futures" }
jsonrpsee = { version = "0.1.0", features = ["ws"] }
num-traits = { version = "0.2.12", default-features = false }
serde = { version = "1.0.114", features = ["derive"] }
serde_json = "1.0.55"
url = "2.1.1"
codec = { package = "parity-scale-codec", version = "1.3", default-features = false, features = ["derive", "full"] }
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive", "full"] }
frame-metadata = { version = "11.0.0-rc3", package = "frame-metadata" }
frame-support = { version = "2.0.0-rc3", package = "frame-support" }
sp-runtime = { version = "2.0.0-rc3", package = "sp-runtime" }
sp-version = { version = "2.0.0-rc3", package = "sp-version" }
pallet-indices = { version = "2.0.0-rc3", package = "pallet-indices" }
frame-metadata = { version = "11.0.0-rc4", package = "frame-metadata" }
frame-support = { version = "2.0.0-rc4", package = "frame-support" }
sp-runtime = { version = "2.0.0-rc4", package = "sp-runtime" }
sp-version = { version = "2.0.0-rc4", package = "sp-version" }
pallet-indices = { version = "2.0.0-rc4", package = "pallet-indices" }
hex = "0.4.2"
sp-rpc = { version = "2.0.0-rc3", package = "sp-rpc" }
sp-core = { version = "2.0.0-rc3", package = "sp-core" }
sc-rpc-api = { version = "0.8.0-rc3", package = "sc-rpc-api" }
sp-transaction-pool = { version = "2.0.0-rc3", package = "sp-transaction-pool" }
sp-rpc = { version = "2.0.0-rc4", package = "sp-rpc" }
sp-core = { version = "2.0.0-rc4", package = "sp-core" }
sc-rpc-api = { version = "0.8.0-rc4", package = "sc-rpc-api" }
sp-transaction-pool = { version = "2.0.0-rc4", package = "sp-transaction-pool" }
substrate-subxt-client = { version = "0.1.0", path = "client", optional = true }
substrate-subxt-proc-macro = { version = "0.9.0", path = "proc-macro" }
sp-std = "2.0.0-rc3"
application-crypto = { version = "2.0.0-rc3", package = "sp-application-crypto", default-features = false }
sp-finality-grandpa = { version = "2.0.0-rc3" }
sp-consensus-babe = { version = "0.8.0-rc3" }
pallet-im-online = { version = "2.0.0-rc3" }
sp-authority-discovery = { version = "2.0.0-rc3" }
pallet-staking = "2.0.0-rc3"
sp-std = "2.0.0-rc4"
application-crypto = { version = "2.0.0-rc4", package = "sp-application-crypto", default-features = false }
sp-finality-grandpa = "2.0.0-rc4"
sp-consensus-babe = "0.8.0-rc4"
pallet-im-online = "2.0.0-rc4"
sp-authority-discovery = "2.0.0-rc4"
pallet-staking = "2.0.0-rc4"
[dev-dependencies]
async-std = { version = "=1.5.0", features = ["attributes"] }
env_logger = "0.7.1"
wabt = "0.9.2"
frame-system = { version = "2.0.0-rc3", package = "frame-system" }
pallet-balances = { version = "2.0.0-rc3", package = "pallet-balances" }
sp-keyring = { version = "2.0.0-rc3", package = "sp-keyring" }
frame-system = { version = "2.0.0-rc4", package = "frame-system" }
pallet-balances = { version = "2.0.0-rc4", package = "pallet-balances" }
sp-keyring = { version = "2.0.0-rc4", package = "sp-keyring" }
substrate-subxt-client = { version = "0.1.0", path = "client" }
tempdir = "0.3.7"
test-node = { path = "test-node" }
client/Cargo.toml
+4 -4
View File
@@ -13,14 +13,14 @@ keywords = ["parity", "substrate", "blockchain"]
[dependencies]
async-std = "=1.5.0"
futures = { version = "0.3.5", features = ["compat"] }
futures = { version = "0.3.5", features = ["compat"], package = "futures" }
futures01 = { package = "futures", version = "0.1.29" }
jsonrpsee = "0.1.0"
log = "0.4.8"
sc-network = { version = "0.8.0-rc3", default-features = false }
sc-service = { version = "0.8.0-rc3", default-features = false }
sc-network = { version = "0.8.0-rc4", default-features = false }
sc-service = { version = "0.8.0-rc4", default-features = false }
serde_json = "1.0.55"
sp-keyring = "2.0.0-rc3"
sp-keyring = { version = "2.0.0-rc4", package = "sp-keyring" }
thiserror = "1.0.20"
[dev-dependencies]
client/src/lib.rs
+4 -2
View File
@@ -208,18 +208,20 @@ fn start_subxt_client<C: ChainSpec + 'static, S: AbstractService>(
impl_version: config.impl_version,
chain_spec: Box::new(config.chain_spec),
role: config.role.into(),
task_executor: std::sync::Arc::new(move |fut, ty| {
task_executor: (move |fut, ty| {
match ty {
TaskType::Async => task::spawn(fut),
TaskType::Blocking => task::spawn_blocking(|| task::block_on(fut)),
};
}),
}).into(),
database: config.db,
keystore: KeystoreConfig::InMemory,
max_runtime_instances: 8,
announce_block: true,
dev_key_seed: config.role.into(),
base_path: Default::default(),
informant_output_format: Default::default(),
telemetry_endpoints: Default::default(),
telemetry_external_transport: Default::default(),
default_heap_pages: Default::default(),
proc-macro/Cargo.toml
+2 -2
View File
@@ -25,10 +25,10 @@ synstructure = "0.12.4"
[dev-dependencies]
async-std = { version = "=1.5.0", features = ["attributes"] }
codec = { package = "parity-scale-codec", version = "1.3.0", features = ["derive"] }
codec = { package = "parity-scale-codec", version = "1.3.1", features = ["derive"] }
env_logger = "0.7.1"
pretty_assertions = "0.6.1"
sp-keyring = "2.0.0-rc3"
sp-keyring = { version = "2.0.0-rc4", package = "sp-keyring" }
substrate-subxt = { path = ".." }
trybuild = "1.0.30"
src/frame/system.rs
+2 -1
View File
@@ -30,6 +30,7 @@ use serde::de::DeserializeOwned;
use sp_runtime::{
traits::{
AtLeast32Bit,
AtLeast32BitUnsigned,
Bounded,
CheckEqual,
Extrinsic,
@@ -67,7 +68,7 @@ pub trait System {
+ MaybeSerializeDeserialize
+ Debug
+ MaybeDisplay
+ AtLeast32Bit
+ AtLeast32BitUnsigned
+ Default
+ Bounded
+ Copy
src/lib.rs
+1 -1
View File
@@ -248,7 +248,7 @@ impl<T: Runtime> Client<T> {
/// Get a block hash. By default returns the latest block hash
pub async fn block_hash(
&self,
block_number: Option<BlockNumber<T>>,
block_number: Option<BlockNumber>,
) -> Result<Option<T::Hash>, Error> {
let hash = self.rpc.block_hash(block_number).await?;
Ok(hash)
src/rpc.rs
+8 -17
View File
@@ -83,23 +83,15 @@ pub type ChainBlock<T> =
/// Wrapper for NumberOrHex to allow custom From impls
#[derive(Serialize, Debug)]
#[serde(bound = "<T as System>::BlockNumber: Serialize")]
pub struct BlockNumber<T: System>(NumberOrHex<<T as System>::BlockNumber>);
pub struct BlockNumber(NumberOrHex);
impl<T> From<NumberOrHex<<T as System>::BlockNumber>> for BlockNumber<T>
where
T: System,
{
fn from(x: NumberOrHex<<T as System>::BlockNumber>) -> Self {
impl From<NumberOrHex> for BlockNumber {
fn from(x: NumberOrHex) -> Self {
BlockNumber(x)
}
}
impl<T> From<u32> for BlockNumber<T>
where
T: System,
<T as System>::BlockNumber: From<u32>,
{
impl From<u32> for BlockNumber {
fn from(x: u32) -> Self {
NumberOrHex::Number(x.into()).into()
}
@@ -159,10 +151,9 @@ impl<T: Runtime> Rpc<T> {
}
/// Fetch the genesis hash
pub async fn genesis_hash(&self) -> Result<T::Hash, Error> {
let block_zero = Some(ListOrValue::Value(NumberOrHex::Number(
T::BlockNumber::min_value(),
)));
pub async fn genesis_hash(&self) -> Result<T::Hash, Error>
{
let block_zero = Some(ListOrValue::Value(NumberOrHex::Number(0)));
let params = Params::Array(vec![to_json_value(block_zero)?]);
let list_or_value: ListOrValue<Option<T::Hash>> =
self.client.request("chain_getBlockHash", params).await?;
@@ -198,7 +189,7 @@ impl<T: Runtime> Rpc<T> {
/// Get a block hash, returns hash of latest block by default
pub async fn block_hash(
&self,
block_number: Option<BlockNumber<T>>,
block_number: Option<BlockNumber>,
) -> Result<Option<T::Hash>, Error> {
let block_number = block_number.map(ListOrValue::Value);
let params = Params::Array(vec![to_json_value(block_number)?]);
src/runtimes.rs
+6 -9
View File
@@ -79,7 +79,6 @@ impl sp_runtime::BoundToRuntimeAppPublic for AuthorityDiscovery {
type Public = AuthorityDiscoveryId;
}
#[cfg(feature = "kusama")]
impl_opaque_keys! {
/// Substrate base runtime keys
pub struct BasicSessionKeys {
@@ -96,7 +95,6 @@ impl_opaque_keys! {
}
}
#[cfg(feature = "kusama")]
impl_opaque_keys! {
/// Polkadot/Kusama runtime keys
pub struct SessionKeys {
@@ -124,9 +122,7 @@ use crate::{
AccountData,
Balances,
},
contracts::Contracts,
sudo::Sudo,
system::System,
},
session::Session,
staking::Staking,
@@ -235,6 +231,12 @@ impl Balances for NodeTemplateRuntime {
type Balance = u128;
}
impl Session for NodeTemplateRuntime {
type SessionIndex = u32;
type ValidatorId = <Self as System>::AccountId;
type Keys = BasicSessionKeys;
}
impl Sudo for NodeTemplateRuntime {}
/// Concrete type definitions compatible with those for kusama, v0.7
@@ -243,17 +245,14 @@ impl Sudo for NodeTemplateRuntime {}
///
/// Main difference is `type Address = AccountId`.
/// Also the contracts module is not part of the kusama runtime.
#[cfg(feature = "kusama")]
#[derive(Debug, Clone, Eq, PartialEq)]
pub struct KusamaRuntime;
#[cfg(feature = "kusama")]
impl Runtime for KusamaRuntime {
type Signature = MultiSignature;
type Extra = DefaultExtra<Self>;
}
#[cfg(feature = "kusama")]
impl System for KusamaRuntime {
type Index = u32;
type BlockNumber = u32;
@@ -266,14 +265,12 @@ impl System for KusamaRuntime {
type AccountData = AccountData<<Self as Balances>::Balance>;
}
#[cfg(feature = "kusama")]
impl Session for KusamaRuntime {
type SessionIndex = u32;
type ValidatorId = <Self as System>::AccountId;
type Keys = SessionKeys;
}
#[cfg(feature = "kusama")]
impl Staking for KusamaRuntime {
type NominatorIndex = u32;
type ValidatorIndex = u16;
src/signer.rs
+1
View File
@@ -56,6 +56,7 @@ pub trait Signer<T: Runtime> {
}
/// Extrinsic signer using a private key.
#[derive(Debug)]
pub struct PairSigner<T: Runtime, P: Pair> {
account_id: T::AccountId,
nonce: Option<T::Index>,
src/subscription.rs
+1
View File
@@ -33,6 +33,7 @@ use crate::{
/// Event subscription simplifies filtering a storage change set stream for
/// events of interest.
#[allow(missing_debug_implementations)]
pub struct EventSubscription<T: Runtime> {
subscription: Subscription<StorageChangeSet<T::Hash>>,
decoder: EventsDecoder<T>,
test-node/Cargo.toml
+19 -19
View File
@@ -13,30 +13,30 @@ repository = "https://github.com/paritytech/substrate/"
targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
futures = "0.3.5"
futures = { version = "0.3.5", package = "futures" }
log = "0.4.8"
structopt = "0.3.15"
parking_lot = "0.11.0"
sc-cli = { version = "0.8.0-rc3", features = ["wasmtime"] }
sp-core = "2.0.0-rc3"
sc-executor = { version = "0.8.0-rc3", features = ["wasmtime"] }
sc-service = { version = "0.8.0-rc3", features = ["wasmtime"] }
sp-inherents = "2.0.0-rc3"
sc-transaction-pool = "2.0.0-rc3"
sp-transaction-pool = "2.0.0-rc3"
sc-network = "0.8.0-rc3"
sc-consensus-aura = "0.8.0-rc3"
sp-consensus-aura = "0.8.0-rc3"
sp-consensus = "0.8.0-rc3"
sc-consensus = "0.8.0-rc3"
sc-finality-grandpa = "0.8.0-rc3"
sp-finality-grandpa = "2.0.0-rc3"
sc-client-api = "2.0.0-rc3"
sp-runtime = "2.0.0-rc3"
sc-basic-authorship = "0.8.0-rc3"
sc-cli = { version = "0.8.0-rc4", features = ["wasmtime"] }
sp-core = { version = "2.0.0-rc4", package = "sp-core" }
sc-executor = { version = "0.8.0-rc4", features = ["wasmtime"] }
sc-service = { version = "0.8.0-rc4", features = ["wasmtime"] }
sp-inherents = "2.0.0-rc4"
sc-transaction-pool = "2.0.0-rc4"
sp-transaction-pool = { version = "2.0.0-rc4", package = "sp-transaction-pool" }
sc-network = "0.8.0-rc4"
sc-consensus-aura = "0.8.0-rc4"
sp-consensus-aura = "0.8.0-rc4"
sp-consensus = "0.8.0-rc4"
sc-consensus = "0.8.0-rc4"
sc-finality-grandpa = "0.8.0-rc4"
sp-finality-grandpa = "2.0.0-rc4"
sc-client-api = "2.0.0-rc4"
sp-runtime = { version = "2.0.0-rc4", package = "sp-runtime" }
sc-basic-authorship = "0.8.0-rc4"
test-node-runtime = { version = "2.0.0-rc3", path = "runtime" }
[build-dependencies]
substrate-build-script-utils = "2.0.0-rc3"
substrate-build-script-utils = "2.0.0-rc4"
test-node/runtime/Cargo.toml
+23 -23
View File
@@ -13,32 +13,32 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive"] }
aura = { version = "2.0.0-rc3", default-features = false, package = "pallet-aura" }
balances = { version = "2.0.0-rc3", default-features = false, package = "pallet-balances" }
frame-support = { version = "2.0.0-rc3", default-features = false }
grandpa = { version = "2.0.0-rc3", default-features = false, package = "pallet-grandpa" }
randomness-collective-flip = { version = "2.0.0-rc3", default-features = false, package = "pallet-randomness-collective-flip" }
sudo = { version = "2.0.0-rc3", default-features = false, package = "pallet-sudo" }
system = { version = "2.0.0-rc3", default-features = false, package = "frame-system" }
timestamp = { version = "2.0.0-rc3", default-features = false, package = "pallet-timestamp" }
transaction-payment = { version = "2.0.0-rc3", default-features = false, package = "pallet-transaction-payment" }
frame-executive = { version = "2.0.0-rc3", default-features = false }
aura = { version = "2.0.0-rc4", default-features = false, package = "pallet-aura" }
balances = { version = "2.0.0-rc4", default-features = false, package = "pallet-balances" }
frame-support = { version = "2.0.0-rc4", default-features = false, package = "frame-support" }
grandpa = { version = "2.0.0-rc4", default-features = false, package = "pallet-grandpa" }
randomness-collective-flip = { version = "2.0.0-rc4", default-features = false, package = "pallet-randomness-collective-flip" }
sudo = { version = "2.0.0-rc4", default-features = false, package = "pallet-sudo" }
system = { version = "2.0.0-rc4", default-features = false, package = "frame-system" }
timestamp = { version = "2.0.0-rc4", default-features = false, package = "pallet-timestamp" }
transaction-payment = { version = "2.0.0-rc4", default-features = false, package = "pallet-transaction-payment" }
frame-executive = { version = "2.0.0-rc4", default-features = false }
serde = { version = "1.0.114", optional = true, features = ["derive"] }
sp-api = { version = "2.0.0-rc3", default-features = false }
sp-block-builder = { default-features = false, version = "2.0.0-rc3" }
sp-consensus-aura = { version = "0.8.0-rc3", default-features = false }
sp-core = { version = "2.0.0-rc3", default-features = false }
sp-inherents = { default-features = false, version = "2.0.0-rc3" }
sp-io = { version = "2.0.0-rc3", default-features = false }
sp-offchain = { version = "2.0.0-rc3", default-features = false }
sp-runtime = { version = "2.0.0-rc3", default-features = false }
sp-session = { version = "2.0.0-rc3", default-features = false }
sp-std = { version = "2.0.0-rc3", default-features = false }
sp-transaction-pool = { version = "2.0.0-rc3", default-features = false }
sp-version = { version = "2.0.0-rc3", default-features = false }
sp-api = { version = "2.0.0-rc4", default-features = false }
sp-block-builder = { default-features = false, version = "2.0.0-rc4" }
sp-consensus-aura = { version = "0.8.0-rc4", default-features = false }
sp-core = { version = "2.0.0-rc4", default-features = false, package = "sp-core" }
sp-inherents = { default-features = false, version = "2.0.0-rc4" }
sp-io = { version = "2.0.0-rc4", default-features = false }
sp-offchain = { version = "2.0.0-rc4", default-features = false }
sp-runtime = { version = "2.0.0-rc4", default-features = false, package = "sp-runtime" }
sp-session = { version = "2.0.0-rc4", default-features = false }
sp-std = { version = "2.0.0-rc4", default-features = false }
sp-transaction-pool = { version = "2.0.0-rc4", default-features = false, package = "sp-transaction-pool" }
sp-version = { version = "2.0.0-rc4", default-features = false, package = "sp-version" }
[build-dependencies]
wasm-builder-runner = { version = "1.0.5", package = "substrate-wasm-builder-runner" }
wasm-builder-runner = { version = "1.0.6", package = "substrate-wasm-builder-runner" }
[features]
default = ["std"]
test-node/src/service.rs
+5 -5
View File
@@ -145,7 +145,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
})?
.build()?;
.build_light()?;
if role.is_authority() {
let proposer = sc_basic_authorship::ProposerFactory::new(
@@ -177,13 +177,13 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
// the AURA authoring task is considered essential, i.e. if it
// fails we take down the service with it.
service.spawn_essential_task("aura", aura);
service.spawn_essential_task_handle().spawn("aura", aura);
}
// if the node isn't actively participating in consensus then it doesn't
// need a keystore, regardless of which protocol we use below.
let keystore = if role.is_authority() {
Some(service.keystore())
Some(service.keystore() as _)
} else {
None
};
@@ -219,7 +219,7 @@ pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceEr
// the GRANDPA voter task is considered infallible, i.e.
// if it fails we take down the service with it.
service.spawn_essential_task(
service.spawn_essential_task_handle().spawn(
"grandpa-voter",
sc_finality_grandpa::run_grandpa_voter(grandpa_config)?,
);
@@ -299,5 +299,5 @@ pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceE
let provider = client as Arc<dyn StorageAndProofProvider<_, _>>;
Ok(Arc::new(GrandpaFinalityProofProvider::new(backend, provider)) as _)
})?
.build()
.build_light()
}