Skip to content

Shared deposit cap #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 29 commits into from
Aug 2, 2023
Merged

Shared deposit cap #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
721c451
add credit manager to address provider
larry0x Jul 25, 2023
fd4f8d6
extract interest rate logics to a separate library
larry0x Jul 25, 2023
56efc27
query to return `None` on nonexistent market
larry0x Jul 25, 2023
31e236b
add `total_deposit` query to mars-params
larry0x Jul 25, 2023
6010be7
Merge branch 'develop' into shared-deposit-cap-2
larry0x Jul 25, 2023
b97bd84
check total deposit when user deposits
larry0x Jul 26, 2023
df65481
add debt to mock querier
larry0x Jul 28, 2023
60f6468
mock querier to return `Option<Market>`
larry0x Jul 28, 2023
e64133a
add `update_balances` method to mock querier
larry0x Jul 28, 2023
3b54094
add test for computing total deposit
larry0x Jul 28, 2023
034e78b
fix tests
larry0x Jul 28, 2023
423d682
Move rewards collector to rewards collector base
pacmanifold Jul 21, 2023
3d3a105
Bump version. Bump deps.
pacmanifold Jul 20, 2023
d9ceff0
Create readme for setting up Neutron multisig
Jul 25, 2023
812364b
MP-2615 rover rewards (#273)
piobab Jul 26, 2023
ca28b62
Migrate to PoolManager for Pool and SpotPrice. Read StableSwap pool. …
piobab Jul 28, 2023
5875512
formatting
larry0x Jul 29, 2023
82358a3
update schema
larry0x Jul 29, 2023
7ac03ad
add total deposit to mock params querier
larry0x Jul 29, 2023
e6e1ef4
update tests
larry0x Jul 29, 2023
ae6e292
formatting
larry0x Jul 29, 2023
129a5c0
update typescript types
larry0x Jul 29, 2023
df48e3a
use `cosmwasm_std::Coins` over `HashMap<String, Uint128>`
larry0x Jul 30, 2023
66370f8
Fix incentives test. Enable test job.
piobab Jul 31, 2023
bf5556f
Delete execute.rs file.
piobab Jul 31, 2023
7548225
Fix build.
piobab Jul 31, 2023
591251e
Fix test.
piobab Jul 31, 2023
5a3168e
Merge branch 'develop' into shared-deposit-cap-2
larry0x Aug 1, 2023
942c994
Move deposit_cap from RedBank struct in params contract.
piobab Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
101 changes: 54 additions & 47 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ members = [
"contracts/rewards-collector/*",
"packages/chains/*",
"packages/health",
"packages/interest-rate",
"packages/liquidation",
"packages/testing",
"packages/types",
Expand Down Expand Up @@ -68,9 +69,9 @@ proptest = "1.1.0"

# packages
mars-health = { path = "./packages/health" }
mars-interest-rate = { path = "./packages/interest-rate" }
mars-liquidation = { path = "./packages/liquidation" }
mars-osmosis = { path = "./packages/chains/osmosis" }
mars-params = { path = "./contracts/params" }
mars-red-bank-types = { path = "./packages/types" }
mars-testing = { path = "./packages/testing" }
mars-utils = { path = "./packages/utils" }
Expand All @@ -81,6 +82,7 @@ mars-incentives = { path = "./contracts/incentives" }
mars-oracle-base = { path = "./contracts/oracle/base" }
mars-oracle-osmosis = { path = "./contracts/oracle/osmosis" }
mars-oracle-wasm = { path = "./contracts/oracle/wasm" }
mars-params = { path = "./contracts/params" }
mars-red-bank = { path = "./contracts/red-bank" }
mars-rewards-collector-base = { path = "./contracts/rewards-collector/base" }
mars-rewards-collector-osmosis = { path = "./contracts/rewards-collector/osmosis" }
Expand Down
4 changes: 4 additions & 0 deletions contracts/params/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,9 @@ cosmwasm-schema = { workspace = true }
cosmwasm-std = { workspace = true }
cw2 = { workspace = true }
cw-storage-plus = { workspace = true }
mars-interest-rate = { workspace = true }
mars-owner = { workspace = true }
mars-red-bank-types = { workspace = true }
mars-utils = { workspace = true }
schemars = { workspace = true }
serde = { workspace = true }
Expand All @@ -33,3 +35,5 @@ thiserror = { workspace = true }
[dev-dependencies]
anyhow = { workspace = true }
cw-multi-test = { workspace = true }
mars-testing = { workspace = true }
test-case = { workspace = true }
Loading