Skip to content

feat: add embedded client back in #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sander2 wants to merge 2 commits into from
Closed

feat: add embedded client back in #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
324f4c0
feat: add embedded client back in
sander2 Nov 11, 2021
e064a1a
disable broken rustfmt license check
sander2 Nov 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ format_code_in_doc_comments = false
comment_width = 80
normalize_comments = true # changed
normalize_doc_attributes = false
license_template_path = "FILE_TEMPLATE" # changed
Copy link
Contributor Author

@sander2 sander2 Nov 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had to disable this, because this feature is kind of broken. I kept getting license check failed from rustfmt even after doing cat FILE_TEMPLATE src/client.rs > /tmp/f && mv /tmp/f src/client.rs

format_strings = false
format_macro_matchers = false
format_macro_bodies = true
Expand Down
12 changes: 11 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[workspace]
members = [".", "cli", "codegen", "macro"]
members = [".", "cli", "codegen", "macro", "client"]

[package]
name = "subxt"
Expand All @@ -16,6 +16,10 @@ description = "Submit extrinsics (transactions) to a substrate node via RPC"
keywords = ["parity", "substrate", "blockchain"]
include = ["Cargo.toml", "src/**/*.rs", "README.md", "LICENSE"]

[features]
default = ["client"]
client = ["subxt-client"]

[dependencies]
async-trait = "0.1.49"
bitvec = { version = "0.20.1", default-features = false, features = ["alloc"] }
Expand All @@ -36,6 +40,7 @@ thiserror = "1.0.24"
url = "2.2.1"

subxt-macro = { version = "0.1.0", path = "macro" }
subxt-client = { version = "0.1.0", path = "client", optional = true }

sp-arithmetic = { package = "sp-arithmetic", git = "https://github.com/paritytech/substrate/", branch = "master" }
sp-core = { package = "sp-core", git = "https://github.com/paritytech/substrate/", branch = "master" }
Expand All @@ -54,3 +59,8 @@ which = "4.0.2"

sp-keyring = { package = "sp-keyring", git = "https://github.com/paritytech/substrate/", branch = "master" }

tokio = { version = "1.13", features = ["time", "rt-multi-thread"] }
node-cli = { git = "https://github.com/paritytech/substrate.git", branch = "master" }

subxt-client = { version = "0.1.0", path = "client" }

42 changes: 42 additions & 0 deletions client/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
[package]
name = "subxt-client"
version = "0.1.0"
authors = [
"David Craven <[email protected]>",
"Parity Technologies <[email protected]>",
]
edition = "2018"

license = "GPL-3.0"
repository = "https://github.com/paritytech/substrate-subxt"
documentation = "https://docs.rs/substrate-subxt-client"
homepage = "https://www.parity.io/"
description = "Embed a substrate node into your subxt application."
keywords = ["parity", "substrate", "blockchain"]

[dependencies]
async-std = "1.8.0"
futures = { version = "0.3.9", features = ["compat"], package = "futures" }
futures01 = { package = "futures", version = "0.1.29" }
jsonrpsee-types = "0.4.1"
log = "0.4.13"
serde_json = "1.0.61"
thiserror = "1.0.23"

sc-client-db = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sp-keyring = { git = "https://github.com/paritytech/substrate.git", branch = "master" }
sc-network = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false }
sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false }

tokio = { version = "1.10", features = ["time", "rt-multi-thread"] }

[target.'cfg(target_arch="x86_64")'.dependencies]
sc-service = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false, features = [
"wasmtime",
] }

[dev-dependencies]
async-std = { version = "1.8.0", features = ["attributes"] }
env_logger = "0.8.2"
node-cli = { git = "https://github.com/paritytech/substrate.git", branch = "master", default-features = false }
tempdir = "0.3.7"
Loading