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.

Sign up for GitHub

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

Jump to bottom

First step to remove legacy #153

Merged
merged 6 commits into from
Nov 20, 2023
Merged

First step to remove legacy #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2f3e022
Removes support for legacy staking in TokenStaking contract, increasi…
vzotova Sep 19, 2023
a96041f
Fixes solhint warning, removes system test job, removes legacy deploy…
vzotova Sep 19, 2023
3dca8f7
Remove info about legacy stakes from docs
vzotova Sep 21, 2023
ff371be
Permissionless method to force unstake legacy stakes TokenStaking
vzotova Sep 21, 2023
837744c
Apply suggestions from code review
vzotova Sep 29, 2023
1bc2a56
Apply suggestions from code review
vzotova Oct 24, 2023
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
28 changes: 0 additions & 28 deletions .github/workflows/contracts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,34 +75,6 @@ jobs:
if: github.ref != 'refs/heads/dapp-development'
run: yarn test

contracts-system-tests:
needs: contracts-detect-changes
if: |
needs.contracts-detect-changes.outputs.system-tests == 'true'
&& github.ref != 'refs/heads/dapp-development'
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

- uses: actions/setup-node@v3
with:
# Using fixed version, because 18.16 was sometimes causing issues with
# artifacts generation during `hardhat compile` - see
# https://github.com/NomicFoundation/hardhat/issues/3877
node-version: "18.15.0"
cache: "yarn"

- name: Install dependencies
run: yarn install

- name: Build contracts
run: yarn build

- name: Run system tests
env:
FORKING_URL: ${{ secrets.MAINNET_ETH_HOSTNAME_HTTP }}
run: yarn test:system

contracts-deployment-dry-run:
runs-on: ubuntu-latest
steps:
Expand Down
38 changes: 19 additions & 19 deletions contracts/governance/BaseTokenholderGovernor.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,16 @@ contract BaseTokenholderGovernor is
return super.supportsInterface(interfaceId);
}

function proposalDeadline(uint256 proposalId)
public
view
virtual
override(IGovernor, Governor, GovernorPreventLateQuorum)
returns (uint256)
{
return super.proposalDeadline(proposalId);
}

function _execute(
uint256 proposalId,
address[] memory targets,
Expand All @@ -141,25 +151,6 @@ contract BaseTokenholderGovernor is
return super._cancel(targets, values, calldatas, descriptionHash);
}

function _executor()
internal
view
override(Governor, GovernorTimelockControl)
returns (address)
{
return super._executor();
}

function proposalDeadline(uint256 proposalId)
public
view
virtual
override(IGovernor, Governor, GovernorPreventLateQuorum)
returns (uint256)
{
return super.proposalDeadline(proposalId);
}

function _castVote(
uint256 proposalId,
address account,
Expand All @@ -173,4 +164,13 @@ contract BaseTokenholderGovernor is
{
return super._castVote(proposalId, account, support, reason);
}

function _executor()
internal
view
override(Governor, GovernorTimelockControl)
returns (address)
{
return super._executor();
}
}
105 changes: 0 additions & 105 deletions contracts/staking/ILegacyTokenStaking.sol
View file
Open in desktop

This file was deleted.

93 changes: 18 additions & 75 deletions contracts/staking/IStaking.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,25 +51,6 @@ interface IStaking {
uint96 amount
) external;

/// @notice Copies delegation from the legacy KEEP staking contract to T
/// staking contract. No tokens are transferred. Caches the active
/// stake amount from KEEP staking contract. Can be called by
/// anyone.
/// @dev The staking provider in T staking contract is the legacy KEEP
/// staking contract operator.
function stakeKeep(address stakingProvider) external;

/// @notice Copies delegation from the legacy NU staking contract to T
/// staking contract, additionally appointing staking provider,
/// beneficiary and authorizer roles. Caches the amount staked in NU
/// staking contract. Can be called only by the original delegation
/// owner.
function stakeNu(
address stakingProvider,
address payable beneficiary,
address authorizer
) external;
Comment on lines -67 to -71
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🪓


