Add Web Feature to Subxt Codegen (#1175)

* add web feature to subxt codegen * add getrandom * remove compile error * metadata: Generate runtime outer enums if not present in V14 (#1174) * metadata: Extend outer enum generation for V14 Signed-off-by: Alexandru Vasile <[email protected]> * metadata: Generate outer enums if not present Signed-off-by: Alexandru Vasile <[email protected]> * metadata: Porpagate v14 error instead of panic Signed-off-by: Alexandru Vasile <[email protected]> * metadata: Try to find `RuntimeCall` then `Call` enums Signed-off-by: Alexandru Vasile <[email protected]> * metadata: Ensure the returned type is variant for outer enums Signed-off-by: Alexandru Vasile <[email protected]> * metadata: Replace or with or_else Signed-off-by: Alexandru Vasile <[email protected]> * metadata: Apply clippy Signed-off-by: Alexandru Vasile <[email protected]> * metadata: Return error and generate only `RuntimeError` Signed-off-by: Alexandru Vasile <[email protected]> * metadata: Remove modified path Signed-off-by: Alexandru Vasile <[email protected]> * metadata/tests: Check missing runtime types Signed-off-by: Alexandru Vasile <[email protected]> --------- Signed-off-by: Alexandru Vasile <[email protected]> * add empty use of getrandom --------- Signed-off-by: Alexandru Vasile <[email protected]> Co-authored-by: Alexandru Vasile <[email protected]> Co-authored-by: James Wilson <[email protected]>
paritytech · Sep 26, 2023 · cd5060a · cd5060a
1 parent 0956b40
commit cd5060a
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
@@ -15,6 +15,7 @@ description = "Generate an API for interacting with a substrate node from FRAME
 [features]
 default = ["fetch-metadata"]
 fetch-metadata = ["dep:jsonrpsee", "dep:tokio", "dep:frame-metadata"]
+web = ["jsonrpsee?/async-wasm-client", "jsonrpsee?/client-web-transport", "getrandom/js"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", workspace = true, features = ["derive"] }
@@ -30,6 +31,9 @@ hex = { workspace = true }
 tokio = { workspace = true, features = ["rt-multi-thread"], optional = true }
 thiserror = { workspace = true }
 
+# Included if "web" feature is enabled, to enable its js feature.
+getrandom = { workspace = true, optional = true }
+
 [dev-dependencies]
 bitvec = { workspace = true }
 scale-info = { workspace = true, features = ["bit-vec"] }

diff --git a/codegen/src/lib.rs b/codegen/src/lib.rs
@@ -53,8 +53,8 @@ mod types;
 #[cfg(feature = "fetch-metadata")]
 pub mod utils;
 
-#[cfg(all(feature = "web", feature = "fetch-metadata"))]
-compile_error!("subxt-codegen: the features 'web' and 'fetch_metadata' cannot be used together.");
+#[cfg(feature = "web")]
+use getrandom as _;
 
 pub use self::{
     api::{GenerateRuntimeApi, RuntimeGenerator},

diff --git a/macro/Cargo.toml b/macro/Cargo.toml
@@ -13,6 +13,9 @@ documentation.workspace = true
 homepage.workspace = true
 description = "Generate types and helpers for interacting with Substrate runtimes."
 
+[features]
+web = ["subxt-codegen/web"]
+
 [lib]
 proc-macro = true
 

diff --git a/subxt/Cargo.toml b/subxt/Cargo.toml
@@ -29,7 +29,7 @@ native = [
 
 # Enable this for web/wasm builds.
 # Exactly 1 of "web" and "native" is expected.
-web = ["jsonrpsee?/async-wasm-client", "jsonrpsee?/client-web-transport", "getrandom/js", "subxt-lightclient?/web"]
+web = ["jsonrpsee?/async-wasm-client", "jsonrpsee?/client-web-transport", "getrandom/js", "subxt-lightclient?/web", "subxt-macro/web"]
 
 # Enable this to use jsonrpsee (allowing for example `OnlineClient::from_url`).
 jsonrpsee = ["dep:jsonrpsee"]