Merge branch 'main' into chralt98-parimutuel

CODEOWNERS

@@ -11,6 +11,7 @@
 /zrml/authorized/ @Chralt98
 /zrml/court/ @Chralt98
 /zrml/global-disputes/ @Chralt98
+/zrml/neo-swaps/ @maltekliemann
 /zrml/prediction-markets/ @maltekliemann
 /zrml/rikiddo/ @sea212
 /zrml/simple-disputes/ @Chralt98
@@ -19,4 +20,4 @@
 
 # Skip weight and Cargo.toml files
 **/weights.rs
-**/Cargo.toml
+**/Cargo.toml

Cargo.toml

@@ -10,6 +10,7 @@ default-members = [
     "zrml/global-disputes",
     "zrml/liquidity-mining",
     "zrml/market-commons",
+    "zrml/neo-swaps",
     "zrml/orderbook-v1",
     "zrml/parimutuel",
     "zrml/prediction-markets",
@@ -32,6 +33,7 @@ members = [
     "zrml/global-disputes",
     "zrml/liquidity-mining",
     "zrml/market-commons",
+    "zrml/neo-swaps",
     "zrml/orderbook-v1",
     "zrml/orderbook-v1/fuzz",
     "zrml/parimutuel",
@@ -231,6 +233,7 @@ zrml-court = { path = "zrml/court", default-features = false }
 zrml-global-disputes = { path = "zrml/global-disputes", default-features = false }
 zrml-liquidity-mining = { path = "zrml/liquidity-mining", default-features = false }
 zrml-market-commons = { path = "zrml/market-commons", default-features = false }
+zrml-neo-swaps = { path = "zrml/neo-swaps", default-features = false }
 zrml-orderbook-v1 = { path = "zrml/orderbook-v1", default-features = false }
 zrml-prediction-markets = { path = "zrml/prediction-markets", default-features = false }
 zrml-prediction-markets-runtime-api = { path = "zrml/prediction-markets/runtime-api", default-features = false }
@@ -253,6 +256,8 @@ arbitrary = { version = "1.3.0", default-features = false }
 arrayvec = { version = "0.7.4", default-features = false }
 cfg-if = { version = "1.0.0" }
 fixed = { version = "=1.15.0", default-features = false, features = ["num-traits"] }
+# Using math code directly from the HydraDX node repository as https://github.com/galacticcouncil/hydradx-math is outdated and has been archived in May 2023.
+hydra-dx-math = { git = "https://github.com/galacticcouncil/HydraDX-node", package = "hydra-dx-math", tag = "v18.0.0", default-features = false }
 # Hashbrown works in no_std by default and default features are used in Rikiddo
 hashbrown = { version = "0.12.3", default-features = true }
 hex-literal = { version = "0.3.4", default-features = false }

README.md

@@ -4,15 +4,18 @@
 
 # Zeitgeist: An Evolving Blockchain for Prediction Markets and Futarchy
 
-![Rust](https://github.com/zeitgeistpm/zeitgeist/workflows/Rust/badge.svg) [![Codecov](https://codecov.io/gh/zeitgeistpm/zeitgeist/branch/main/graph/badge.svg)](https://codecov.io/gh/zeitgeistpm/zeitgeist) [![Discord](https://img.shields.io/badge/discord-https%3A%2F%2Fdiscord.gg%2FMD3TbH3ctv-purple)](https://discord.gg/MD3TbH3ctv) [![Telegram](https://img.shields.io/badge/telegram-https%3A%2F%2Ft.me%2Fzeitgeist__official-blue)](https://t.me/zeitgeist_official)
+![Rust](https://github.com/zeitgeistpm/zeitgeist/workflows/Rust/badge.svg)
+[![Codecov](https://codecov.io/gh/zeitgeistpm/zeitgeist/branch/main/graph/badge.svg)](https://codecov.io/gh/zeitgeistpm/zeitgeist)
+[![Discord](https://img.shields.io/badge/discord-https%3A%2F%2Fdiscord.gg%2FMD3TbH3ctv-purple)](https://discord.gg/MD3TbH3ctv)
+[![Telegram](https://img.shields.io/badge/telegram-https%3A%2F%2Ft.me%2Fzeitgeist__official-blue)](https://t.me/zeitgeist_official)
 
 Zeitgeist is a decentralized network for creating, betting on, and resolving
 prediction markets. The platform's native currency, the ZTG, is used to sway the
 direction of the network, and as a means of last-call dispute resolution.
 Additionally, Zeitgeist is a protocol for efficient trading of prediction market
 shares and will one day become the backbone of the decentralized finance
-ecosystem by allowing traders to create complex financial contracts on
-virtually _anything_.
+ecosystem by allowing traders to create complex financial contracts on virtually
+_anything_.
 
 ## Modules
 
@@ -27,6 +30,9 @@ virtually _anything_.
   liquidity to swap pools.
 - [market-commons](./zrml/market-commons) - Contains common operations on
   markets that are used by multiple pallets.
+- [neo-swaps](./zrml/neo-swaps) - An implementation of the Logarithmic Market
+  Scoring Rule as constant function market maker, tailor-made for decentralized
+  combinatorial markets and Futarchy.
 - [orderbook-v1](./zrml/orderbook-v1) - A naive orderbook implementation that's
   only part of Zeitgeist's PoC. Will be replaced by a v2 orderbook that uses
   0x-style hybrid on-chain and off-chain trading.