feat: incentive manager #323

kerber0x · 2024-04-09T16:30:56Z

Description and Motivation

This PR adds the incentive manager to the v2 branch.

Related Issues

Checklist:

I have read Migaloo's contribution guidelines.
My pull request has a sound title and description (not something vague like Update index.md)
All existing and new tests are passing.
I updated/added relevant documentation.
The code is formatted properly cargo fmt --all --.
Clippy doesn't report any issues cargo clippy -- -D warnings.
I have regenerated the schemas if needed cargo schema.

…mon package

…inal ission rate

codecov · 2024-04-09T16:37:30Z

Codecov Report

Attention: Patch coverage is 92.58605% with 84 lines in your changes are missing coverage. Please review.

Project coverage is 89.42%. Comparing base (755c4bd) to head (64ec60f).
Report is 7 commits behind head on release/v2_contracts.

Files	Patch %	Lines
...uidity_hub/incentive-manager/tests/common/suite.rs	80.71%	43 Missing ⚠️
packages/white-whale-std/src/pool_network/asset.rs	0.00%	8 Missing ⚠️
...ckages/white-whale-std/src/epoch_manager/common.rs	33.33%	6 Missing ⚠️
...ty_hub/incentive-manager/src/incentive/commands.rs	96.77%	4 Missing ⚠️
...racts/liquidity_hub/incentive-manager/src/state.rs	94.02%	4 Missing ⚠️
...dity_hub/incentive-manager/src/manager/commands.rs	98.30%	3 Missing ⚠️
...ity_hub/incentive-manager/src/position/commands.rs	98.02%	3 Missing ⚠️
...dity_hub/incentive-manager/src/position/helpers.rs	91.66%	3 Missing ⚠️
packages/white-whale-std/src/incentive_manager.rs	70.00%	3 Missing ⚠️
...racts/liquidity_hub/incentive-manager/src/error.rs	0.00%	2 Missing ⚠️
... and 4 more

Additional details and impacted files

@@                   Coverage Diff                    @@
##           release/v2_contracts     #323      +/-   ##
========================================================
+ Coverage                 88.56%   89.42%   +0.85%     
========================================================
  Files                       243      260      +17     
  Lines                     23584    26656    +3072     
========================================================
+ Hits                      20887    23836    +2949     
- Misses                     2697     2820     +123

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

github-actions · 2024-04-11T13:40:19Z

Schema generation had missing jobs:

Please run just schemas locally and upload the generated schemas.

kaimen-sano

I had a quick skim through the contract and didn't find anything major. A few other comments about merging with release/v2_contracts branch though.

contracts/liquidity_hub/incentive-manager/.cargo/config

contracts/liquidity_hub/incentive-manager/src/bin/schema.rs

contracts/liquidity_hub/incentive-manager/src/contract.rs

contracts/liquidity_hub/incentive-manager/src/helpers.rs

contracts/liquidity_hub/vault-manager/src/contract.rs

packages/white-whale-std/src/coin.rs

scripts/deployment/deploy_env/base_migaloo.env

contracts/liquidity_hub/epoch-manager/src/state.rs

contracts/liquidity_hub/incentive-manager/src/contract.rs

contracts/liquidity_hub/incentive-manager/tests/integration.rs

contracts/liquidity_hub/incentive-manager/src/contract.rs

0xFable

Gonna keep looking through the massive test you did.
Pr looks very good curious about the Epoch change

0xFable · 2024-04-12T09:55:20Z

contracts/liquidity_hub/incentive-manager/tests/integration.rs

+        .query_current_epoch(|result| {
+            let epoch_response = result.unwrap();
+            assert_eq!(epoch_response.epoch.id, 40);
+        });


Had a proper look through this test.
Having done so, I think we should do more of these. Make proper scenarios for our interactions between contracts or even just for any case we want to ensure performs as expected.

Maybe we do something eventually which tests everything in tandem. All part of other PRs though makes no sense to hold this one up. Very impressive

Is there a way you see we can leverage the test_case lib you used somewhere else? @0xFable

Co-authored-by: kaimen-sano <[email protected]>

github-actions · 2024-04-12T13:06:39Z

Schema generation had missing jobs:

contracts/liquidity_hub/pool-manager/schema/pool-manager.json
contracts/liquidity_hub/pool-manager/schema/raw/execute.json
contracts/liquidity_hub/pool-manager/schema/raw/response_to_pair.json

Please run just schemas locally and upload the generated schemas.

github-actions · 2024-04-12T13:47:11Z

Schema generation had missing jobs:

contracts/liquidity_hub/pool-manager/schema/pool-manager.json
contracts/liquidity_hub/pool-manager/schema/raw/execute.json
contracts/liquidity_hub/pool-manager/schema/raw/response_to_pair.json

Please run just schemas locally and upload the generated schemas.

github-actions · 2024-04-12T14:07:23Z

Schema generation had missing jobs:

