feat: bonding manager contract #302

0xFable · 2024-04-05T13:15:10Z

Description and Motivation

Adds the Bonding-Manager contract. A contract which combines 3 previous contracts; the whale lair, fee collector and fee distributor. Handles the onchain bonding and fee distribution model for the dex.

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.

- Uses coins instead of Asset almost everywhere - Brings in claim functionality - Brings in an initial epochChangedMsg where we create a new bucket and forward fees

…to config for querying GenesisEpoch

github-actions · 2024-04-15T10:43: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.

codecov · 2024-04-15T11:40:22Z

Codecov Report

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

Project coverage is 90.09%. Comparing base (deebeee) to head (0f77427).
Report is 5 commits behind head on release/v2_contracts.

Files	Patch %	Lines
...ntracts/liquidity_hub/bonding-manager/src/state.rs	36.98%	46 Missing ⚠️
...s/liquidity_hub/bonding-manager/src/tests/robot.rs	83.80%	46 Missing ⚠️
...acts/liquidity_hub/bonding-manager/src/contract.rs	82.26%	25 Missing ⚠️
...racts/liquidity_hub/bonding-manager/src/queries.rs	90.34%	14 Missing ⚠️
...racts/liquidity_hub/bonding-manager/src/helpers.rs	91.45%	10 Missing ⚠️
packages/white-whale-std/src/coin.rs	37.50%	10 Missing ⚠️
packages/white-whale-std/src/bonding_manager.rs	40.00%	6 Missing ⚠️
...acts/liquidity_hub/bonding-manager/src/commands.rs	98.44%	3 Missing ⚠️
...s/white-whale-testing/src/integration/contracts.rs	0.00%	3 Missing ⚠️
.../bonding-manager/src/bin/bonding_manager_schema.rs	0.00%	2 Missing ⚠️
... and 5 more

Additional details and impacted files

@@                   Coverage Diff                    @@
##           release/v2_contracts     #302      +/-   ##
========================================================
+ Coverage                 89.86%   90.09%   +0.23%     
========================================================
  Files                       261      278      +17     
  Lines                     27339    29604    +2265     
========================================================
+ Hits                      24569    26673    +2104     
- Misses                     2770     2931     +161

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

0xFable · 2024-04-15T16:22:10Z

This branch needs a lil more work before merge but ready for review
Gonna focus now on:

More tests to improve coverage
LP Withdraw use case
Fix any conflicts after other PRs merge

github-actions · 2024-04-18T14:42:31Z

Schema generation had missing jobs:

contracts/liquidity_hub/bonding-manager/schema/raw/response_to_claimable.json
contracts/liquidity_hub/bonding-manager/schema/raw/response_to_claimable_epochs.json
contracts/liquidity_hub/bonding-manager/schema/bonding-manager.json
contracts/liquidity_hub/bonding-manager/schema/raw/execute.json
contracts/liquidity_hub/bonding-manager/schema/raw/query.json

Please run just schemas locally and upload the generated schemas.

