Merge branch 'master' into aj/update-substrate-crates

subxt/Cargo.toml

@@ -13,7 +13,7 @@ description = "Submit extrinsics (transactions) to a substrate node via RPC"
 keywords = ["parity", "substrate", "blockchain"]
 
 [features]
-default = ["jsonrpsee"]
+default = ["jsonrpsee-ws"]
 
 # Activate this to expose functionality only used for integration testing.
 # The exposed functionality is subject to breaking changes at any point,
@@ -22,7 +22,8 @@ integration-tests = []
 
 # Jsonrpsee if the default RPC provider used in Subxt. However, it can be
 # swapped out for an alternative implementation, and so is optional.
-jsonrpsee = ["dep:jsonrpsee"]
+jsonrpsee-ws = ["jsonrpsee/async-client", "jsonrpsee/client-ws-transport"]
+jsonrpsee-web = ["jsonrpsee/async-wasm-client", "jsonrpsee/client-web-transport"]
 
 [dependencies]
 bitvec = { version = "1.0.0", default-features = false, features = ["alloc"] }
@@ -30,11 +31,11 @@ codec = { package = "parity-scale-codec", version = "3.0.0", default-features =
 scale-info = { version = "2.0.0", features = ["bit-vec"] }
 scale-value = "0.6.0"
 scale-decode = "0.4.0"
-futures = "0.3.13"
+futures = { version = "0.3.13", default-features = false }
 hex = "0.4.3"
-jsonrpsee = { version = "0.15.1", features = ["async-client", "client-ws-transport", "jsonrpsee-types"], optional = true }
+jsonrpsee = { version = "0.16", optional = true, features = ["jsonrpsee-types"] }
 serde = { version = "1.0.124", features = ["derive"] }
-serde_json = "1.0.64"
+serde_json = { version = "1.0.64", features = ["raw_value"] }
 thiserror = "1.0.24"
 tracing = "0.1.34"
 parking_lot = "0.12.0"
@@ -49,5 +50,8 @@ sp-runtime = { version = "6.0.0", git = "https://github.com/paritytech/substrate
 frame-metadata = "15.0.0"
 derivative = "2.2.0"
 
+[target.wasm32-unknown-unknown.dependencies]
+getrandom = { version = "0.2", features = ["js"] }
+
 [dev-dependencies]
 tokio = { version = "1.8", features = ["macros", "time", "rt-multi-thread"] }