From e3db3ab30a3ca5380fec09783903d7e10797139b Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 9 Nov 2022 10:15:58 +0000 Subject: [PATCH 01/15] Patch all substrate deps to use my substrate branch --- examples/Cargo.toml | 2 +- metadata/Cargo.toml | 2 +- subxt/Cargo.toml | 5 +++-- testing/integration-tests/Cargo.toml | 6 +++--- testing/test-runtime/Cargo.toml | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index c83b4ac568..e05da93858 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,7 +14,7 @@ description = "Subxt example usage" [dev-dependencies] subxt = { path = "../subxt" } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } -sp-keyring = "6.0.0" +sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-keyring", default-features = false } futures = "0.3.13" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } hex = "0.4.3" diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index 122ec379d5..e59e493def 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -15,7 +15,7 @@ description = "Command line utilities for checking metadata compatibility betwee codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } frame-metadata = "15.0.0" scale-info = "2.0.0" -sp-core = { version = "6.0.0" } +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } [dev-dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml index 67dc9eaae1..a67951fb17 100644 --- a/subxt/Cargo.toml +++ b/subxt/Cargo.toml @@ -42,8 +42,9 @@ parking_lot = "0.12.0" subxt-macro = { version = "0.24.0", path = "../macro" } subxt-metadata = { version = "0.24.0", path = "../metadata" } -sp-core = { version = "6.0.0", default-features = false } -sp-runtime = "6.0.0" +# todo: release these from substrate and use crates.io packages +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-runtime", default-features = false } frame-metadata = "15.0.0" derivative = "2.2.0" diff --git a/testing/integration-tests/Cargo.toml b/testing/integration-tests/Cargo.toml index 2c398845a5..a0540ab6f5 100644 --- a/testing/integration-tests/Cargo.toml +++ b/testing/integration-tests/Cargo.toml @@ -22,9 +22,9 @@ futures = "0.3.13" hex = "0.4.3" regex = "1.5.0" scale-info = { version = "2.0.0", features = ["bit-vec"] } -sp-core = { version = "6.0.0", default-features = false } -sp-keyring = "6.0.0" -sp-runtime = "6.0.0" +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } +sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-keyring", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-runtime", default-features = false } syn = "1.0.0" subxt = { version = "0.24.0", path = "../../subxt" } subxt-codegen = { version = "0.24.0", path = "../../codegen" } diff --git a/testing/test-runtime/Cargo.toml b/testing/test-runtime/Cargo.toml index ba7314e55c..ddcea18c34 100644 --- a/testing/test-runtime/Cargo.toml +++ b/testing/test-runtime/Cargo.toml @@ -5,12 +5,12 @@ edition = "2021" [dependencies] subxt = { path = "../../subxt" } -sp-runtime = "6.0.0" +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-runtime", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } [build-dependencies] subxt = { path = "../../subxt" } -sp-core = "6.0.0" +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] } which = "4.2.2" jsonrpsee = { version = "0.15.1", features = ["async-client", "client-ws-transport"] } From fa68cac6ce79a4976b1d08cc4264a55ed6c90e43 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 9 Nov 2022 11:28:54 +0000 Subject: [PATCH 02/15] default-features = false causing issus in test-runtime --- testing/integration-tests/Cargo.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/integration-tests/Cargo.toml b/testing/integration-tests/Cargo.toml index a0540ab6f5..ecfcd0a5b5 100644 --- a/testing/integration-tests/Cargo.toml +++ b/testing/integration-tests/Cargo.toml @@ -22,9 +22,9 @@ futures = "0.3.13" hex = "0.4.3" regex = "1.5.0" scale-info = { version = "2.0.0", features = ["bit-vec"] } -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } -sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-keyring", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-runtime", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } +sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-keyring", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-runtime" } syn = "1.0.0" subxt = { version = "0.24.0", path = "../../subxt" } subxt-codegen = { version = "0.24.0", path = "../../codegen" } From 38dc2a15202530b734a2b88705bad17cac6c2f51 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Mon, 14 Nov 2022 11:43:34 +0000 Subject: [PATCH 03/15] Use substrate polkadot release branch --- examples/Cargo.toml | 2 +- metadata/Cargo.toml | 2 +- subxt/Cargo.toml | 4 ++-- testing/integration-tests/Cargo.toml | 6 +++--- testing/test-runtime/Cargo.toml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index e05da93858..8e5701768d 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,7 +14,7 @@ description = "Subxt example usage" [dev-dependencies] subxt = { path = "../subxt" } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } -sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-keyring", default-features = false } +sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-keyring", default-features = false } futures = "0.3.13" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } hex = "0.4.3" diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index e59e493def..f2e574957e 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -15,7 +15,7 @@ description = "Command line utilities for checking metadata compatibility betwee codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } frame-metadata = "15.0.0" scale-info = "2.0.0" -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } [dev-dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml index a67951fb17..33ce4398e7 100644 --- a/subxt/Cargo.toml +++ b/subxt/Cargo.toml @@ -43,8 +43,8 @@ subxt-macro = { version = "0.24.0", path = "../macro" } subxt-metadata = { version = "0.24.0", path = "../metadata" } # todo: release these from substrate and use crates.io packages -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-runtime", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime", default-features = false } frame-metadata = "15.0.0" derivative = "2.2.0" diff --git a/testing/integration-tests/Cargo.toml b/testing/integration-tests/Cargo.toml index ecfcd0a5b5..c6f8456e79 100644 --- a/testing/integration-tests/Cargo.toml +++ b/testing/integration-tests/Cargo.toml @@ -22,9 +22,9 @@ futures = "0.3.13" hex = "0.4.3" regex = "1.5.0" scale-info = { version = "2.0.0", features = ["bit-vec"] } -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } -sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-keyring", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-runtime" } +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } +sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-keyring", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime" } syn = "1.0.0" subxt = { version = "0.24.0", path = "../../subxt" } subxt-codegen = { version = "0.24.0", path = "../../codegen" } diff --git a/testing/test-runtime/Cargo.toml b/testing/test-runtime/Cargo.toml index ddcea18c34..185135b4a3 100644 --- a/testing/test-runtime/Cargo.toml +++ b/testing/test-runtime/Cargo.toml @@ -5,12 +5,12 @@ edition = "2021" [dependencies] subxt = { path = "../../subxt" } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-runtime", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime", default-features = false } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } [build-dependencies] subxt = { path = "../../subxt" } -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "aj/sp-runtime-parity-util-mem", package = "sp-core", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] } which = "4.2.2" jsonrpsee = { version = "0.15.1", features = ["async-client", "client-ws-transport"] } From 5f1a7176387c1052d4c75fc1ba8b16a064fc1a3a Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Mon, 14 Nov 2022 11:48:24 +0000 Subject: [PATCH 04/15] Use default-features for sp-runtime again :( --- subxt/Cargo.toml | 2 +- testing/test-runtime/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml index 9374d3435e..f5a71abd3c 100644 --- a/subxt/Cargo.toml +++ b/subxt/Cargo.toml @@ -45,7 +45,7 @@ subxt-metadata = { version = "0.24.0", path = "../metadata" } # todo: release these from substrate and use crates.io packages sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime" } frame-metadata = "15.0.0" derivative = "2.2.0" diff --git a/testing/test-runtime/Cargo.toml b/testing/test-runtime/Cargo.toml index 0428c20dde..993095d006 100644 --- a/testing/test-runtime/Cargo.toml +++ b/testing/test-runtime/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] subxt = { path = "../../subxt" } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime", default-features = false } +sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime" } codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } [build-dependencies] From 68ec1cc86763128ab138f3e216dc16728ccf956b Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Mon, 14 Nov 2022 15:47:39 +0000 Subject: [PATCH 05/15] Restore default-features for subxt-cli/sp-core --- metadata/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index f2e574957e..10f2ee0447 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -15,7 +15,7 @@ description = "Command line utilities for checking metadata compatibility betwee codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } frame-metadata = "15.0.0" scale-info = "2.0.0" -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } +sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core" } [dev-dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } From 4838ac0297e23655dcf9fb25fc2551cb53ba4587 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Mon, 14 Nov 2022 16:17:07 +0000 Subject: [PATCH 06/15] Fix module error integration test --- testing/integration-tests/src/client/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/integration-tests/src/client/mod.rs b/testing/integration-tests/src/client/mod.rs index 92cdbf2a5c..77a5a5f5e2 100644 --- a/testing/integration-tests/src/client/mod.rs +++ b/testing/integration-tests/src/client/mod.rs @@ -203,7 +203,7 @@ async fn dry_run_fails() { if let Err(sp_runtime::DispatchError::Module(module_error)) = dry_run_res { assert_eq!(module_error.index, 6); - assert_eq!(module_error.error, 2); + assert_eq!(module_error.error, [2, 0, 0, 0]); } else { panic!("expected a module error when dryrunning"); } From 996b3edd1445843651f4d300cdc69f1acbf56e20 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 15 Nov 2022 10:30:16 +0000 Subject: [PATCH 07/15] Add Send + Sync bounds to ExtrinsicEvents::iter() --- subxt/src/blocks/block_types.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subxt/src/blocks/block_types.rs b/subxt/src/blocks/block_types.rs index 3522991521..6fea58696a 100644 --- a/subxt/src/blocks/block_types.rs +++ b/subxt/src/blocks/block_types.rs @@ -223,7 +223,7 @@ impl ExtrinsicEvents { /// /// This works in the same way that [`events::Events::iter()`] does, with the /// exception that it filters out events not related to the submitted extrinsic. - pub fn iter(&self) -> impl Iterator> + '_ { + pub fn iter(&self) -> impl Iterator> + Send + Sync + 'static { self.events.iter().filter(|ev| { ev.as_ref() .map(|ev| ev.phase() == events::Phase::ApplyExtrinsic(self.idx)) From fe8b1f16810bc4f61896e7546cffcf8175442d9e Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 15 Nov 2022 10:31:26 +0000 Subject: [PATCH 08/15] Elide lifetime --- subxt/src/blocks/block_types.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subxt/src/blocks/block_types.rs b/subxt/src/blocks/block_types.rs index 6fea58696a..959ef488e2 100644 --- a/subxt/src/blocks/block_types.rs +++ b/subxt/src/blocks/block_types.rs @@ -223,7 +223,7 @@ impl ExtrinsicEvents { /// /// This works in the same way that [`events::Events::iter()`] does, with the /// exception that it filters out events not related to the submitted extrinsic. - pub fn iter(&self) -> impl Iterator> + Send + Sync + 'static { + pub fn iter(&self) -> impl Iterator> + Send + Sync + '_ { self.events.iter().filter(|ev| { ev.as_ref() .map(|ev| ev.phase() == events::Phase::ApplyExtrinsic(self.idx)) From 313d23b3499cb39e6bc7473048f4aa1954f62311 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 15 Nov 2022 10:37:40 +0000 Subject: [PATCH 09/15] Revert adding Send + Sync --- subxt/src/blocks/block_types.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subxt/src/blocks/block_types.rs b/subxt/src/blocks/block_types.rs index 959ef488e2..3522991521 100644 --- a/subxt/src/blocks/block_types.rs +++ b/subxt/src/blocks/block_types.rs @@ -223,7 +223,7 @@ impl ExtrinsicEvents { /// /// This works in the same way that [`events::Events::iter()`] does, with the /// exception that it filters out events not related to the submitted extrinsic. - pub fn iter(&self) -> impl Iterator> + Send + Sync + '_ { + pub fn iter(&self) -> impl Iterator> + '_ { self.events.iter().filter(|ev| { ev.as_ref() .map(|ev| ev.phase() == events::Phase::ApplyExtrinsic(self.idx)) From 1d5674ee5141c7ebde168768ff0b66387f91f533 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 15 Nov 2022 10:38:33 +0000 Subject: [PATCH 10/15] Add Sync bound to Rpc::ClientError --- subxt/src/error.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subxt/src/error.rs b/subxt/src/error.rs index 0d91adbab5..dd87277646 100644 --- a/subxt/src/error.rs +++ b/subxt/src/error.rs @@ -112,7 +112,7 @@ pub enum RpcError { // Dev note: We need the error to be safely sent between threads // for `subscribe_to_block_headers_filling_in_gaps` and friends. /// Error related to the RPC client. - ClientError(Box), + ClientError(Box), /// The RPC subscription dropped. SubscriptionDropped, } From bd7a4631fd06bdb5c993aba6a57aa3a818b1e078 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Tue, 15 Nov 2022 12:59:36 +0000 Subject: [PATCH 11/15] Remove version in subxt-metadata --- metadata/Cargo.toml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index 10f2ee0447..0ad5ca5c78 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -15,7 +15,8 @@ description = "Command line utilities for checking metadata compatibility betwee codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } frame-metadata = "15.0.0" scale-info = "2.0.0" -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core" } +# todo: update to released version when available +sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core" } [dev-dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } From c8b1718853ea6e7e011eb5030061b619bb450d94 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 16 Nov 2022 09:11:16 +0000 Subject: [PATCH 12/15] Use released crates --- examples/Cargo.toml | 1 + metadata/Cargo.toml | 3 +-- subxt/Cargo.toml | 5 ++--- testing/integration-tests/Cargo.toml | 5 +++-- testing/test-runtime/Cargo.toml | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 8e5701768d..3aeecc1ca5 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,6 +14,7 @@ description = "Subxt example usage" [dev-dependencies] subxt = { path = "../subxt" } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } +# todo: release and update sp-keyring sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-keyring", default-features = false } futures = "0.3.13" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index 0ad5ca5c78..a9a39ea213 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -15,8 +15,7 @@ description = "Command line utilities for checking metadata compatibility betwee codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full"] } frame-metadata = "15.0.0" scale-info = "2.0.0" -# todo: update to released version when available -sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core" } +sp-core = "7.0.0" [dev-dependencies] bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] } diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml index f5a71abd3c..ffdd6facbe 100644 --- a/subxt/Cargo.toml +++ b/subxt/Cargo.toml @@ -43,9 +43,8 @@ parking_lot = "0.12.0" subxt-macro = { version = "0.24.0", path = "../macro" } subxt-metadata = { version = "0.24.0", path = "../metadata" } -# todo: release these from substrate and use crates.io packages -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime" } +sp-core = { version = "7.0.0", default-features = false } +sp-runtime = "7.0.0" frame-metadata = "15.0.0" derivative = "2.2.0" diff --git a/testing/integration-tests/Cargo.toml b/testing/integration-tests/Cargo.toml index c6f8456e79..f0e2760f4e 100644 --- a/testing/integration-tests/Cargo.toml +++ b/testing/integration-tests/Cargo.toml @@ -22,9 +22,10 @@ futures = "0.3.13" hex = "0.4.3" regex = "1.5.0" scale-info = { version = "2.0.0", features = ["bit-vec"] } -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } +sp-core = { version = "7.0.0", default-features = false } +# todo: release and update sp-keyring sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-keyring", default-features = false } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime" } +sp-runtime = "7.0.0" syn = "1.0.0" subxt = { version = "0.24.0", path = "../../subxt" } subxt-codegen = { version = "0.24.0", path = "../../codegen" } diff --git a/testing/test-runtime/Cargo.toml b/testing/test-runtime/Cargo.toml index 993095d006..083b7db003 100644 --- a/testing/test-runtime/Cargo.toml +++ b/testing/test-runtime/Cargo.toml @@ -5,12 +5,12 @@ edition = "2021" [dependencies] subxt = { path = "../../subxt" } -sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-runtime" } +sp-runtime = "7.0.0" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } [build-dependencies] subxt = { path = "../../subxt" } -sp-core = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-core", default-features = false } +sp-core = { version = "7.0.0", default-features = false } tokio = { version = "1.8", features = ["macros", "rt-multi-thread"] } which = "4.2.2" jsonrpsee = { version = "0.16.0", features = ["async-client", "client-ws-transport"] } From 71c25ba7f15b4b5cda662d5386b09ee128e223ff Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 16 Nov 2022 10:12:17 +0000 Subject: [PATCH 13/15] Use released sp-keyring --- examples/Cargo.toml | 3 +-- testing/integration-tests/Cargo.toml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 3aeecc1ca5..841cde5f1e 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,8 +14,7 @@ description = "Subxt example usage" [dev-dependencies] subxt = { path = "../subxt" } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } -# todo: release and update sp-keyring -sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-keyring", default-features = false } +sp-keyring = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false } futures = "0.3.13" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } hex = "0.4.3" diff --git a/testing/integration-tests/Cargo.toml b/testing/integration-tests/Cargo.toml index f0e2760f4e..4ea134cd66 100644 --- a/testing/integration-tests/Cargo.toml +++ b/testing/integration-tests/Cargo.toml @@ -23,8 +23,7 @@ hex = "0.4.3" regex = "1.5.0" scale-info = { version = "2.0.0", features = ["bit-vec"] } sp-core = { version = "7.0.0", default-features = false } -# todo: release and update sp-keyring -sp-keyring = { version = "6.0.0", git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.33", package = "sp-keyring", default-features = false } +sp-keyring = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false } sp-runtime = "7.0.0" syn = "1.0.0" subxt = { version = "0.24.0", path = "../../subxt" } From c05e6204a075d0e35fcc4f5175a55b692dad1006 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 16 Nov 2022 10:16:06 +0000 Subject: [PATCH 14/15] Fix sp-keyring deps --- examples/Cargo.toml | 2 +- testing/integration-tests/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index 841cde5f1e..c35a8fbc35 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,7 +14,7 @@ description = "Subxt example usage" [dev-dependencies] subxt = { path = "../subxt" } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } -sp-keyring = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false } +sp-keyring = { version = "7.0.0", default-features = false } futures = "0.3.13" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } hex = "0.4.3" diff --git a/testing/integration-tests/Cargo.toml b/testing/integration-tests/Cargo.toml index 4ea134cd66..32df3cd8a4 100644 --- a/testing/integration-tests/Cargo.toml +++ b/testing/integration-tests/Cargo.toml @@ -23,7 +23,7 @@ hex = "0.4.3" regex = "1.5.0" scale-info = { version = "2.0.0", features = ["bit-vec"] } sp-core = { version = "7.0.0", default-features = false } -sp-keyring = { version = "7.0.0", git = "https://github.com/paritytech/substrate", default-features = false } +sp-keyring = { version = "7.0.0", default-features = false } sp-runtime = "7.0.0" syn = "1.0.0" subxt = { version = "0.24.0", path = "../../subxt" } From 20a6b27cf252783d848a1858027249a4c0080ed2 Mon Sep 17 00:00:00 2001 From: Andrew Jones Date: Wed, 16 Nov 2022 10:51:01 +0000 Subject: [PATCH 15/15] Remove unnecessary sp-keyring default-features = false --- examples/Cargo.toml | 2 +- testing/integration-tests/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/Cargo.toml b/examples/Cargo.toml index c35a8fbc35..beda15fc5a 100644 --- a/examples/Cargo.toml +++ b/examples/Cargo.toml @@ -14,7 +14,7 @@ description = "Subxt example usage" [dev-dependencies] subxt = { path = "../subxt" } tokio = { version = "1.8", features = ["rt-multi-thread", "macros", "time"] } -sp-keyring = { version = "7.0.0", default-features = false } +sp-keyring = "7.0.0" futures = "0.3.13" codec = { package = "parity-scale-codec", version = "3.0.0", default-features = false, features = ["derive", "full", "bit-vec"] } hex = "0.4.3" diff --git a/testing/integration-tests/Cargo.toml b/testing/integration-tests/Cargo.toml index 32df3cd8a4..1e0c2e0c53 100644 --- a/testing/integration-tests/Cargo.toml +++ b/testing/integration-tests/Cargo.toml @@ -23,7 +23,7 @@ hex = "0.4.3" regex = "1.5.0" scale-info = { version = "2.0.0", features = ["bit-vec"] } sp-core = { version = "7.0.0", default-features = false } -sp-keyring = { version = "7.0.0", default-features = false } +sp-keyring = "7.0.0" sp-runtime = "7.0.0" syn = "1.0.0" subxt = { version = "0.24.0", path = "../../subxt" }