From 4e87ded4ff87d5fc457c8049fbcde848e1d8db19 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 12 Jan 2021 10:09:40 +0000 Subject: [PATCH 1/7] Upgrade dependencies, bumps substrate to 2.0.1 --- Cargo.toml | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index bbf4508748..1a2297e142 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,39 +24,39 @@ client = ["substrate-subxt-client"] integration-tests = [] [dependencies] -log = "0.4.11" -thiserror = "1.0.20" -futures = "0.3.5" +log = "0.4.13" +thiserror = "1.0.23" +futures = "0.3.9" jsonrpsee = { version = "0.1.0", features = ["ws"] } -num-traits = { version = "0.2.12", default-features = false } -serde = { version = "1.0.115", features = ["derive"] } -serde_json = "1.0.57" -url = "2.1.1" -codec = { package = "parity-scale-codec", version = "1.3.5", default-features = false, features = ["derive", "full"] } - -frame-metadata = { version = "12", package = "frame-metadata" } -frame-support = { version = "2.0.0", package = "frame-support" } -sp-runtime = { version = "2.0.0", package = "sp-runtime" } -sp-version = { version = "2.0.0", package = "sp-version" } -pallet-indices = { version = "2.0.0", package = "pallet-indices" } +num-traits = { version = "0.2.14", default-features = false } +serde = { version = "1.0.119", features = ["derive"] } +serde_json = "1.0.61" +url = "2.2.0" +codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive", "full"] } + +frame-metadata = { version = "12.0.1", package = "frame-metadata" } +frame-support = { version = "2.0.1", package = "frame-support" } +sp-runtime = { version = "2.0.1", package = "sp-runtime" } +sp-version = { version = "2.0.1", package = "sp-version" } +pallet-indices = { version = "2.0.1", package = "pallet-indices" } hex = "0.4.2" -sp-std = "2.0.0" -application-crypto = { version = "2.0.0", package = "sp-application-crypto" } -pallet-staking = "2.0.0" +sp-std = "2.0.1" +application-crypto = { version = "2.0.1", package = "sp-application-crypto" } +pallet-staking = "2.0.1" -sp-rpc = { version = "2.0.0", package = "sp-rpc" } -sp-core = { version = "2.0.0", package = "sp-core" } +sp-rpc = { version = "2.0.1", package = "sp-rpc" } +sp-core = { version = "2.0.1", package = "sp-core" } substrate-subxt-client = { version = "0.5.0", path = "client", optional = true } substrate-subxt-proc-macro = { version = "0.13.0", path = "proc-macro" } [dev-dependencies] -async-std = { version = "1.6.4", features = ["attributes"] } -env_logger = "0.7.1" -frame-system = { version = "2.0.0", package = "frame-system" } -pallet-balances = { version = "2.0.0", package = "pallet-balances" } -sp-keyring = { version = "2.0.0", package = "sp-keyring" } +async-std = { version = "1.8.0", features = ["attributes"] } +env_logger = "0.8.2" +frame-system = { version = "2.0.1", package = "frame-system" } +pallet-balances = { version = "2.0.1", package = "pallet-balances" } +sp-keyring = { version = "2.0.1", package = "sp-keyring" } substrate-subxt-client = { version = "0.5.0", path = "client" } tempdir = "0.3.7" test-node = { path = "test-node" } wabt = "0.10.0" -assert_matches = "1.3" +assert_matches = "1.4.0" From c2303733d63ff25dab31666c9ce4cde56ee8eb10 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 12 Jan 2021 10:19:17 +0000 Subject: [PATCH 2/7] Upgrade test-node dependencies --- test-node/Cargo.toml | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/test-node/Cargo.toml b/test-node/Cargo.toml index 3ad5623242..b40b2bff5d 100644 --- a/test-node/Cargo.toml +++ b/test-node/Cargo.toml @@ -13,30 +13,30 @@ repository = "https://github.com/paritytech/substrate/" targets = ["x86_64-unknown-linux-gnu"] [dependencies] -futures = "0.3.5" -log = "0.4.11" -structopt = "0.3.17" -parking_lot = "0.11.0" +futures = "0.3.9" +log = "0.4.13" +structopt = "0.3.21" +parking_lot = "0.11.1" -sc-cli = { version = "0.8.0", features = ["wasmtime"] } -sp-core = "2.0.0" -sc-executor = { version = "0.8.0", features = ["wasmtime"] } -sc-service = { version = "0.8.0", features = ["wasmtime"] } -sp-inherents = "2.0.0" -sc-transaction-pool = "2.0.0" -sp-transaction-pool = "2.0.0" -sc-network = "0.8.0" -sc-consensus-aura = "0.8.0" -sp-consensus-aura = "0.8.0" -sp-consensus = "0.8.0" -sc-consensus = "0.8.0" -sc-finality-grandpa = "0.8.0" -sp-finality-grandpa = "2.0.0" -sc-client-api = "2.0.0" -sp-runtime = "2.0.0" -sc-basic-authorship = "0.8.0" +sc-cli = { version = "0.8.1", features = ["wasmtime"] } +sp-core = "2.0.1" +sc-executor = { version = "0.8.1", features = ["wasmtime"] } +sc-service = { version = "0.8.1", features = ["wasmtime"] } +sp-inherents = "2.0.1" +sc-transaction-pool = "2.0.1" +sp-transaction-pool = "2.0.1" +sc-network = "0.8.1" +sc-consensus-aura = "0.8.1" +sp-consensus-aura = "0.8.1" +sp-consensus = "0.8.1" +sc-consensus = "0.8.1" +sc-finality-grandpa = "0.8.1" +sp-finality-grandpa = "2.0.1" +sc-client-api = "2.0.1" +sp-runtime = "2.0.1" +sc-basic-authorship = "0.8.1" test-node-runtime = { path = "runtime" } [build-dependencies] -substrate-build-script-utils = "2.0.0" +substrate-build-script-utils = "2.0.1" From c33683ffb6879551e73520abaaa80584f3c9bb6f Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 12 Jan 2021 10:19:35 +0000 Subject: [PATCH 3/7] Upgrade client dependencies --- client/Cargo.toml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/client/Cargo.toml b/client/Cargo.toml index ad62fc805a..7729bedf99 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -12,20 +12,20 @@ description = "Embed a substrate node into your subxt application." keywords = ["parity", "substrate", "blockchain"] [dependencies] -async-std = "1.6.4" -futures = { version = "0.3.5", features = ["compat"] } -futures01 = { package = "futures", version = "0.1.29" } +async-std = "1.8.0" +futures = { version = "0.3.9", features = ["compat"], package = "futures" } +futures01 = { package = "futures", version = "0.3.9" } jsonrpsee = "0.1.0" -log = "0.4.11" -sc-network = { version = "0.8.0", default-features = false } -sc-service = { version = "0.8.0", default-features = false } -serde_json = "1.0.57" -sp-keyring = "2.0.0" -thiserror = "1.0.20" +log = "0.4.13" +sc-network = { version = "0.8.1", default-features = false } +sc-service = { version = "0.8.1", default-features = false } +serde_json = "1.0.61" +sp-keyring = "2.0.1" +thiserror = "1.0.23" [dev-dependencies] -async-std = { version = "1.6.4", features = ["attributes"] } -env_logger = "0.7.1" +async-std = { version = "1.8.0", features = ["attributes"] } +env_logger = "0.8.2" substrate-subxt = { path = ".." } tempdir = "0.3.7" test-node = { path = "../test-node" } From c67c4f4bfef6444669e32cf699fd3a253fa872ec Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 12 Jan 2021 10:20:03 +0000 Subject: [PATCH 4/7] Upgrade proc-macro dependencies --- proc-macro/Cargo.toml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/proc-macro/Cargo.toml b/proc-macro/Cargo.toml index 21bdcc2fd2..864e70a4f4 100644 --- a/proc-macro/Cargo.toml +++ b/proc-macro/Cargo.toml @@ -15,22 +15,22 @@ description = "Derive calls, events, storage and tests for interacting Substrate proc-macro = true [dependencies] -heck = "0.3.1" -proc-macro2 = "1.0.19" +heck = "0.3.2" +proc-macro2 = "1.0.24" proc-macro-crate = "0.1.5" proc-macro-error = "1.0.4" -quote = "1.0.7" -syn = "1.0.38" +quote = "1.0.8" +syn = "1.0.58" synstructure = "0.12.4" [dev-dependencies] -async-std = { version = "1.6.4", features = ["attributes"] } -codec = { package = "parity-scale-codec", version = "1.3.5", features = ["derive"] } -env_logger = "0.7.1" +async-std = { version = "1.8.0", features = ["attributes"] } +codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] } +env_logger = "0.8.2" pretty_assertions = "0.6.1" -sp-keyring = "2.0.0" +sp-keyring = "2.0.1" substrate-subxt = { path = ".." } -trybuild = "1.0.32" +trybuild = "1.0.38" [[test]] name = "balances" From 84eb1af679e15f8e6df5056771e4b52b78becb9d Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 12 Jan 2021 10:22:32 +0000 Subject: [PATCH 5/7] Revert futures01 dependency --- client/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/Cargo.toml b/client/Cargo.toml index 7729bedf99..a0407a477e 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -14,7 +14,7 @@ keywords = ["parity", "substrate", "blockchain"] [dependencies] async-std = "1.8.0" futures = { version = "0.3.9", features = ["compat"], package = "futures" } -futures01 = { package = "futures", version = "0.3.9" } +futures01 = { package = "futures", version = "0.1.29" } jsonrpsee = "0.1.0" log = "0.4.13" sc-network = { version = "0.8.1", default-features = false } From 2324a5998309f332546ec906543af6b3b482d20a Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Thu, 14 Jan 2021 15:33:06 +0000 Subject: [PATCH 6/7] Upgrade futures --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 1a2297e142..eef725df50 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,7 +26,7 @@ integration-tests = [] [dependencies] log = "0.4.13" thiserror = "1.0.23" -futures = "0.3.9" +futures = "0.3.10" jsonrpsee = { version = "0.1.0", features = ["ws"] } num-traits = { version = "0.2.14", default-features = false } serde = { version = "1.0.119", features = ["derive"] } From bc9670bf5111fe4f334daa7e184308c8117ef8c6 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Thu, 14 Jan 2021 16:29:43 +0000 Subject: [PATCH 7/7] Remove redundant package specifiers --- Cargo.toml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index eef725df50..d35802bd37 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,11 +34,11 @@ serde_json = "1.0.61" url = "2.2.0" codec = { package = "parity-scale-codec", version = "1.3.6", default-features = false, features = ["derive", "full"] } -frame-metadata = { version = "12.0.1", package = "frame-metadata" } -frame-support = { version = "2.0.1", package = "frame-support" } -sp-runtime = { version = "2.0.1", package = "sp-runtime" } -sp-version = { version = "2.0.1", package = "sp-version" } -pallet-indices = { version = "2.0.1", package = "pallet-indices" } +frame-metadata = "12.0.1" +frame-support = "2.0.1" +sp-runtime = "2.0.1" +sp-version = "2.0.1" +pallet-indices = "2.0.1" hex = "0.4.2" sp-std = "2.0.1" application-crypto = { version = "2.0.1", package = "sp-application-crypto" } @@ -52,9 +52,9 @@ substrate-subxt-proc-macro = { version = "0.13.0", path = "proc-macro" } [dev-dependencies] async-std = { version = "1.8.0", features = ["attributes"] } env_logger = "0.8.2" -frame-system = { version = "2.0.1", package = "frame-system" } -pallet-balances = { version = "2.0.1", package = "pallet-balances" } -sp-keyring = { version = "2.0.1", package = "sp-keyring" } +frame-system = "2.0.1" +pallet-balances = "2.0.1" +sp-keyring = "2.0.1" substrate-subxt-client = { version = "0.5.0", path = "client" } tempdir = "0.3.7" test-node = { path = "test-node" }