Skip to content

Commit

Permalink
Merge pull request #81 from neutron-org/fix/pcl-migrations-conflicts
Browse files Browse the repository at this point in the history 
commit all pcl changes
  • Loading branch information
@pr0n00gler
pr0n00gler authored Feb 26, 2024
2 parents f9afc7a + 0207d5d commit 7ae0225
Show file tree
Hide file tree
Showing 41 changed files with 6,492 additions and 420 deletions.
51 changes: 44 additions & 7 deletions Cargo.lock
View file

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

2 changes: 2 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ members = [
"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 +35,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
View file
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
34 changes: 17 additions & 17 deletions contracts/lockdrop/README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,24 +10,24 @@ Note - Users can open muliple lockup positions with different lockup duration fo

### Handle Messages

| Message | Description |
|-----------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `ExecuteMsg::UpdateConfig` | Can only be called by the admin. Facilitates updating configuration parameters |
| `ExecuteMsg::EnableClaims` | Executed by the Bootstrap auction contract when liquidity is added to the ASTRO-UST pool. Enables ASTRO withdrawals by the lockdrop recipients. |
| `ExecuteMsg::InitializePool` | Admin function. Facilitates addition of new Pool (Terraswap Pools) whose LP tokens can then be locked in the lockdrop contract |
| `ExecuteMsg::UpdatePool` | Admin function to update any configuraton parameter for a terraswap pool whose LP tokens are currently accepted for the lockdrop |
| `ExecuteMsg::IncreaseLockup` | Facilitates opening a new user position or adding to an existing position |
| `ExecuteMsg::IncreaseAstroIncentives` | Admin function to increase the ASTRO incentives that are to be distributed |
| Message | Description |
|-----------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| `ExecuteMsg::UpdateConfig` | Can only be called by the admin. Facilitates updating configuration parameters |
| `ExecuteMsg::EnableClaims` | Executed by the Bootstrap auction contract when liquidity is added to the ASTRO-UST pool. Enables ASTRO withdrawals by the lockdrop recipients. |
| `ExecuteMsg::InitializePool` | Admin function. Facilitates addition of new Pool (Terraswap Pools) whose LP tokens can then be locked in the lockdrop contract |
| `ExecuteMsg::UpdatePool` | Admin function to update any configuraton parameter for a terraswap pool whose LP tokens are currently accepted for the lockdrop |
| `ExecuteMsg::IncreaseLockup` | Facilitates opening a new user position or adding to an existing position |
| `ExecuteMsg::IncreaseAstroIncentives` | Admin function to increase the ASTRO incentives that are to be distributed |
| `ExecuteMsg::WithdrawFromLockup` | Facilitates LP token withdrawals from lockup positions by users. 100% amount can be withdrawn during deposit window, which is then limited to 50% during 1st half of deposit window which then decreases linearly during 2nd half of deposit window. Only 1 withdrawal can be made by a user during the withdrawal windows |
| `ExecuteMsg::MigrateLiquidity` | Admin function. Facilitates migration of liquidity (locked terraswap LP tokens) from Terraswap to Astroport (Astroport LP tokens) |
| `ExecuteMsg::StakeLpTokens` | Admin function. Facilitates staking of Astroport LP tokens for a particular LP pool with the generator contract |
| `ExecuteMsg::DelegateAstroToAuction` | This function facilitates ASTRO tokens delegation to the Bootstrap auction contract during the bootstrap auction phase. Delegated ASTRO tokens are added to the user's position in the bootstrap auction contract |
| `ExecuteMsg::ClaimRewardsAndOptionallyUnlock` | Facilitates rewards claim by users for a particular lockup position along with unlock when possible |
| `ExecuteMsg::ClaimAssetReward` | Collects assets reward from LP and distribute reward to user if all requirements are met |
| `ExecuteMsg::TogglePoolRewards` | Admin function. Enables assets reward for specified LP |
| `ExecuteMsg::ProposeNewOwner` | Admin function. Creates an offer to change the contract ownership. The validity period of the offer is set in the `expires_in` variable. After `expires_in` seconds pass, the proposal expires and cannot be accepted anymore. |
| `ExecuteMsg::DropOwnershipProposal` | Admin function. Removes an existing offer to change the contract owner. |
| `ExecuteMsg::ClaimOwnership` | Admin function. Used to claim contract ownership. |
| `ExecuteMsg::MigrateLiquidity` | Admin function. Facilitates migration of liquidity (locked terraswap LP tokens) from Terraswap to Astroport (Astroport LP tokens) |
| `ExecuteMsg::StakeLpTokens` | Admin function. Facilitates staking of Astroport LP tokens for a particular LP pool with the generator contract |
| `ExecuteMsg::DelegateAstroToAuction` | This function facilitates ASTRO tokens delegation to the Bootstrap auction contract during the bootstrap auction phase. Delegated ASTRO tokens are added to the user's position in the bootstrap auction contract |
| `ExecuteMsg::ClaimRewardsAndOptionallyUnlock` | Facilitates rewards claim by users for a particular lockup position along with unlock when possible |
| `ExecuteMsg::ClaimAssetReward` | Collects assets reward from LP and distribute reward to user if all requirements are met |
| `ExecuteMsg::TogglePoolRewards` | Admin function. Enables assets reward for specified LP |
| `ExecuteMsg::ProposeNewOwner` | Admin function. Creates an offer to change the contract ownership. The validity period of the offer is set in the `expires_in` variable. After `expires_in` seconds pass, the proposal expires and cannot be accepted anymore. |
| `ExecuteMsg::DropOwnershipProposal` | Admin function. Removes an existing offer to change the contract owner. |
| `ExecuteMsg::ClaimOwnership` | Admin function. Used to claim contract ownership. |

### Handle Messages :: Callback

Expand Down
6 changes: 6 additions & 0 deletions contracts/vesting-lp-pcl/.cargo/config
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[alias]
wasm = "build --release --target wasm32-unknown-unknown"
wasm-debug = "build --target wasm32-unknown-unknown"
unit-test = "test --lib"
integration-test = "test --test integration"
schema = "run --example vesting-lp_schema"
Loading

0 comments on commit 7ae0225

Please sign in to comment.