Update subxt and generate metadatav15 (#134)

Co-authored-by: shekohex <dev+github@shadykhalifa.me>
tangle-network · May 17, 2023 · 7855e64 · 7855e64
1 parent ce757c5
commit 7855e64
Show file tree

Hide file tree

Showing 12 changed files with 45,101 additions and 83,610 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ thiserror = "1"
 
 [package]
 name = "webb"
-version = "0.5.22"
+version = "0.5.23"
 description = "Webb SDK"
 keywords = ["webb", "sdk", "blockchain", "webb-tools"]
 include = ["Cargo.toml", "contracts/", "metadata/", "src/**/*.rs", "build.rs", "README.md", "LICENSE"]
@@ -31,13 +31,13 @@ documentation = { workspace = true }
 homepage = { workspace = true }
 
 [workspace]
-members = [".", "proposals", "bridge-proofs", "evm-test-utils"]
+members = [".", "proposals", "bridge-proofs"]
 
 [dependencies]
 # Substrate crates.
 scale = { package = "parity-scale-codec", version = "3", default-features = false, optional = true }
 scale-info = { workspace = true, optional = true }
-subxt = { version = "0.27", optional = true }
+subxt = { git = "https://github.com/paritytech/subxt.git", branch = "master", optional = true }
 async-trait = "0.1"
 rand = { version = "0.8", default-features = false, features = ["getrandom"] }
 thiserror = "1.0.38"
@@ -59,10 +59,10 @@ sp-keyring = "18.0.0"
 serde_json = "1"
 tempfile = "3.3"
 ethers = { workspace = true, default-features = false, optional = true, features = ["legacy", "abigen"] }
-syn = { version = "1.0.107", optional = true }
+syn = { version = "2.0.15", optional = true }
 scale = { package = "parity-scale-codec", version = "3", default-features = false, optional = true }
-frame-metadata = { version = "15.0.0", optional = true, features = ["v14", "std"] }
-subxt-codegen = { version = "0.27", optional = true }
+frame-metadata = { version = "15.1.0", optional = true, features = ["v14", "std"] }
+subxt-codegen = { git = "https://github.com/paritytech/subxt.git", branch = "master", optional = true }
 
 [features]
 default = ["substrate-runtime", "evm-runtime"]

diff --git a/build.rs b/build.rs
@@ -180,43 +180,33 @@ mod substrate {
             pub mod api {}
         );
         // Default type substitutes.
-        let substs = TypeSubstitutes::new(&CratePath::default());
+        let substs =
+            TypeSubstitutes::with_default_substitutes(&CratePath::default());
         // Generate the Runtime API.
         let generator = subxt_codegen::RuntimeGenerator::new(metadata);
         let mut generated_type_derives =
-            subxt_codegen::DerivesRegistry::new(&CratePath::default());
+            subxt_codegen::DerivesRegistry::with_default_derives(
+                &CratePath::default(),
+            );
         generated_type_derives.extend_for_all(
             vec![
                 syn::parse_quote!(Eq),
                 syn::parse_quote!(PartialEq),
                 syn::parse_quote!(Clone),
-            ]
-            .into_iter(),
+            ],
+            vec![],
         );
         let runtime_api = generator.generate_runtime(
             item_mod,
             generated_type_derives,
             substs,
             CratePath::default(),
-        );
+            true,
+        )?;
         std::fs::write(out, runtime_api.to_string())?;
         Ok(())
     }
 
-    pub fn generate_dkg_runtime() -> Result<(), Box<dyn Error>> {
-        parse_and_generate_runtime(
-            "metadata/dkg-runtime.scale",
-            "src/substrate/dkg_runtime.rs",
-        )
-    }
-
-    pub fn generate_protocol_substrate_runtime() -> Result<(), Box<dyn Error>> {
-        parse_and_generate_runtime(
-            "metadata/protocol-substrate-runtime.scale",
-            "src/substrate/protocol_substrate_runtime.rs",
-        )
-    }
-
     pub fn generate_tangle_runtime() -> Result<(), Box<dyn Error>> {
         parse_and_generate_runtime(
             "metadata/tangle-runtime.scale",
@@ -255,8 +245,6 @@ fn main() -> Result<(), Box<dyn Error>> {
     }
     #[cfg(feature = "generate-substrate")]
     {
-        substrate::generate_dkg_runtime()?;
-        substrate::generate_protocol_substrate_runtime()?;
         substrate::generate_tangle_runtime()?;
         run_cargo_fmt()?;
     }

diff --git a/evm-test-utils/Cargo.toml b/evm-test-utils/Cargo.toml
@@ -13,7 +13,7 @@ documentation = { workspace = true }
 homepage = { workspace = true }
 
 [dependencies]
-anvil = { git = "https://github.com/foundry-rs/foundry.git", rev = "394f217" }
+anvil = { git = "https://github.com/foundry-rs/foundry.git", rev = "6570a4c" }
 futures = "0.3"
 hex = { workspace = true }
 webb-proposals = { path = "../proposals", default-features = false }

diff --git a/metadata/dkg-runtime.scale b/metadata/dkg-runtime.scale
diff --git a/metadata/protocol-substrate-runtime.scale b/metadata/protocol-substrate-runtime.scale
diff --git a/metadata/tangle-runtime.scale b/metadata/tangle-runtime.scale
diff --git a/proposals/Cargo.toml b/proposals/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "webb-proposals"
-version = "0.5.22"
+version = "0.5.23"
 description = "Webb Protocol Proposals Specification & Implementation (part of webb-rs SDK)"
 categories = ["encoding", "no-std"]
 keywords = ["webb", "proposals", "protocol", "blockchain"]