contracts/liquidity_hub/pool-manager/schema/pool-manager.json
contracts/liquidity_hub/pool-manager/schema/raw/execute.json
contracts/liquidity_hub/pool-manager/schema/raw/response_to_pair.json

Please run just schemas locally and upload the generated schemas.

kerber0x added 29 commits December 15, 2023 12:55

chore: incentive manager init

434684c

chore: initial commit incentive manager

8dab7d6

chore: update message to manage incentives

29b1bad

chore(incentive_manager): implement closing incentives

25878b0

chore(incentive_manager): add epoch changed hook

ff85e9f

chore: add message and structs for managing positions

0a31aea

chore: impl fill position

501e2d6

chore: impl expand position, refactor into fill_position fn

14e7ad0

chore: impl expand position, refactor into fill_position fn

005406c

chore: abstracting the update_ownership function into white-whale com…

b76b896

…mon package

chore: rework of the positions management

a8e3d86

chore: refactoring

095a1f9

feat: emergency withdrawal

d2ddb11

chore: merge v2 branch

991eca4

chore: finish removing cw20 support from incentive manager

48329e5

chore: prework on claim

b29e311

feat(incentive_manager): claim implementation

ab8012f

chore(incentive): ensure expansion amount is a multiple of the emorig…

2be651b

…inal ission rate

chore: add queries

137f326

chore: add remaining queries

8aa8a9d

chore: remove unnecessary positions indexes from map

734b6f7

refactor: incentive manager cleanup

050c807

chore: merge branch 'release/v2_contracts' into feat/incentive-manager

50574bd

test: add suite for testing incentive manager

4bc1404

test: add tests for creating incentives

4c10c71

test: add tests for expanding incentive

45a7b85

test: add test for closing incentives

e6597c4

test: update config tests

6677bfd

chore: add test to manage position while fixing minor bugs

c41cd3c

kerber0x requested a review from 0xFable as a code owner April 9, 2024 16:30

kerber0x requested review from kaimen-sano and Sen-Com as code owners April 9, 2024 16:30

kerber0x changed the title ~~Feat/incentive manager~~ feat: incentive manager Apr 9, 2024

kerber0x requested a review from nseguias April 9, 2024 16:31

test: add missing tests

2cb67f4

kerber0x force-pushed the feat/incentive-manager branch from 8af4d1a to 2cb67f4 Compare April 9, 2024 16:55

kerber0x added 4 commits April 10, 2024 13:51

test: add complex test

ff5763e

test: final tweaks and tests complementation

5f4d388

refactor: improve state by reusing map for contract lp weights

98af037

chore: merge branch 'release/v2_contracts' into feat/incentive-manager

1a506aa

kerber0x added 2 commits April 11, 2024 15:38

chore: add incentive manager to xtask

7d79a36

chore: fix injective build

88f82b1

kaimen-sano approved these changes Apr 12, 2024

View reviewed changes

0xFable reviewed Apr 12, 2024

View reviewed changes

0xFable approved these changes Apr 12, 2024

View reviewed changes

0xFable reviewed Apr 12, 2024

View reviewed changes

chore: remove the schema generation alias

fb30f1f

Co-authored-by: kaimen-sano <[email protected]>

chore: cleanup things after PR suggestions

64ec60f

kerber0x force-pushed the feat/incentive-manager branch from 465e116 to 64ec60f Compare April 12, 2024 14:06

kerber0x merged commit 62a82ed into release/v2_contracts Apr 12, 2024
6 of 7 checks passed

kerber0x deleted the feat/incentive-manager branch April 12, 2024 15:51

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: incentive manager #323

feat: incentive manager #323

kerber0x commented Apr 9, 2024

codecov bot commented Apr 9, 2024 •

edited

Loading

github-actions bot commented Apr 11, 2024

kaimen-sano left a comment

0xFable left a comment

0xFable Apr 12, 2024

kerber0x Apr 12, 2024 •

edited

Loading

github-actions bot commented Apr 12, 2024

github-actions bot commented Apr 12, 2024

github-actions bot commented Apr 12, 2024

feat: incentive manager #323

feat: incentive manager #323

Conversation

kerber0x commented Apr 9, 2024

Description and Motivation

Related Issues

Checklist:

codecov bot commented Apr 9, 2024 • edited Loading

Codecov Report

github-actions bot commented Apr 11, 2024

kaimen-sano left a comment

Choose a reason for hiding this comment

0xFable left a comment

Choose a reason for hiding this comment

0xFable Apr 12, 2024

Choose a reason for hiding this comment

kerber0x Apr 12, 2024 • edited Loading

Choose a reason for hiding this comment

github-actions bot commented Apr 12, 2024

github-actions bot commented Apr 12, 2024

github-actions bot commented Apr 12, 2024

codecov bot commented Apr 9, 2024 •

edited

Loading

kerber0x Apr 12, 2024 •

edited

Loading