/// @notice Allows the Governance to set the minimum required stake amount.
/// This amount is required to protect against griefing the staking
/// contract and individual applications are allowed to require
Expand Down Expand Up @@ -181,16 +162,6 @@ interface IStaking {
/// transfer to the staking contract.
function topUp(address stakingProvider, uint96 amount) external;

/// @notice Propagates information about stake top-up from the legacy KEEP
/// staking contract to T staking contract. Can be called only by
/// the owner or the staking provider.
function topUpKeep(address stakingProvider) external;

/// @notice Propagates information about stake top-up from the legacy NU
/// staking contract to T staking contract. Can be called only by
/// the owner or the staking provider.
function topUpNu(address stakingProvider) external;

//
//
// Undelegating a stake (unstaking)
Expand All @@ -214,17 +185,17 @@ interface IStaking {
/// called only by the delegation owner or the staking provider.
function unstakeKeep(address stakingProvider) external;

/// @notice Reduces cached legacy NU stake amount by the provided amount.
/// Reverts if there is at least one authorization higher than the
/// sum of remaining legacy NU stake and liquid T stake for that
/// staking provider or if the untaked amount is higher than the
/// cached legacy stake amount. If succeeded, the legacy NU stake
/// can be partially or fully undelegated on the legacy staking
/// contract. This function allows to unstake from NU staking
/// contract and still being able to operate in T network and
/// earning rewards based on the liquid T staked. Can be called only
/// by the delegation owner or the staking provider.
function unstakeNu(address stakingProvider, uint96 amount) external;
/// @notice Sets to 0 the amount of T that is cached from the legacy
/// NU staking contract. Reverts if there is at least one
/// authorization higher than the sum of remaining legacy NU stake
/// and native T stake for that staking provider or if the unstaked
/// amount is higher than the cached legacy stake amount. If succeeded,
/// the legacy NU stake can be partially or fully undelegated on
/// the legacy NU staking contract. This function allows to unstake
/// from NU staking contract while still being able to operate in
/// T network and earning rewards based on the native T staked.
/// Can be called only by the stake owner or the staking provider.
function unstakeNu(address stakingProvider) external;

/// @notice Sets cached legacy stake amount to 0, sets the liquid T stake
/// amount to 0 and withdraws all liquid T from the stake to the
Expand All @@ -239,34 +210,6 @@ interface IStaking {
//
//

/// @notice Notifies about the discrepancy between legacy KEEP active stake
/// and the amount cached in T staking contract. Slashes the staking
/// provider in case the amount cached is higher than the actual
/// active stake amount in KEEP staking contract. Needs to update
/// authorizations of all affected applications and execute an
/// involuntary allocation decrease on all affected applications.
/// Can be called by anyone, notifier receives a reward.
function notifyKeepStakeDiscrepancy(address stakingProvider) external;

/// @notice Notifies about the discrepancy between legacy NU active stake
/// and the amount cached in T staking contract. Slashes the
/// staking provider in case the amount cached is higher than the
/// actual active stake amount in NU staking contract. Needs to
/// update authorizations of all affected applications and execute
/// an involuntary allocation decrease on all affected applications.
/// Can be called by anyone, notifier receives a reward.
function notifyNuStakeDiscrepancy(address stakingProvider) external;

/// @notice Sets the penalty amount for stake discrepancy and reward
/// multiplier for reporting it. The penalty is seized from the
/// delegated stake, and 5% of the penalty, scaled by the
/// multiplier, is given to the notifier. The rest of the tokens are
/// burned. Can only be called by the Governance. See `seize` function.
function setStakeDiscrepancyPenalty(
uint96 penalty,
uint256 rewardMultiplier
) external;

/// @notice Sets reward in T tokens for notification of misbehaviour
/// of one staking provider. Can only be called by the governance.
function setNotificationReward(uint96 reward) external;
Expand Down Expand Up @@ -360,20 +303,20 @@ interface IStaking {

/// @notice Returns minimum possible stake for T, KEEP or NU in T
/// denomination.
/// @dev For example, suppose the given staking provider has 10 T, 20 T
/// worth of KEEP, and 30 T worth of NU all staked, and the maximum
/// @dev For example, suppose the given staking provider has 10 T, 20 T worth
/// of KEEP, and 30 T worth of NU all staked, and the maximum
/// application authorization is 40 T, then `getMinStaked` for
/// that staking provider returns:
/// * 0 T if KEEP stake type specified i.e.
/// min = 40 T max - (10 T + 30 T worth of NU) = 0 T
/// min = 40 T max - (10 T) = 30 T
/// * 10 T if NU stake type specified i.e.
/// min = 40 T max - (10 T + 20 T worth of KEEP) = 10 T
/// min = 40 T max - (10 T) = 30 T
/// * 0 T if T stake type specified i.e.
/// min = 40 T max - (20 T worth of KEEP + 30 T worth of NU) < 0 T
/// min = 40 T max = 40 T
/// In other words, the minimum stake amount for the specified
/// stake type is the minimum amount of stake of the given type
/// needed to satisfy the maximum application authorization given the
/// staked amounts of the other stake types for that staking provider.
/// needed to satisfy the maximum application authorization given
/// the staked amounts of the T stake types for that staking provider.
function getMinStaked(address stakingProvider, StakeType stakeTypes)
external
view
Expand Down
Loading