Skip to content

Commit

Permalink
fix(lockup): final cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
telezhnaya committed Jul 5, 2021
1 parent f3621d7 commit c996969
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 1 addition & 2 deletions lockup/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -707,8 +707,7 @@ it creates the deficit (otherwise the foundation can proceed with withdrawal).

The current termination status should be `VestingTerminatedWithDeficit`.

The NEAR Foundation needs to first unstake tokens in the staking pool and then once tokens
become liquid, withdraw them from the staking pool to the contract.
The NEAR Foundation needs to first unstake tokens in the staking pool and then once tokens become liquid, withdraw them from the staking pool to the contract.
This is done by calling `termination_prepare_to_withdraw`.

```bash
Expand Down
Binary file modified lockup/res/lockup_contract.wasm
Binary file not shown.
6 changes: 4 additions & 2 deletions lockup/src/types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,12 @@ pub struct LockupInformation {
#[derive(BorshDeserialize, BorshSerialize, Deserialize, Serialize, Debug)]
#[serde(crate = "near_sdk::serde")]
pub enum TransfersInformation {
/// The timestamp when the transfers were enabled. The lockup period starts at this timestamp.
/// The timestamp when the transfers were enabled.
TransfersEnabled {
transfers_timestamp: WrappedTimestamp,
},
/// The account ID of the transfers poll contract, to check if the transfers are enabled.
/// The lockup period will start when the transfer voted to be enabled.
/// The lockup period can start only after the transfer voted to be enabled.
/// At the launch of the network transfers are disabled for all lockup contracts, once transfers
/// are enabled, they can't be disabled and don't need to be checked again.
TransfersDisabled { transfer_poll_account_id: AccountId },
Expand Down Expand Up @@ -128,6 +128,7 @@ impl VestingSchedule {
#[derive(Serialize, Deserialize, Debug)]
#[serde(crate = "near_sdk::serde")]
pub enum VestingScheduleOrHash {
/// [deprecated] After transfers are enabled, only public schedule is used.
/// The vesting schedule is private and this is a hash of (vesting_schedule, salt).
/// In JSON, the hash has to be encoded with base64 to a string.
VestingHash(Base64VecU8),
Expand All @@ -140,6 +141,7 @@ pub enum VestingScheduleOrHash {
#[serde(crate = "near_sdk::serde")]
pub enum VestingInformation {
None,
/// [deprecated] After transfers are enabled, only public schedule is used.
/// Vesting schedule is hashed for privacy and only will be revealed if the NEAR foundation
/// has to terminate vesting.
/// The contract assume the vesting schedule doesn't affect lockup release and duration, because
Expand Down

0 comments on commit c996969

Please sign in to comment.