Merge branch 'master' into staking

This commit is contained in:
Demi M. Obenour
2020-08-05 12:57:15 -04:00
19 changed files with 872 additions and 498 deletions
+29 -15
View File
@@ -3,7 +3,7 @@ members = [".", "client", "proc-macro", "test-node"]
[package]
name = "substrate-subxt"
version = "0.10.1"
version = "0.11.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2018"
@@ -22,22 +22,23 @@ default = ["kusama"]
client = ["substrate-subxt-client"]
[dependencies]
log = "0.4.8"
log = "0.4.11"
thiserror = "1.0.20"
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"
serde_json = "1.0.56"
url = "2.1.1"
codec = { package = "parity-scale-codec", version = "1.3.1", default-features = false, features = ["derive", "full"] }
codec = { package = "parity-scale-codec", version = "1.3.4", default-features = false, features = ["derive", "full"] }
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" }
frame-metadata = { version = "11.0.0-rc5", package = "frame-metadata" }
frame-support = { version = "2.0.0-rc5", package = "frame-support" }
sp-runtime = { version = "2.0.0-rc5", package = "sp-runtime" }
sp-version = { version = "2.0.0-rc5", package = "sp-version" }
pallet-indices = { version = "2.0.0-rc5", package = "pallet-indices" }
hex = "0.4.2"
<<<<<<< HEAD
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" }
@@ -54,15 +55,25 @@ pallet-staking = "2.0.0-rc4"
[dev-dependencies]
async-std = { version = "1.5.0", features = ["attributes"] }
=======
sp-rpc = { version = "2.0.0-rc5", package = "sp-rpc" }
sp-core = { version = "2.0.0-rc5", package = "sp-core" }
sc-rpc-api = { version = "0.8.0-rc5", package = "sc-rpc-api" }
sp-transaction-pool = { version = "2.0.0-rc5", package = "sp-transaction-pool" }
substrate-subxt-client = { version = "0.3.0", path = "client", optional = true }
substrate-subxt-proc-macro = { version = "0.11.0", path = "proc-macro" }
[dev-dependencies]
async-std = { version = "1.6.2", features = ["attributes"] }
>>>>>>> master
env_logger = "0.7.1"
wabt = "0.9.2"
wabt-sys = "=0.7.1" # pinned because 0.7.2 fails to compile
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.2.0", path = "client" }
frame-system = { version = "2.0.0-rc5", package = "frame-system" }
pallet-balances = { version = "2.0.0-rc5", package = "pallet-balances" }
sp-keyring = { version = "2.0.0-rc5", package = "sp-keyring" }
substrate-subxt-client = { version = "0.3.0", path = "client" }
tempdir = "0.3.7"
test-node = { path = "test-node" }
<<<<<<< HEAD
[patch.crates-io]
frame-metadata = { git = "https://github.com/paritytech/substrate", package = "frame-metadata" }
@@ -85,3 +96,6 @@ sc-service = { git = "https://github.com/paritytech/substrate" }
sc-cli = { git = "https://github.com/paritytech/substrate" }
sc-transaction-pool = { git = "https://github.com/paritytech/substrate" }
jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee" }
=======
wabt = "0.10.0"
>>>>>>> master