Merge pull request #7 from vzotova/staking

Token staking contract

Author: pdyraga

contracts/governance/Checkpoints.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.8.0;
+pragma solidity 0.8.9;
 
 import "@openzeppelin/contracts/utils/cryptography/ECDSA.sol";
 import "@openzeppelin/contracts/utils/math/Math.sol";

contracts/staking/IApplication.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity 0.8.4;
+pragma solidity 0.8.9;
 
 /// @title  Application interface for Threshold Network applications
 /// @notice Generic interface for an application. Application is an external
@@ -9,25 +9,25 @@ pragma solidity 0.8.4;
 ///         operator are eligible to slash the stake delegated to that operator.
 interface IApplication {
     /// @notice Used by T staking contract to inform the application that the
-    ///         authorized amount for the given operator increased. The
-    ///         application may do any necessary housekeeping.
-    function authorizationIncreased(address worker, uint256 amount) external;
+    ///         authorized amount for the given operator increased to the
+    ///         given amount. The application may do any necessary housekeeping.
+    function authorizationIncreased(address operator, uint96 amount) external;
 
     /// @notice Used by T staking contract to inform the application that the
     ///         given operator requested to decrease the authorization to the
     ///         given amount. The application should mark the authorization as
     ///         pending decrease and respond to the staking contract with
     ///         `approveAuthorizationDecrease` at its discretion. It may
     ///         happen right away but it also may happen several months later.
-    function authorizationDecreaseRequested(address worker, uint256 amount)
+    function authorizationDecreaseRequested(address operator, uint96 amount)
         external;
 
     /// @notice Used by T staking contract to inform the application the
     ///         authorization has been decreased for the given operator to the
     ///         given amount involuntarily, as a result of slashing. Lets the
     ///         application to do any housekeeping neccessary. Called with 250k
     ///         gas limit and does not revert the transaction if
-    ///         `involuntaryAllocationDecrease` call failed.
-    function involuntaryAllocationDecrease(address worker, uint256 amount)
+    ///         `involuntaryAuthorizationDecrease` call failed.
+    function involuntaryAuthorizationDecrease(address operator, uint96 amount)
         external;
 }

contracts/staking/ILegacyTokenStaking.sol

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 
-pragma solidity 0.8.4;
+pragma solidity 0.8.9;
 
 /// @title IKeepTokenStaking
 /// @notice Interface for Keep TokenStaking contract
@@ -20,12 +20,12 @@ interface IKeepTokenStaking {
     ) external;
 
     /// @notice Gets stake delegation info for the given operator.
-    /// @param _operator Operator address.
+    /// @param operator Operator address.
     /// @return amount The amount of tokens the given operator delegated.
     /// @return createdAt The time when the stake has been delegated.
     /// @return undelegatedAt The time when undelegation has been requested.
     /// If undelegation has not been requested, 0 is returned.
-    function getDelegationInfo(address _operator)
+    function getDelegationInfo(address operator)
         external
         view
         returns (
@@ -36,18 +36,18 @@ interface IKeepTokenStaking {
 
     /// @notice Gets the stake owner for the specified operator address.
     /// @return Stake owner address.
-    function ownerOf(address _operator) external view returns (address);
+    function ownerOf(address operator) external view returns (address);
 
     /// @notice Gets the beneficiary for the specified operator address.
     /// @return Beneficiary address.
-    function beneficiaryOf(address _operator)
+    function beneficiaryOf(address operator)
         external
         view
         returns (address payable);
 
     /// @notice Gets the authorizer for the specified operator address.
     /// @return Authorizer address.
-    function authorizerOf(address _operator) external view returns (address);
+    function authorizerOf(address operator) external view returns (address);
 
     /// @notice Gets the eligible stake balance of the specified address.
     /// An eligible stake is a stake that passed the initialization period
@@ -57,10 +57,10 @@ interface IKeepTokenStaking {
     /// Operator with a minimum required amount of eligible stake can join the
     /// network and participate in new work selection.
     ///
-    /// @param _operator address of stake operator.
-    /// @param _operatorContract address of operator contract.
+    /// @param operator address of stake operator.
+    /// @param operatorContract address of operator contract.
     /// @return balance an uint256 representing the eligible stake balance.
-    function eligibleStake(address _operator, address _operatorContract)
+    function eligibleStake(address operator, address operatorContract)
         external
         view
         returns (uint256 balance);
@@ -70,15 +70,15 @@ interface IKeepTokenStaking {
 /// @notice Interface for NuCypher StakingEscrow contract
 interface INuCypherStakingEscrow {
     /// @notice Slash the staker's stake and reward the investigator
-    /// @param _staker Staker's address
-    /// @param _penalty Penalty
-    /// @param _investigator Investigator
-    /// @param _reward Reward for the investigator
+    /// @param staker Staker's address
+    /// @param penalty Penalty
+    /// @param investigator Investigator
+    /// @param reward Reward for the investigator
     function slashStaker(
-        address _staker,
-        uint256 _penalty,
-        address _investigator,
-        uint256 _reward
+        address staker,
+        uint256 penalty,
+        address investigator,
+        uint256 reward
     ) external;
 
     /// @notice Request merge between NuCypher staking contract and T staking contract.
@@ -88,51 +88,5 @@ interface INuCypherStakingEscrow {
         returns (uint256);
 
     /// @notice Get all tokens belonging to the staker
-    function getAllTokens(address _staker) external view returns (uint256);
-}
-
-/// @title IKeepTokenGrant
-/// @notice Interface for Keep TokenGrant contract
-interface IKeepTokenGrant {
-    /// @notice Gets grant by ID. Returns only basic grant data.
-    /// @param _id ID of the token grant.
-    /// @return amount The amount of tokens the grant provides.
-    /// @return withdrawn The amount of tokens that have already been withdrawn
-    ///                   from the grant.
-    /// @return staked The amount of tokens that have been staked from the grant.
-    /// @return revokedAmount The number of tokens revoked from the grantee.
-    /// @return revokedAt Timestamp at which grant was revoked by the grant manager.
-    /// @return grantee The grantee of grant.
-    function getGrant(uint256 _id)
-        external
-        view
-        returns (
-            uint256 amount,
-            uint256 withdrawn,
-            uint256 staked,
-            uint256 revokedAmount,
-            uint256 revokedAt,
-            address grantee
-        );
-
-    /// @notice Gets grant stake details of the given operator.
-    /// @param operator The operator address.
-    /// @return grantId ID of the token grant.
-    /// @return amount The amount of tokens the given operator delegated.
-    /// @return stakingContract The address of staking contract.
-    function getGrantStakeDetails(address operator)
-        external
-        view
-        returns (
-            uint256 grantId,
-            uint256 amount,
-            address stakingContract
-        );
-}
-
-/// @title IKeepManagedGrant
-/// @notice Interface for Keep ManagedGrant contract
-interface IKeepManagedGrant {
-    /// @notice Returns address of grantee
-    function grantee() external view returns (address);
+    function getAllTokens(address staker) external view returns (uint256);
 }