WIP: feat/housekeeping

.env.example

@@ -1,4 +1,6 @@
 INFURA_TOKEN="909b972ab2ff3afb8b0f8f6a9667test"
 BOR_CHAIN_URL="http://localhost:9545"
 ENV="local"
-MNEMONIC_DEV="poly radar mass judge dismiss just intact mind resemble fringe diary casino"
+MNEMONIC_DEV="poly radar mass judge dismiss just intact mind resemble fringe diary casino"
+ALCHEMY_KEY=""
+ETHERSCAN_API_KEY=""

.gitignore

@@ -2,7 +2,6 @@ node_modules
 artifacts
 out
 contractAddresses.json
-.vscode
 
 
 # ignore generated files

.pre-commit-config.yaml

@@ -5,7 +5,6 @@ repos:
       - id: mixed-line-ending
         args: ["--fix=lf"]
         description: Forces to replace line ending by the UNIX 'lf' character.
-        exclude: "^docs/autogen"
   - repo: local
     hooks:
       - id: format
@@ -15,16 +14,8 @@ repos:
         entry: forge fmt
         exclude: "^lib/"
         pass_filenames: true
-      - id: doc
-        name: Generate documentation
-        description: Generate docs with `forge doc`
-        language: system
-        # generates docs and unstages files if only the commit hash changed within the file, this way only when the documentation is updated, the documentation needs to be regenerated and only the changed files are pushed
-        entry: "scripts/util/doc_gen.sh"
-        pass_filenames: false
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: "v3.0.3"
     hooks:
       - id: prettier
         name: Format non solidity files with prettier
-        exclude: "^docs/autogen"

.prettierrc

@@ -1,16 +1,5 @@
 {
   "overrides": [
-    {
-      "files": "*.sol",
-      "options": {
-        "printWidth": 120,
-        "tabWidth": 4,
-        "useTabs": false,
-        "singleQuote": false,
-        "bracketSpacing": false,
-        "explicitTypes": "always"
-      }
-    },
     {
       "files": "*.js",
       "options": {

.solhint.json

@@ -0,0 +1,8 @@
+{
+  "extends": "solhint:recommended",
+  "rules": {
+      "compiler-version": "off",
+      "max-states-count": "off",
+      "reason-string": "off"
+    }
+}

README.md

@@ -80,7 +80,7 @@ npm run bor:clean
 Run Hardhat test
 
 ```
-npm test:hardhat
+npm run test:hardhat
 ```
 
 ### Coverage

contracts/common/misc/DrainStakeManager.sol

@@ -1,28 +1,17 @@
 pragma solidity ^0.5.2;
 
 import { StakeManagerStorage } from "../../staking/stakeManager/StakeManagerStorage.sol";
+import { StakeManagerStorageExtension } from "../../staking/stakeManager/StakeManagerStorageExtension.sol";
 import { GovernanceLockable } from "../mixin/GovernanceLockable.sol";
-import {IValidatorShare} from "../../staking/validatorShare/IValidatorShare.sol";
 import {Initializable} from "../../common/mixin/Initializable.sol";
 
 // Inheriting from Initializable as well to keep the storage layout same
-contract DrainStakeManager is StakeManagerStorage, Initializable {
+contract DrainStakeManager is StakeManagerStorage, Initializable, StakeManagerStorageExtension {
     constructor() public GovernanceLockable(address(0x0)) {}
 
-    function drain(address destination, uint amount) external onlyOwner {
-        require(token.transfer(destination, amount), "Drain failed");
-    }
-
-    function drainValidatorShares(
-        uint256 validatorId,
-        address _token,
-        address payable destination,
-        uint256 amount
-    ) external onlyOwner {
-        address contractAddr = validators[validatorId].contractAddress;
-        require(contractAddr != address(0x0), "unknown validator or no delegation enabled");
-        IValidatorShare validatorShare = IValidatorShare(contractAddr);
-        validatorShare.drain(_token, destination, amount);
+    function drain(address destination) external onlyOwner {
+        require(token.transfer(destination, token.balanceOf(address(this))), "Drain failed");
+        require(tokenMatic.transfer(destination, tokenMatic.balanceOf(address(this))), "Drain failed");
     }
 
     // Overriding isOwner from Ownable.sol because owner() and transferOwnership() have been overridden by UpgradableProxy

contracts/root/IRootChain.sol

@@ -2,8 +2,6 @@ pragma solidity ^0.5.2;
 
 
 interface IRootChain {
-    function slash() external;
-
     function submitHeaderBlock(bytes calldata data, bytes calldata sigs)
         external;
 

contracts/root/RootChain.sol

@@ -65,10 +65,6 @@ contract RootChain is RootChainStorage, IRootChain {
         return headerBlocks[currentHeaderBlock()].end;
     }
 
-    function slash() external {
-        //TODO: future implementation
-    }
-
     function currentHeaderBlock() public view returns (uint256) {
         return _nextHeaderBlock.sub(MAX_DEPOSITS);
     }

contracts/staking/stakeManager/IStakeManager.sol

@@ -1,16 +1,6 @@
 pragma solidity 0.5.17;
 
 contract IStakeManager {
-    // validator replacement
-    function startAuction(
-        uint256 validatorId,
-        uint256 amount,
-        bool acceptDelegation,
-        bytes calldata signerPubkey
-    ) external;
-
-    function confirmAuctionBid(uint256 validatorId, uint256 heimdallFee) external;
-
     function transferFunds(
         uint256 validatorId,
         uint256 amount,
@@ -69,8 +59,6 @@ contract IStakeManager {
 
     function ownerOf(uint256 tokenId) public view returns (address);
 
-    function slash(bytes calldata slashingInfoList) external returns (uint256);
-
     function validatorStake(uint256 validatorId) public view returns (uint256);
 
     function epoch() public view returns (uint256);
@@ -86,13 +74,4 @@ contract IStakeManager {
     function withdrawDelegatorsReward(uint256 validatorId) public returns(uint256);
 
     function delegatorsReward(uint256 validatorId) public view returns(uint256);
-
-    function dethroneAndStake(
-        address auctionUser,
-        uint256 heimdallFee,
-        uint256 validatorId,
-        uint256 auctionAmount,
-        bool acceptDelegation,
-        bytes calldata signerPubkey
-    ) external;
 }