Skip to content
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.

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

WIP: Mp 2527 use different price source for liquidate and other actions in red bank #221

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
231 commits
Select commit Hold shift + click to select a range
1599890
feat: Add original swapper contract
apollo-sturdy Mar 23, 2023
7633026
feat: Add scripts from red bank
apollo-sturdy Mar 23, 2023
bd309a9
feat: Copy base and osmosis oracle contracts
apollo-sturdy Mar 25, 2023
4009f9b
fix: Use oracle types from local package
apollo-sturdy Mar 25, 2023
5742cf1
build: Run cargo machete
apollo-sturdy Mar 25, 2023
86b3f7a
style: run fmt
apollo-sturdy Mar 25, 2023
3e936ef
build: Generate schemas
apollo-sturdy Mar 25, 2023
b27154e
refactor: Split PriceSource trait into two
apollo-sturdy Mar 30, 2023
bb5ddc5
setup contract
brimigs Mar 24, 2023
23e6fe5
Adding tests
grod220 Apr 3, 2023
ceaa047
emergency powers tests
grod220 Apr 4, 2023
40f336f
feat: Add WIP wasm-oracle contract
apollo-sturdy Apr 8, 2023
e25a11f
refactor: move test helpers into separate file
pacmanifold Apr 9, 2023
8182f82
test(wasm_oracle): add tests for owner updates
pacmanifold Apr 9, 2023
147780b
test(wasm_oracle): add tests for price source removal
pacmanifold Apr 9, 2023
67d9a09
test(wasm_oracle): test for query price
pacmanifold Apr 9, 2023
f6e410f
chore: import cw-it from specific commit
pacmanifold Apr 9, 2023
e73c116
remove 'remove asset param' functionality
brimigs Apr 10, 2023
24629dc
update schema
brimigs Apr 11, 2023
7327e1d
wip: spot price query test
pacmanifold Apr 9, 2023
467c7a1
build: generate schemas
apollo-sturdy Apr 11, 2023
d6abf9d
build: generate ts types
apollo-sturdy Apr 11, 2023
970b5e8
test: Add assertions to tests
apollo-sturdy Apr 11, 2023
7851202
Merge pull request #2 from mars-protocol/dev/oracle-refactors
apollo-sturdy Apr 11, 2023
453a910
Merge branch 'feat/oracle' into dev/wasm-oracle
apollo-sturdy Apr 11, 2023
eba1491
test: Add wasm-oracle tests for spot stableswap
apollo-sturdy Apr 11, 2023
8e54158
fix: fix bug in assert_astroport_pair_contains_denoms
apollo-sturdy Apr 11, 2023
4db9d87
feat: feature-gate osmosistestapp to allow debugging
apollo-sturdy Apr 11, 2023
09de533
feat: Add base_denom fixed price in init
apollo-sturdy Apr 11, 2023
b250702
feat: remove unnecessary requirement for spot price
apollo-sturdy Apr 11, 2023
b7ebbe0
test: add test_validate_astroport_spot_price_source
apollo-sturdy Apr 11, 2023
e4b6393
updates
brimigs Apr 12, 2023
2c1e57f
update tests
brimigs Apr 12, 2023
7f4c3f9
Add stable / nightly toolchains.
piobab Apr 12, 2023
e73750f
Merge pull request #6 from mars-protocol/fix/pipeline
piobab Apr 12, 2023
dfd28d9
Merge branch 'main' into externalize_asset_params
piobab Apr 12, 2023
0e1e0bc
feat: Use same route validation for twap source
apollo-sturdy Apr 12, 2023
ed14ff6
Fix clippy.
piobab Apr 12, 2023
dd4ecc3
style: fmt and clippy
apollo-sturdy Apr 12, 2023
7214bd0
build: Generate ts types
apollo-sturdy Apr 12, 2023
39e40c0
update contract name
brimigs Apr 13, 2023
8f94672
Merge pull request #3 from mars-protocol/externalize_asset_params
brimigs Apr 13, 2023
1682805
publishing mars-params to crates.io
brimigs Apr 18, 2023
8901da9
fix: Make deps borrowed in validate
apollo-sturdy Apr 20, 2023
949c2fc
fix: review comments
apollo-sturdy Apr 20, 2023
1b1e9b5
build: Move dependencies to workspace cargo.toml
apollo-sturdy Apr 20, 2023
6bfcffb
style: Clippy allow only_used_in_recursion
apollo-sturdy Apr 21, 2023
e36663b
fix: Incorrect equality check
apollo-sturdy Apr 21, 2023
ece5318
build: Update deps
apollo-sturdy Apr 21, 2023
065473b
Merge pull request #7 from mars-protocol/add-crates
grod220 Apr 26, 2023
dbace5b
test: Move unit tests to tests folder
apollo-sturdy Apr 27, 2023
d969164
refactor: Move spot price query to separate fn
apollo-sturdy Apr 27, 2023
1533089
Merge pull request #5 from mars-protocol/dev/wasm-oracle
apollo-sturdy Apr 27, 2023
066d73a
feat: Implement Astroport TWAP Price Source
apollo-sturdy Apr 12, 2023
43adf8e
test: Test query TWAP price without route asset
apollo-sturdy Apr 20, 2023
5b28cdd
test: Add helper for create default astro pair
apollo-sturdy Apr 20, 2023
cd6fa55
test: Merge validate and query tests
apollo-sturdy Apr 21, 2023
a372d19
test: Test display twap price source
apollo-sturdy Apr 21, 2023
a1bc1bd
style: Remove unused map_err
apollo-sturdy Apr 21, 2023
32e7425
test: Add integration test for migrate entrypoint
apollo-sturdy Apr 21, 2023
5d412a9
test: Add more integration tests
apollo-sturdy Apr 25, 2023
6904ebe
build: Cargo update
apollo-sturdy Apr 27, 2023
0e300f2
style: clippy
apollo-sturdy Apr 27, 2023
6ff39f4
build: Update schemas
apollo-sturdy Apr 27, 2023
e5609c9
style: allow clippy::items_after_test_module
apollo-sturdy Apr 27, 2023
d58fc90
build: generate ts types
apollo-sturdy Apr 27, 2023
bf9c59e
test: Add proptest for astroport spot price source
apollo-sturdy Apr 28, 2023
b0f907d
fix: Make tests work with osmosis-test-app
apollo-sturdy Apr 28, 2023
8132a02
fix: Validate that route assets are unique
apollo-sturdy Apr 28, 2023
1497de7
fix: Validate that the price source denom is not in the route assets
apollo-sturdy Apr 28, 2023
f54c338
Remove reserve factor and interest rate model. (#8)
piobab Apr 28, 2023
6917e10
style: don't borrow u64
apollo-sturdy Apr 29, 2023
e8d9c6e
style: clippy
apollo-sturdy Apr 29, 2023
ebd8c40
test: Add liquidity to spot proptest
apollo-sturdy Apr 29, 2023
fc09c42
test: Add proptest for Astroport TWAP price source
apollo-sturdy Apr 29, 2023
d5b0148
Merge pull request #10 from mars-protocol/dev/astroport-twap
apollo-sturdy Apr 29, 2023
3be8e70
style: clippy
apollo-sturdy Apr 29, 2023
38b9601
style: fmt
apollo-sturdy May 2, 2023
09feb43
refactor: move oracle test helpers into mars_testing
pacmanifold Apr 14, 2023
29567ff
test: rebuild astro wasm files from tag v2.7.1
pacmanifold May 3, 2023
c5601d9
feat: implement astroport swapper
pacmanifold Apr 14, 2023
cd86ec1
refactor: move oracle test helpers into mars_testing
pacmanifold Apr 14, 2023
3b82744
test(osmosis_swapper): fix failing tests
pacmanifold May 3, 2023
af3afd6
fix: merge into swapper commit rename OsmosisSwap
pacmanifold May 3, 2023
3fafe3e
test(astro_swapper): add integration tests
pacmanifold May 3, 2023
2bf3cd4
fix: address PR comments
pacmanifold May 5, 2023
62abd79
Merge pull request #11 from mars-protocol/dev/prop-tests
apollo-sturdy May 5, 2023
91ba753
Pyth v1 (#4)
piobab May 5, 2023
fd8673a
fix: fix error in generate schemas
pacmanifold May 8, 2023
4b498c7
chore: run cargo fmt
pacmanifold May 8, 2023
d6363ec
Merge remote-tracking branch 'origin/feat/oracle' into feat/astro-swa…
pacmanifold May 8, 2023
18c0ef6
fix: solve error when compiling to wasm
pacmanifold May 8, 2023
70990ac
chore: fix clippy warnings
pacmanifold May 8, 2023
5ee79e6
Add HLS to asset params
grod220 May 9, 2023
6f2a576
fix: address sturdys comments
pacmanifold May 9, 2023
21bbbdd
Apply suggestions from code review
pacmanifold May 9, 2023
57bd832
fix: address piobab's comments
pacmanifold May 9, 2023
1eb716e
chore: run cargo fmt
pacmanifold May 9, 2023
9f2b953
Review updates
grod220 May 10, 2023
9a399ae
fix: use checked math in estimate_out_amount
pacmanifold May 10, 2023
61c2eb9
Merge pull request #14 from mars-protocol/hls-params
grod220 May 10, 2023
0edc80e
Merge pull request #12 from mars-protocol/feat/astro-swapper
pacmanifold May 11, 2023
7cc2065
build: Generate types for astroport swapper
apollo-sturdy May 16, 2023
e0f8729
build: correct ExecuteMsg in wasm oracle schema
apollo-sturdy May 16, 2023
851d0de
feat: Update deployment scripts for neutron testnet
apollo-sturdy May 17, 2023
a2e5160
feat: pyth support in WasmOracle
pacmanifold May 24, 2023
7b33e79
Supporting lib feature
grod220 May 29, 2023
907c9bf
Merge pull request #20 from mars-protocol/adding-lib-cfg
brimigs May 30, 2023
0ce07fa
test: port pyth ITs to wasm oracle
pacmanifold May 29, 2023
d8d78b2
fix: generate types and schema
pacmanifold May 30, 2023
e02b1d3
Changing query response struct
grod220 May 30, 2023
533a336
Merge pull request #19 from mars-protocol/feat/wasm-oracle-pyth
pacmanifold May 30, 2023
5fe5eae
vault updates
grod220 May 30, 2023
004bd63
update types
grod220 May 30, 2023
f107756
Merge pull request #21 from mars-protocol/asset-response
grod220 May 31, 2023
c9b4f93
Merge remote-tracking branch 'local-mars-common/main' into dev/monorepo
pacmanifold Jun 2, 2023
e3c4c6f
chore: bump osmosis-test-tube version
pacmanifold Jun 2, 2023
1ef0753
feat: break out swapper from rewards collector
pacmanifold Apr 24, 2023
909c0e4
build: bump cw-it version
apollo-sturdy May 15, 2023
8713da7
feat: simplify rewards-collector
pacmanifold May 11, 2023
ad8a708
fix: MarsAddressProvider::Swapper from_str impl
pacmanifold May 26, 2023
1aead1b
test: fmt and from_str unit test for MarsAddressType
pacmanifold May 26, 2023
f2a766c
fix: add execute and query entry points to reward-collector
pacmanifold Jun 6, 2023
59aa76a
test: fix failing tests
pacmanifold Jun 5, 2023
a341b6f
Merge remote-tracking branch 'mars-common/main' into feat/mars-common-2
pacmanifold Jun 6, 2023
2e0c6ab
Merge remote-tracking branch 'mars-common/feat/oracle' into feat/mars…
pacmanifold Jun 7, 2023
0650561
refactor: move mars-swapper into mars-red-bank-types
pacmanifold Jun 7, 2023
1798651
chore: run cargo fmt
pacmanifold Jun 7, 2023
da01301
chore: resolve clippy warnings
pacmanifold Jun 7, 2023
48338c5
fix: fix errors in typescript scripts
pacmanifold Jun 7, 2023
15e1994
Pyth (#183)
piobab Mar 3, 2023
a1e5f08
MP-2475. Pyth phase 1 aligment.
piobab Mar 28, 2023
9ff2713
Implementation for LSD v1 (#190)
piobab Apr 6, 2023
a0d59d2
Extract pyth addr to Pyth price source config.
piobab May 4, 2023
ce78f5d
Update decimals (#194)
piobab Jun 6, 2023
63e92d6
Improve pyth base dec (#202)
piobab Jun 9, 2023
b9adc8f
Bump deps (#204)
piobab Jun 9, 2023
5b3393e
Bump contract ver and rust-optimizer.
piobab Jun 9, 2023
23f6457
Use old Pool query.
piobab Jun 9, 2023
0cedab8
HLS adjustments
grod220 Jun 7, 2023
90d5ae4
chore: resolve clippy warnings
pacmanifold Jun 9, 2023
8a705a3
Review updates [amended]
grod220 Jun 12, 2023
a6cc69f
Merge pull request #22 from mars-protocol/hls-vaults
grod220 Jun 12, 2023
b0870eb
Delete vault remove message
grod220 Jun 9, 2023
99b0730
Set version to 1.1.0.
piobab Jun 12, 2023
1449b4b
Merge pull request #23 from mars-protocol/remove-v-message
grod220 Jun 12, 2023
7296ec4
Merge remote-tracking branch 'origin/release/pyth-v1' into feat/mars-…
pacmanifold Jun 12, 2023
8bfc936
chore: regenerate ts types
pacmanifold Jun 12, 2023
0e96cbb
chore: remove mock swapper
pacmanifold Jun 12, 2023
9c9af8b
Merge remote-tracking branch 'mars-common/main' into feat/mars-common-2
pacmanifold Jun 12, 2023
a6dafbc
Revert "chore: remove mock swapper"
pacmanifold Jun 12, 2023
7d5df84
chore: ignore mock swapper in coverage job
pacmanifold Jun 12, 2023
905b75f
test: add UT:s for Swapper adapter
pacmanifold Jun 12, 2023
1bc44a2
test(osmosis_swapper): add test for hashset helper
pacmanifold Jun 12, 2023
df98b1c
refactor: remove trait IntoUint128
pacmanifold Jun 12, 2023
1a89927
deploy params contract
brimigs Jun 13, 2023
de93022
format
brimigs Jun 13, 2023
2438f59
test: add tests for rewards collector
pacmanifold Jun 14, 2023
04d8fe0
Merge remote-tracking branch 'origin/master' into HEAD
pacmanifold Jun 14, 2023
6bc7077
chore: run cargo fmt
pacmanifold Jun 14, 2023
24f56cd
chore: resolve clippy warnings
pacmanifold Jun 14, 2023
e0e1412
Merge commit 'de93022' into feat/mars-common-2
pacmanifold Jun 14, 2023
b1b3d4f
Merge remote-tracking branch 'mars-common/dev/deploy-neutron' into fe…
pacmanifold Jun 14, 2023
a2feebe
fix: update deployment scripts
pacmanifold Jun 15, 2023
1a2193b
test: ignore osmosis-swapper from coverage tests
pacmanifold Jun 18, 2023
e3b6bae
test: add failing test for MarsAddressType format
pacmanifold Jun 18, 2023
3006045
refactor: remove params contract
pacmanifold Jun 18, 2023
86b73f7
Merge pull request #208 from mars-protocol/feat/fix-deployment-and-co…
pacmanifold Jun 18, 2023
0c1b57b
fix: remove unused type RouteResponse from rewards_collector
pacmanifold Jun 18, 2023
bfb1531
test(osmosis-oracle): add test for custom execute
pacmanifold Jun 18, 2023
4391177
test(osmosis-oracle): add test for querying unset price
pacmanifold Jun 18, 2023
e21a0c4
test: increase base_swapper coverage
pacmanifold Jun 19, 2023
cf0b502
Merge pull request #201 from mars-protocol/feat/mars-common-2
pacmanifold Jun 19, 2023
75c06a5
feat: Add support for multiple incentive denoms
apollo-sturdy May 30, 2023
a67282c
fix: separate unclaimed rewards by collat denom
apollo-sturdy Jun 5, 2023
7be5d81
refactor: Create increase_unclaimed_rewards helper
apollo-sturdy Jun 7, 2023
bf86d21
feat: use one event per denom
apollo-sturdy Jun 8, 2023
99b2835
Avoid clones for keys.
piobab Jun 8, 2023
9a6245a
fix: compilation error in test pagination
apollo-sturdy Jun 8, 2023
75225a8
fix: Fix tests after changing events
apollo-sturdy Jun 8, 2023
a6f392c
refactor: review comments
apollo-sturdy Jun 9, 2023
75ea2ab
feat: Check that market exists on set incentive
apollo-sturdy Jun 14, 2023
c32c2e6
feat: Add whitelist for incentive denoms
apollo-sturdy Jun 8, 2023
56c49a1
feat: Support multiple incentive schedules
apollo-sturdy Jun 9, 2023
3f71d12
refactor: rename AssetIncentive to IncentiveState
apollo-sturdy Jun 12, 2023
ef56dc1
test: Add backtraces feature and bump testing deps
apollo-sturdy Jun 14, 2023
8ee23a2
fix: Set incentive_state if it doesnt exist
apollo-sturdy Jun 14, 2023
59fd672
test: Refactor tests to work with multiple schedules
apollo-sturdy Jun 15, 2023
07cf848
fix: assert denom is whitelisted in set_incentive
apollo-sturdy Jun 15, 2023
b592b30
feat: Update incentives when removing from whitelist
apollo-sturdy Jun 15, 2023
cfe62f9
test: Add tests for whitelist
apollo-sturdy Jun 15, 2023
7d3614e
fix: Correct checking of schedule start time
apollo-sturdy Jun 16, 2023
5bd5442
fix: Store exactly one schedule per epoch
apollo-sturdy Jun 18, 2023
e7d7df7
fix: Remove unused config field mars_denom
apollo-sturdy Jun 18, 2023
f0fdd44
feat: Move epoch duration to separate item
apollo-sturdy Jun 18, 2023
102114a
feat: Add queries for emissions
apollo-sturdy Jun 18, 2023
b958eaa
feat: Add min_incentive_emission to config update
apollo-sturdy Jun 18, 2023
86904c3
test: Add test for update_incentive_index
apollo-sturdy Jun 18, 2023
b85e79b
style: clippy
apollo-sturdy Jun 18, 2023
25af2d1
build: generate schemas and ts types
apollo-sturdy Jun 18, 2023
5004e2d
chore: cargo update
apollo-sturdy Jun 19, 2023
d0fe9da
fix: add events even when denoms empty
apollo-sturdy Jun 19, 2023
535dcdb
docs: Fix typo in comment
apollo-sturdy Jun 19, 2023
b6d1b00
feat: Add min emission per incentive denom
apollo-sturdy Jun 19, 2023
012aaf2
fix: revert changing makefile artifacts dir
apollo-sturdy Jun 19, 2023
1e741de
build: use upstream osmosis-std and test-tube
apollo-sturdy Jun 19, 2023
9cc4cde
feat: Add max_whitelisted_denoms to config
apollo-sturdy Jun 19, 2023
91071b7
build: generate schemas and ts types
apollo-sturdy Jun 19, 2023
f928d71
feat: Update deployment scripts to use new api
apollo-sturdy Jun 19, 2023
4125993
test(incentives): additional test case for removal of whitelisted denom
pacmanifold Jun 19, 2023
ba31eaa
chore: audit checklist changes
pacmanifold Jun 19, 2023
e4164b0
docs: remove unused todo comment
apollo-sturdy Jun 19, 2023
aa4b29a
feat: update integration-test make target
pacmanifold Jun 19, 2023
99d8c18
chore: update unit-test make target
pacmanifold Jun 19, 2023
617076a
chore: add osmosis-swapper to integration-test make target
pacmanifold Jun 19, 2023
34f28cd
Revert "refactor: remove params contract" (#216)
pacmanifold Jun 20, 2023
8382656
Dynamic lb cf from commons (#219)
piobab Jun 20, 2023
a625085
Generate schema.
piobab Jun 20, 2023
56cfee5
Bump cw2.
piobab Jun 20, 2023
4132866
Mp 2525 pyth v2 (#217)
piobab Jun 21, 2023
32ab53b
Mp 2487 extract asset params (#191)
piobab Jun 21, 2023
9fa0d13
updates
brimigs Jun 24, 2023
1b57b31
fmt
brimigs Jun 24, 2023
9ef9051
updates
brimigs Jun 24, 2023
65b0cce
fix build
brimigs Jun 25, 2023
2624291
format
brimigs Jun 26, 2023
d107467
update
brimigs Jun 28, 2023
acb4b9d
update
brimigs Jun 29, 2023
e1af669
update types
brimigs Jun 30, 2023
437f01a
format
brimigs Jun 30, 2023
326d07b
update
brimigs Jul 13, 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
3 changes: 3 additions & 0 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,9 @@ jobs:
cargo make rust-optimizer
sudo chown -R $USER .

- name: download mars-common artifacts
run: cargo make download-artifacts

- name: Run test coverage
run: cargo make coverage-lcov

Expand Down
Loading
Loading