Merge branch 'main' into mkl-bmul-bdiv

zeitgeistpm · Jan 21, 2024 · ea008b3 · ea008b3
2 parents 0c8e9bd + ca684ac
commit ea008b3
Show file tree

Hide file tree

Showing 106 changed files with 3,148 additions and 8,651 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,6 @@
 [workspace]
 default-members = [
+    "macros",
     "node",
     "primitives",
     "runtime/common",
@@ -23,6 +24,7 @@ default-members = [
     "zrml/styx",
 ]
 members = [
+    "macros",
     "node",
     "primitives",
     "runtime/common",
@@ -228,6 +230,7 @@ zrml-swaps-rpc = { path = "zrml/swaps/rpc" }
 
 # Zeitgeist (wasm)
 common-runtime = { path = "runtime/common", default-features = false }
+zeitgeist-macros = { path = "macros", default-features = false }
 zeitgeist-primitives = { path = "primitives", default-features = false }
 zrml-authorized = { path = "zrml/authorized", default-features = false }
 zrml-court = { path = "zrml/court", default-features = false }