feat: lockdrop refactor #6

swelf19 · 2023-02-09T16:17:45Z

Lockdrop contract, based on astroports one. https://www.notion.so/TGE-Contracts-Technical-Design-f1ebdeeac58240dcb004e93887caf046?pvs=4#e4208b9f0cf444849334fc91d0291fa7

implement query_user_lockup_total_at_height query
implement query_lockup_total_at_height query
implement instant withdraw of airdroppped tokens in amount of 2.5*reward_size during handle_claim_rewards_and_unlock_for_lockup call

zavgorodnii · 2023-03-14T11:51:16Z

contracts/auction/schema/cw20_hook_msg.json

@@ -25,10 +25,10 @@
    {
      "type": "object",
      "required": [
-        "increase_astro_incentives"
+        "increase_n_t_r_n_incentives"


looks weird, maybe we can use some serde annotations to fix it?

zavgorodnii · 2023-03-14T12:12:15Z

contracts/lockdrop/schema/config.json

-      "description": "Bootstrap Auction contract address",
-      "anyOf": [
+    "credit_contract": {
+      "description": "Credit contract address",


contracts/lockdrop/src/contract.rs

zavgorodnii · 2023-03-14T12:24:55Z

contracts/lockdrop/src/contract.rs

        auction_contract: None,
        generator: None,
        init_timestamp: msg.init_timestamp,
+        lock_window: msg.deposit_window,


why do we have this naming inconsistency?

zavgorodnii · 2023-03-14T12:29:53Z

contracts/lockdrop/src/contract.rs

@@ -126,49 +152,21 @@ pub fn instantiate(
 ///
 /// ## Execute messages
 ///
-/// * **ExecuteMsg::Receive(msg)** Parse incoming messages from the ASTRO token.
+/// * **ExecuteMsg::Receive(msg)** Parse incoming messages from the cNTRN token.
 ///
 /// * **ExecuteMsg::UpdateConfig { new_config }** Admin function to update configuration parameters.
 ///
 /// * **ExecuteMsg::InitializePool {


i don't think i see InitializePool handler here

zavgorodnii · 2023-03-14T14:13:52Z

contracts/lockdrop/src/contract.rs

+
+                LockupInfoV2 {
+                    lp_units_locked: amount,
+                    astroport_lp_transferred: None,


something's not right here

zavgorodnii · 2023-03-15T09:04:16Z

contracts/lockdrop/src/contract.rs

        return Err(StdError::generic_err("Unauthorized"));
    }

    // CHECK :: Is lockdrop deposit window closed
-    if env.block.time.seconds() >= config.init_timestamp + config.deposit_window {
+    if env.block.time.seconds() >= config.init_timestamp + config.lock_window {


also looks weird

swelf19 · 2023-03-14T10:12:03Z

contracts/lockdrop/src/contract.rs

        auction_contract: None,
        generator: None,
        init_timestamp: msg.init_timestamp,
+        lock_window: msg.deposit_window,


I believe originally i just renamed deposit -> lock window. So we need only one config param.

swelf19 · 2023-03-14T10:19:21Z

contracts/lockdrop/src/contract.rs

-        >= config.init_timestamp + config.deposit_window + config.withdrawal_window
-    {
-        return Err(StdError::generic_err("ASTRO is already being distributed"));
+    if env.block.time.seconds() >= config.init_timestamp + config.lock_window {


config.init_timestamp + config.lock_window + config.withdraw_window i think, as it was in original contract

swelf19 · 2023-03-14T10:30:09Z

contracts/lockdrop/src/contract.rs

        return Err(StdError::generic_err("Unauthorized"));
    }

    // CHECK :: Is lockdrop deposit window closed
-    if env.block.time.seconds() >= config.init_timestamp + config.deposit_window {
+    if env.block.time.seconds() >= config.init_timestamp + config.lock_window {
        return Err(StdError::generic_err(
            "Pools cannot be added post deposit window closure",


We have added pools during initialize message, at thei point we transfer all the LP tokens from auction to the lockdrop and stake them into the generator. So i think we need to rephrase the error msg to something like "Pools cannot be staked post deposit window closure"

swelf19 · 2023-03-14T10:35:25Z

contracts/lockdrop/src/contract.rs

 }

-/// Admin function to update LP Pool Configuration. Returns a default object of type [`Response`].
+/// Hook function to increase Lockup position size when any of the supported LP Tokens are sent to the contract by the user. Returns a default object of type [`Response`].


We do not send any LP at this point, only create lock position(or updates the existing one) on behalf of user

swelf19 · 2023-03-14T13:03:29Z

contracts/lockdrop/src/contract.rs

 ///
-/// * **incentives_share** is an object of type [`u64`]. Parameter defining share of total ASTRO incentives are allocated for this pool
-pub fn handle_update_pool(
+/// * **duration** is an object of type [`u64`]. Number of seconds the LP token is locked for (lockup period begins post the withdrawal window closure).


Why seconds? Isn't it easier to operate some kind of months? At least from user perpective.

please don't, otherwise integration tests will be screwed

zavgorodnii · 2023-03-15T13:58:06Z

contracts/lockdrop/src/contract.rs

-        .is_some()
-    {
-        return Err(StdError::generic_err("Already supported"));
+    if info.sender != pool_info.pool {


the naming here is a bit misleading; it's not the pool, it's the cw20 lp staking contract

ratik · 2023-03-17T15:03:47Z

packages/astroport_periphery/src/lockdrop.rs

+    pub atom_token: String,
+    /// Address of USDC/NTRN token
+    pub usdc_token: String,


mb?

Suggested change

pub atom_token: String,

/// Address of USDC/NTRN token

pub usdc_token: String,

pub atom_ntrn_token: String,

/// Address of USDC/NTRN token

pub usdc_ntrn_token: String,

* wip: first try * legal: replace license * feat: wip * feat: wip * fix: clippy * feat: update deps * fix: remove incentives * feat: remove token-sale contract * wip * feat: indexed users and vesting * fix: update * feat: withdraw lp * fix: minor * feat: integration with lockdrop * feat: add price-feed contract * feat: hermes config * chore: minor * fix: price feed schema * feat: remove airdrop address * del: remove airdrop contract * chore: add MINIMUM_LIQUIDITY_AMOUNT * feat: send locked tokens to lockdrop contract * fix: update user info on withdraw * fix: clippy * refactor: move msgs * fix: usize -> u16 * feat: refactor integration issues * fix: attribute name * chore: rename withdraw fields * fix: old names * fix: withdraw condition * feat: check price feed data length * chore: add some minor attrs * chore: add price-feed into build * chore: sort price-feed symbols * fix: calc fixes * fix: pool info must be set in update msg * chore: add locked tokens into user info query response

swelf and others added 11 commits February 8, 2023 20:14

wip

30a42d0

wip

729a908

wip

7e405ea

WithdrawFromLockup, claim_airdrop_tokens_with_multiplier_msg

816f18a

missing methods

757d922

query_user_lockup_total_at_height, query_lockup_total_at_height

499ad30

handle_update_config

cdd9bdb

calculate weight according to coefficients

2974613

check duration on validity

63f0b8b

ASTRO -> NTRN renamings

f3a4f8b

basic test for handle_increasing_ntrn_incentives

8a8d704

pr0n00gler changed the base branch from feat/lockdrop-init to main February 28, 2023 14:46

pr0n00gler added 4 commits March 1, 2023 13:25

doc comments + clippy fixes in lockdrop

3bb5d91

Merge branch 'main' into feat/lockdrop-refactor

e92e626

query vested tokens amount from Credits contract

7838af3

fix ci

ae5e759

pr0n00gler marked this pull request as ready for review March 3, 2023 14:35

zavgorodnii reviewed Mar 14, 2023

View reviewed changes

contracts/lockdrop/src/contract.rs Outdated Show resolved Hide resolved

zavgorodnii reviewed Mar 14, 2023

View reviewed changes

set auction in init msg

86160fb

zavgorodnii reviewed Mar 14, 2023

View reviewed changes

zavgorodnii reviewed Mar 15, 2023

View reviewed changes

swelf19 commented Mar 15, 2023

View reviewed changes

zavgorodnii reviewed Mar 15, 2023

View reviewed changes

pr0n00gler added 3 commits March 17, 2023 12:19

review fixes

f44656c

Merge branch 'main' into feat/lockdrop-refactor

d0f8b5e

fmt

f1ab7d4

ratik reviewed Mar 17, 2023

View reviewed changes

pr0n00gler and others added 3 commits March 21, 2023 12:40

set pools info in a separate message, not init msg

509a354

fmt

193a756

zavgorodnii merged commit a4a3830 into main Mar 21, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: lockdrop refactor #6

feat: lockdrop refactor #6

swelf19 commented Feb 9, 2023 •

edited by pr0n00gler

Loading

zavgorodnii Mar 14, 2023

zavgorodnii Mar 14, 2023

zavgorodnii Mar 14, 2023

zavgorodnii Mar 14, 2023

zavgorodnii Mar 14, 2023

zavgorodnii Mar 15, 2023

swelf19 Mar 14, 2023

swelf19 Mar 14, 2023

swelf19 Mar 14, 2023

swelf19 Mar 14, 2023

swelf19 Mar 14, 2023

ratik Mar 17, 2023

zavgorodnii Mar 15, 2023

ratik Mar 17, 2023

feat: lockdrop refactor #6

feat: lockdrop refactor #6

Conversation

swelf19 commented Feb 9, 2023 • edited by pr0n00gler Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

swelf19 commented Feb 9, 2023 •

edited by pr0n00gler

Loading