wip: EpochChangedMSG and FillRewards full test style: satisfy clippy (#327) * ran `just lint` * ran `cargo clippy --tests --all -- -D warnings`

… pool_manager package (#330)

Co-authored-by: Kerber0x <[email protected]>

Several tests have failed due to #328 and #329. We fix these here.

…not be testes as the code is missing in the contract

…ation

A bit WIP still, few hard codes

…whale-lair

…se new method, update tests

…whale-lair

github-actions · 2024-04-26T12:14:33Z

Schema generation had missing jobs:

Please run just schemas locally and upload the generated schemas.

kerber0x

Well done! there are a few things that need to be addressed though

contracts/liquidity_hub/bonding-manager/README.md

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

contracts/liquidity_hub/bonding-manager/src/commands.rs

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

kerber0x · 2024-04-29T14:53:36Z

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

+                operations: swap_routes.swap_route.swap_operations.clone(),
+                minimum_receive: Some(simulate.amount),
+                to: None,
+                max_spread: Some(Decimal::percent(1)),


I think here we want to swap regardless, so we might pump this slippage percentage or not?

We do want to swap regardless but this shouldnt need bumping reason is we are querying the simulation same block so the 1% is more of guard to ensure we dont get less than the query. Because its all happening in one set of messages I think it will never exceed 1% of the queried simulation but we could set it to any value.

contracts/liquidity_hub/bonding-manager/src/commands.rs

Uses previous defined helper to swap to distribution denom

…whale-lair

@kerber0x

Thank you @kerber0x for help!

kerber0x

Looks good overall 💪 Let's get it merged so branches don't diverge too much, then we can refactor and cleanup, write more tests and so on. 👏

0xFable added 11 commits March 13, 2024 09:31

feat: First cut at bonding manager, includes most of whale-lair methods

b2a6140

feat: Add bonding manager submodules

f809010

Merge branch 'release/v2_contracts' into feat/bonding-manager-whale-lair

7187fad

feat: Add bonding-manager methods for Bonding, Claiming and EpochHook

9daf863

- Uses coins instead of Asset almost everywhere - Brings in claim functionality - Brings in an initial epochChangedMsg where we create a new bucket and forward fees

fix: Get tests working again with bonding manager messages

ca25ecc

fix: Rework and readd validate_claimed, may need to add EpochManager …

6c96ad3

…to config for querying GenesisEpoch

chore: Update whale_lair leftover references

c69438a

feat: Add ensure! to contract in places, clean up used stuff

be5f3ed

fix: Updates to instantiate and tests

148e954

Merge branch 'release/v2_contracts' into feat/bonding-manager-whale-lair

8b79e94

fix: Merge issues

ba2157e

0xFable added 2 commits April 15, 2024 12:28

fix: Cleanup, make clippy happy and generate schemas

31e1de0

fix: fmt

66797ea

fix: More clippy

5514594

0xFable force-pushed the feat/bonding-manager-whale-lair branch from 08ac9c5 to 5514594 Compare April 15, 2024 11:55

0xFable marked this pull request as ready for review April 15, 2024 16:21

0xFable requested review from kerber0x, kaimen-sano and Sen-Com as code owners April 15, 2024 16:21

0xFable force-pushed the feat/bonding-manager-whale-lair branch 5 times, most recently from 607b546 to bafcbf1 Compare April 18, 2024 14:42

0xFable and others added 2 commits April 18, 2024 22:45

feat: claimable epochs test, moving to more advanced tests

37d32b9

wip: EpochChangedMSG and FillRewards full test style: satisfy clippy (#327) * ran `just lint` * ran `cargo clippy --tests --all -- -D warnings`

refactor: add asset_decimals to the create_pair msg

a014d32

kerber0x and others added 8 commits April 18, 2024 22:45

refactor: add SimulationResponse and ReverseSimulationResponse to the…

ca66869

… pool_manager package (#330)

feat(pool-manager): allow updating config

5313581

Co-authored-by: Kerber0x <[email protected]>

docs: add V2 info on readme file

5ba8085

fix(tests): fix failing tests

8611e14

Several tests have failed due to #328 and #329. We fix these here.

feat(smart-contracts): use response structs on all queries

a7f9882

chore(smart-contracts): test query pair info; query swap route(s) can…

3c2b1f0

…not be testes as the code is missing in the contract

chore: run just schemas

1212e34

feat: Add more end to end test gathering fees from swaps and pair cre…

01ddd01

…ation

0xFable force-pushed the feat/bonding-manager-whale-lair branch from bd3bf63 to 01ddd01 Compare April 18, 2024 21:47

0xFable added 5 commits April 18, 2024 22:49

fix: merge conflicts

8a4e0df

feat: Test bonding and claiming where swaps and pools are created

780a5e1

A bit WIP still, few hard codes

chore: Merge branch 'release/v2_contracts' into feat/bonding-manager-…

5a6c9d4

…whale-lair

feat: Finish Swap usecase and Lp withdrawal, update pool manager to u…

30712fb

…se new method, update tests

chore: Merge branch 'release/v2_contracts' into feat/bonding-manager-…

27f7776

…whale-lair

fix: Update schemas and fmt after merge

a5685f7

kerber0x requested changes Apr 29, 2024

View reviewed changes

fix: Some CR Updates

f8d03b2

0xFable requested a review from nseguias as a code owner May 1, 2024 10:08

0xFable added 5 commits May 2, 2024 12:52

feat: LP Withdrawal reply handler

e21b2b5

Uses previous defined helper to swap to distribution denom

chore: Merge branch 'release/v2_contracts' into feat/bonding-manager-…

4423ed0

…whale-lair

fix: Update test to remove one of the fees

475f93b

feat: Fixup claim and epoch saving test working now

92aa39b

Thank you @kerber0x for help!

fix: make clippy happy

0f77427

0xFable requested a review from kerber0x May 2, 2024 17:33

0xFable changed the title ~~Feat/bonding manager whale lair~~ feat: bonding manager contract May 2, 2024

kerber0x approved these changes May 3, 2024

View reviewed changes

0xFable merged commit 34a78d2 into release/v2_contracts May 3, 2024
7 checks passed

0xFable deleted the feat/bonding-manager-whale-lair branch May 3, 2024 09:46

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: bonding manager contract #302

feat: bonding manager contract #302

0xFable commented Apr 5, 2024 •

edited

Loading

github-actions bot commented Apr 15, 2024

codecov bot commented Apr 15, 2024 •

edited

Loading

0xFable commented Apr 15, 2024

github-actions bot commented Apr 18, 2024

github-actions bot commented Apr 26, 2024

kerber0x left a comment

kerber0x Apr 29, 2024

0xFable May 2, 2024

kerber0x left a comment

feat: bonding manager contract #302

feat: bonding manager contract #302

Conversation

0xFable commented Apr 5, 2024 • edited Loading

Description and Motivation

Related Issues

Checklist:

github-actions bot commented Apr 15, 2024

codecov bot commented Apr 15, 2024 • edited Loading

Codecov Report

0xFable commented Apr 15, 2024

github-actions bot commented Apr 18, 2024

github-actions bot commented Apr 26, 2024

kerber0x left a comment

Choose a reason for hiding this comment

kerber0x Apr 29, 2024

Choose a reason for hiding this comment

0xFable May 2, 2024

Choose a reason for hiding this comment

kerber0x left a comment

Choose a reason for hiding this comment

0xFable commented Apr 5, 2024 •

edited

Loading

codecov bot commented Apr 15, 2024 •

edited

Loading