fix lock duration

- add lockStakeWithEndTime
- update check validator endtime

.eslintrc

@@ -15,7 +15,8 @@
        "indent": ["error", 4],
        "func-names": "off",
        "max-len": "off",
-       "no-underscore-dangle": "off"
+       "no-underscore-dangle": "off",
+       "no-restricted-syntax": "off"
      }
 }
 

contracts/common/Decimal.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 library Decimal {
     // unit is used for decimals, e.g. 0.123456

contracts/common/ReentrancyGuard.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 import "./Initializable.sol";
 
 /**

contracts/erc20/base/ERC20.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "@openzeppelin/contracts/math/SafeMath.sol";
 import "./IERC20.sol";

contracts/erc20/base/ERC20Burnable.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./ERC20.sol";
 

contracts/erc20/base/ERC20Detailed.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./IERC20.sol";
 import "../../common/Initializable.sol";

contracts/erc20/base/ERC20Mintable.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./ERC20.sol";
 import "./MinterRole.sol";

contracts/erc20/base/IERC20.sol

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 /**
  * @dev Interface of the ERC20 standard as defined in the EIP.

contracts/erc20/base/MinterRole.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./Roles.sol";
 

contracts/erc20/base/Roles.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 
 /**

contracts/ownership/Ownable.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "../common/Initializable.sol";
 

contracts/sfc/ConstantsManager.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "@openzeppelin/contracts/math/SafeMath.sol";
 import "../ownership/Ownable.sol";

contracts/sfc/GasPriceConstants.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "../common/Decimal.sol";
 

contracts/sfc/NetworkInitializer.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./SFCI.sol";
 import "./NodeDriver.sol";

contracts/sfc/NodeDriver.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "@openzeppelin/contracts/math/SafeMath.sol";
 import "../common/Initializable.sol";

contracts/sfc/NodeDriverI.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 interface NodeDriverI {
     function setGenesisValidator(address _auth, uint256 validatorID, bytes calldata pubkey, uint256 status, uint256 createdEpoch, uint256 createdTime, uint256 deactivatedEpoch, uint256 deactivatedTime) external;

contracts/sfc/SFC.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./GasPriceConstants.sol";
 import "../version/Version.sol";

contracts/sfc/SFCBase.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./SFCState.sol";
 

contracts/sfc/SFCI.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 interface SFCI {
     function currentSealedEpoch() external view returns (uint256);

contracts/sfc/SFCLib.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "../common/Decimal.sol";
 import "./GasPriceConstants.sol";
@@ -441,26 +442,29 @@ contract SFCLib is SFCBase {
     function _lockStake(address delegator, uint256 toValidatorID, uint256 lockupDuration, uint256 amount) internal {
         require(amount <= getUnlockedStake(delegator, toValidatorID), "not enough stake");
         require(getValidator[toValidatorID].status == OK_STATUS, "validator isn't active");
-
-        require(lockupDuration >= c.minLockupDuration() && lockupDuration <= c.maxLockupDuration(), "incorrect duration");
-        uint256 endTime = _now().add(lockupDuration);
+        uint256 duration = lockupDuration;
+        require(duration >= c.minLockupDuration() && duration <= c.maxLockupDuration(), "incorrect duration");
+        uint256 endTime = _now().add(duration);
         address validatorAddr = getValidator[toValidatorID].auth;
         if (delegator != validatorAddr) {
-            require(getLockupInfo[validatorAddr][toValidatorID].endTime >= endTime, "validator lockup period will end earlier");
+            if (getLockupInfo[validatorAddr][toValidatorID].endTime >= endTime) {
+                endTime = getLockupInfo[validatorAddr][toValidatorID].endTime;
+                duration = endTime.sub(_now());
+            }
         }
 
         _stashRewards(delegator, toValidatorID);
 
         // check lockup duration after _stashRewards, which has erased previous lockup if it has unlocked already
         LockedDelegation storage ld = getLockupInfo[delegator][toValidatorID];
-        require(lockupDuration >= ld.duration, "lockup duration cannot decrease");
+        require(duration >= ld.duration, "lockup duration cannot decrease");
 
         ld.lockedStake = ld.lockedStake.add(amount);
         ld.fromEpoch = currentEpoch();
         ld.endTime = endTime;
-        ld.duration = lockupDuration;
+        ld.duration = duration;
 
-        emit LockedUpStake(delegator, toValidatorID, lockupDuration, amount);
+        emit LockedUpStake(delegator, toValidatorID, duration, amount);
     }
 
     function lockStake(uint256 toValidatorID, uint256 lockupDuration, uint256 amount) public {
@@ -470,6 +474,14 @@ contract SFCLib is SFCBase {
         _lockStake(delegator, toValidatorID, lockupDuration, amount);
     }
 
+    function lockStakeWithEndTime(uint256 toValidatorID, uint256 endTime, uint256 amount) public {
+        address delegator = msg.sender;
+        require(amount > 0, "zero amount");
+        require(endTime > now(), "invalid endtime");
+        require(!isLockedUp(delegator, toValidatorID), "already locked up");
+        _lockStake(delegator, toValidatorID, endTime.sub(now), amount);
+    }
+
     function relockStake(uint256 toValidatorID, uint256 lockupDuration, uint256 amount) public {
         address delegator = msg.sender;
         _lockStake(delegator, toValidatorID, lockupDuration, amount);

contracts/sfc/SFCState.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./NodeDriver.sol";
 import "../ownership/Ownable.sol";

contracts/sfc/StakeTokenizer.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./SFC.sol";
 import "../erc20/base/ERC20Burnable.sol";

contracts/sfc/Updater.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "./NodeDriver.sol";
 import "./SFC.sol";

contracts/test/StubEvmWriter.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "../sfc/NodeDriver.sol";
 

contracts/test/UnitTestConstantsManager.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 import "../sfc/ConstantsManager.sol";
 
 contract UnitTestConstantsManager is ConstantsManager {

contracts/test/UnitTestSFC.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 import "../sfc/SFC.sol";
 import "../sfc/SFCI.sol";

contracts/version/Version.sol

@@ -1,4 +1,5 @@
-pragma solidity ^0.5.0.0;
+pragma solidity ^0.5.0;
+
 
 /**
  * @dev Version contract gives the versioning information of the implementation contract

hardhat.config.js

@@ -7,54 +7,54 @@ require('hardhat-contract-sizer');
 require('@nomiclabs/hardhat-etherscan');
 require('dotenv').config();
 
-const PRIVATE_KEY = process.env.PRIVATE_KEY;
-const API_KEY = process.env.API_KEY;
+const { PRIVATE_KEY } = process.env;
+const { API_KEY } = process.env;
 
 module.exports = {
-  networks: {
-    hardhat: {
-      allowUnlimitedContractSize: true
+    networks: {
+        hardhat: {
+            allowUnlimitedContractSize: true,
+        },
+        localhost: {
+            url: 'http://127.0.0.1:8545',
+        },
+        mainnet: {
+            url: 'https://rpc-mainnet.uniultra.xyz',
+            chainId: 39,
+        },
+        testnet: {
+            url: 'https://rpc-nebulas-testnet.uniultra.xyz',
+            chainId: 2484,
+            accounts: [`0x${PRIVATE_KEY}`],
+        },
     },
-    localhost: {
-      url: 'http://127.0.0.1:8545'
+    etherscan: {
+        apiKey: {
+            u2uTestnet: API_KEY,
+        },
     },
-    mainnet: {
-      url: 'https://rpc-mainnet.uniultra.xyz',
-      chainId: 39
+    contractSizer: {
+        runOnCompile: true,
+    },
+    mocha: {},
+    abiExporter: {
+        path: './build/contracts',
+        clear: true,
+        flat: true,
+        spacing: 2,
+    },
+    solidity: {
+        version: '0.5.17',
+        settings: {
+            optimizer: {
+                enabled: true,
+                runs: 200,
+            },
+        },
+    },
+    gasReporter: {
+        currency: 'USD',
+        enabled: false,
+        gasPrice: 50,
     },
-    testnet: {
-      url: 'https://rpc-nebulas-testnet.uniultra.xyz',
-      chainId: 2484,
-      accounts: [`0x${PRIVATE_KEY}`]
-    }
-  },
-  etherscan: {
-    apiKey: {
-      u2uTestnet: API_KEY
-    }
-  },
-  contractSizer: {
-    runOnCompile: true
-  },
-  mocha: {},
-  abiExporter: {
-    path: './build/contracts',
-    clear: true,
-    flat: true,
-    spacing: 2
-  },
-  solidity: {
-    version: '0.5.17',
-    settings: {
-      optimizer: {
-        enabled: true,
-        runs: 200
-      }
-    }
-  },
-  gasReporter: {
-    currency: 'USD',
-    enabled: false,
-    gasPrice: 50
-  }
 };