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

Feat/migrate vesting to pcl #79

Merged
merged 29 commits into from
Feb 26, 2024
Merged
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
44542c8
recommit migration mechanism w proper base branch
quasisamurai Jan 29, 2024
183c903
fixes, fmft, ref
quasisamurai Feb 1, 2024
06df7cc
rm unused, commit updated sttuff, fmt
quasisamurai Feb 1, 2024
18cbcce
fix int-tests
quasisamurai Feb 1, 2024
0fe360e
satisfy clippy
quasisamurai Feb 1, 2024
fbe0792
move xyk lp addr out of config
quasisamurai Feb 7, 2024
8714134
massive refactor
quasisamurai Feb 13, 2024
aedd1bd
fix schema
quasisamurai Feb 13, 2024
7b67a1d
fmt
quasisamurai Feb 14, 2024
221bbe3
some minor fixes
quasisamurai Feb 15, 2024
a5b500e
satisfy clippy
quasisamurai Feb 15, 2024
d701c70
rewrite to from trait
quasisamurai Feb 15, 2024
ebe9df6
sync deps
quasisamurai Feb 15, 2024
b4309ba
add missing migrate entry point for vesting lp
sotnikov-s Feb 15, 2024
c75163b
refactor pcl vesting
quasisamurai Feb 15, 2024
06bc70b
return dust threshold
quasisamurai Feb 19, 2024
efb80c1
cover fully payed acc migration
quasisamurai Feb 20, 2024
674dc26
optimize to save some gas
quasisamurai Feb 20, 2024
7af18fa
review cleaning
quasisamurai Feb 22, 2024
c9f907b
Update contracts/vesting-lp-pcl/src/contract.rs
quasisamurai Feb 23, 2024
f9a6f80
post-review fixes
quasisamurai Feb 26, 2024
c61cd52
rm max available amount
quasisamurai Feb 26, 2024
747dc52
simplfy addr pass
quasisamurai Feb 26, 2024
07adbf0
simplify addr pass
quasisamurai Feb 26, 2024
f9b7749
regen schema & fix readmes
quasisamurai Feb 26, 2024
222e651
simplify exit branch
quasisamurai Feb 26, 2024
4fe3bdc
decrease total granted instead of increasing total released
quasisamurai Feb 26, 2024
026f865
fmt
quasisamurai Feb 26, 2024
2747526
rm user autoreplace
quasisamurai Feb 26, 2024
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
66 changes: 44 additions & 22 deletions Cargo.lock

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

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
members = [
"contracts/auction",
"contracts/lockdrop",
"contracts/lockdrop-pcl",
"contracts/credits",
"contracts/vesting-lp",
"contracts/vesting-lp-pcl",
"contracts/vesting-lti",
"contracts/vesting-investors",
"contracts/cw20-merkle-airdrop",
Expand Down Expand Up @@ -34,6 +34,7 @@ cosmwasm-schema = { version = "1.4.1", default-features = false }
astroport = { path = "packages/astroport", default-features = false }
astroport-periphery = { path = "packages/astroport_periphery" }
vesting-base = { path = "packages/vesting-base" }
vesting-base-pcl = { path = "packages/vesting-base-pcl" }
# setting cw-multi-test to 0.17.0 enables cosmwasm_1_1, we don't want that
cw-multi-test = "0.16.5"
itertools = "0.11.0"
Expand Down
6 changes: 3 additions & 3 deletions contracts/auction/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ The LP Bootstrap via auction contract facilitates cNTRN-NATIVE Neutron pool init
### Handle Messages

| Message | Description |
| --------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|-----------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `ExecuteMsg::Receive` | ReceiveCW20 Hook which facilitates cNTRN tokens delegation by lockdrop participants / airdrop recipients |
| `ExecuteMsg::UpdateConfig` | Admin function to update any of the configuration parameters. |
| `ExecuteMsg::DepositUst` | Facilitates UST deposits by users |
Expand All @@ -32,15 +32,15 @@ The LP Bootstrap via auction contract facilitates cNTRN-NATIVE Neutron pool init
### Handle Messages :: Callback

| Message | Description |
| --------------------------------------------------- | ---------------------------------------------------------------------------------------------------- |
|-----------------------------------------------------|------------------------------------------------------------------------------------------------------|
| `CallbackMsg::UpdateStateOnLiquidityAdditionToPool` | Callback function to update state after liquidity is added to the cNTRN-UST Pool |
| `CallbackMsg::UpdateStateOnRewardClaim` | Callback function to update state after cNTRN rewards are claimed from the generator |
| `CallbackMsg::WithdrawUserRewardsCallback` | Callback function to facilitate cNTRN reward claiming and unlocked LP tokens withdrawal for the user |

### Query Messages

| Message | Description |
| -------------------- | ----------------------------- |
|----------------------|-------------------------------|
| `QueryMsg::Config` | Returns the config info |
| `QueryMsg::State` | Returns state of the contract |
| `QueryMsg::UserInfo` | Returns user position details |
Expand Down
4 changes: 0 additions & 4 deletions contracts/lockdrop-pcl/.cargo/config

This file was deleted.

38 changes: 0 additions & 38 deletions contracts/lockdrop-pcl/Cargo.toml

This file was deleted.

61 changes: 0 additions & 61 deletions contracts/lockdrop-pcl/README.md

This file was deleted.

Loading
Loading