Skip to content

Commit

Permalink
Kent 3/liquidity orderbook (#382)
Browse files Browse the repository at this point in the history
* rough start

* close, lots of missing imports

* fixed errors in basic_staking

* Added admin_auth

* added lbAdmin

* fixes

* Lp + Dao fees

* cargo fmt

* delete unused file

* organize contract interfaces a bit

* library improvements

* misc improvements to lb_factory

* misc improvements to lb_pair

* small test improvements

* just git merge things

* use shade c_std instead of cosmwasm_std

* uncomment GetPairInfo and SwapSimulation

* addressing build warnings

* add some cargo helpers for lb contracts

* remove comparison that is always true

* cleanup

* delete old shadeswap_shared package

* fix errors and warnings, add router interface

* dependency fixes and formatting

* dependency fixes and formatting

* refactoring TokenType

* delete old shadeswap_shared again

* fixing merge mistake

* cargo +nightly fmt

* use swap::core for TokenAmount and TokenType

* fix unused doc comments

* finally fixed shade-protocol build issue

* dependency mods

* refactor lb_libraries

* build success

* remove archive_lb_router

it was being included in CI automatically

* fix test dependencies, run some tests in serial

* try to fix CI

* rand crate causes errors with wasm target

---------

Co-authored-by: DrPresident <jacksonswenson@securesecrets.org>
Co-authored-by: itshaseebsaeed <haseebsyed30000@gmail.com>
Co-authored-by: Haseeb Saeed <34556583+itsHaseebSaeed@users.noreply.github.com>
  • Loading branch information
4 people authored Nov 27, 2023
1 parent f6213ed commit c2b4173
Show file tree
Hide file tree
Showing 128 changed files with 3,386 additions and 5,683 deletions.
5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ resolver = "2"
members = [
# Packages
"packages/shade_protocol",
"packages/shadeswap_shared",
# "packages/secretcli",
"packages/multi_test",
"packages/multi_derive",
Expand All @@ -28,7 +27,7 @@ members = [

# Staking
"contracts/basic_staking",
# "contracts/snip20_derivative",
"contracts/snip20_derivative",

# DAO
# - Core
Expand All @@ -46,7 +45,7 @@ members = [
"contracts/mock/mock_stkd_derivative",

# Tools
"tools/doc2book",
# "tools/doc2book",
# "launch"
]

Expand Down
2 changes: 1 addition & 1 deletion contracts/dao/treasury_manager/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ shade-protocol = { version = "0.1.0", path = "../../../packages/shade_protocol",
"chrono",
]}
itertools = "0.10.5"
cosmwasm-schema = { git = "https://github.com/CosmWasm/cosmwasm", commit = "1e05e7e" }
cosmwasm-schema = { git = "https://github.com/CosmWasm/cosmwasm", rev = "1e05e7e" }
schemars = "0.7"
chrono = "0.4.19"

Expand Down
9 changes: 9 additions & 0 deletions contracts/liquidity_book/.cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# FOR LIQUIDITY BOOK DEVELOPMENT ONLY

[alias]
lb = "clippy --lib -p lb_factory -p lb_pair -p lb_tests -p router"
lbfix = "clippy --fix --lib -p lb_factory -p lb_pair -p lb_tests -p router"
lbfmt = "fmt -p lb_factory lb_pair lb_tests router"

[build]
rustflags = ["-A", "unused_variables"]
39 changes: 0 additions & 39 deletions contracts/liquidity_book/archive_lb_router/Cargo.toml

This file was deleted.

11 changes: 0 additions & 11 deletions contracts/liquidity_book/archive_lb_router/src/bin/schema.rs

This file was deleted.

276 changes: 0 additions & 276 deletions contracts/liquidity_book/archive_lb_router/src/contract.rs

This file was deleted.

Loading

0 comments on commit c2b4173

Please sign in to comment.