[eth-contracts] Vendored contract removal + StakingInterface consumption

eth-contracts/.gitignore

@@ -5,4 +5,7 @@
 .npmrc
 ganache_log.txt
 node_modules/
-build/
+build/
+coverage/
+coverage.json
+coverage.zip

eth-contracts/.solcover.js

@@ -0,0 +1,5 @@
+module.exports = {
+ providerOptions: {
+ 'total_accounts': 20
+ }
+}

eth-contracts/contracts/Governance.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.5.0;
 
 import "./service/registry/RegistryContract.sol";
-import "./staking/Staking.sol";
+import "./staking/StakingInterface.sol";
 import "./service/interface/registry/RegistryInterface.sol";
 
 
@@ -102,7 +102,7 @@ contract Governance is RegistryContract {
  address proposer = msg.sender;
 
  // Require proposer is active Staker
-Staking stakingContract = Staking(registry.getContract(stakingProxyOwnerKey));
+StakingInterface stakingContract = StakingInterface(registry.getContract(stakingProxyOwnerKey));
  require(
  stakingContract.totalStakedFor(proposer) > 0,
  "Proposer must be active staker with non-zero stake."
@@ -158,7 +158,7 @@ contract Governance is RegistryContract {
  );
 
  // Require voter is active Staker + get voterStake.
-Staking stakingContract = Staking(registry.getContract(stakingProxyOwnerKey));
+StakingInterface stakingContract = StakingInterface(registry.getContract(stakingProxyOwnerKey));
  uint256 voterStake = stakingContract.totalStakedForAt(
  voter,
  proposals[_proposalId].startBlockNumber
@@ -223,7 +223,7 @@ contract Governance is RegistryContract {
  );
 
  // Require msg.sender is active Staker.
-Staking stakingContract = Staking(registry.getContract(stakingProxyOwnerKey));
+StakingInterface stakingContract = StakingInterface(registry.getContract(stakingProxyOwnerKey));
  require(
  stakingContract.totalStakedForAt(
  msg.sender, proposals[_proposalId].startBlockNumber
@@ -372,4 +372,4 @@ contract Governance is RegistryContract {
 
  return returnData;
  }
-}
+}

eth-contracts/contracts/service/ClaimsManager.sol

@@ -1,5 +1,5 @@
 pragma solidity ^0.5.0;
-import "../staking/Staking.sol";
+import "../staking/StakingInterface.sol";
 import "./registry/RegistryContract.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20Mintable.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol";
@@ -70,7 +70,6 @@ contract ClaimsManager is RegistryContract {
  audiusToken = ERC20Mintable(tokenAddress);
  registry = RegistryInterface(_registryAddress);
 
- fundBlock = 0;
  fundRoundBlockDiff = 10;
  fundBlock = 0;
  fundingAmount = 20 * 10**uint256(DECIMALS); // 20 AUDS = 20 * 10**uint256(DECIMALS)
@@ -108,7 +107,7 @@ contract ClaimsManager is RegistryContract {
  // Permissioned to stakers or contract deployer
  function initiateRound() external {
  requireIsInitialized();
- bool senderStaked = Staking(
+ bool senderStaked = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  ).totalStakedFor(msg.sender) > 0;
 
@@ -146,7 +145,7 @@ contract ClaimsManager is RegistryContract {
  );
 
  address stakingAddress = registry.getContract(stakingProxyOwnerKey);
-Staking stakingContract = Staking(stakingAddress);
+StakingInterface stakingContract = StakingInterface(stakingAddress);
  // Prevent duplicate claim
  uint lastUserClaimBlock = stakingContract.lastClaimedFor(_claimer);
  require(lastUserClaimBlock <= fundBlock, "Claim already processed for user");
@@ -200,7 +199,7 @@ contract ClaimsManager is RegistryContract {
  }
 
  function claimPending(address _sp) external view returns (bool pending) {
- uint lastClaimedForSP = Staking(
+ uint lastClaimedForSP = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  ).lastClaimedFor(_sp);
  return (lastClaimedForSP < fundBlock);

eth-contracts/contracts/service/DelegateManager.sol

@@ -5,7 +5,7 @@ import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol
 
 import "./registry/RegistryContract.sol";
 import "./interface/registry/RegistryInterface.sol";
-import "../staking/Staking.sol";
+import "../staking/StakingInterface.sol";
 import "./ServiceProviderFactory.sol";
 import "./ClaimsManager.sol";
 
@@ -119,7 +119,7 @@ contract DelegateManager is RegistryContract {
  "Delegation not permitted for SP pending claim"
  );
  address delegator = msg.sender;
-Staking stakingContract = Staking(
+StakingInterface stakingContract = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  );
 
@@ -251,12 +251,10 @@ contract DelegateManager is RegistryContract {
  "Delegator must be staked for SP"
  );
 
- Staking stakingContract = Staking(
- registry.getContract(stakingProxyOwnerKey)
- );
-
  // Stake on behalf of target service provider
- stakingContract.undelegateStakeFor(
+ StakingInterface(
+ registry.getContract(stakingProxyOwnerKey)
+ ).undelegateStakeFor(
  serviceProvider,
  delegator,
  unstakeAmount,
@@ -330,7 +328,7 @@ contract DelegateManager is RegistryContract {
  );
 
  // Amount stored in staking contract for owner
- uint totalBalanceInStaking = Staking(
+ uint totalBalanceInStaking = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  ).totalStakedFor(msg.sender);
  require(totalBalanceInStaking > 0, "Stake required for claim");
@@ -412,7 +410,7 @@ contract DelegateManager is RegistryContract {
  msg.sender == registry.getContract(governanceKey),
  "Slash only callable from governance contract"
  );
-Staking stakingContract = Staking(
+StakingInterface stakingContract = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  );
 

eth-contracts/contracts/service/ServiceProviderFactory.sol

@@ -2,7 +2,7 @@ pragma solidity ^0.5.0;
 
 import "./registry/RegistryContract.sol";
 import "./ServiceTypeManager.sol";
-import "../staking/ERCStaking.sol";
+import "../staking/StakingInterface.sol";
 import "./interface/registry/RegistryInterface.sol";
 
 
@@ -146,7 +146,7 @@ contract ServiceProviderFactory is RegistryContract {
 
  // Stake token amount from msg.sender
  if (_stakeAmount > 0) {
-ERCStaking(
+StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  ).stakeFor(msg.sender, _stakeAmount, empty);
  }
@@ -225,7 +225,7 @@ contract ServiceProviderFactory is RegistryContract {
  bool unstaked = false;
  // owned by the user
  if (spDetails[msg.sender].numberOfEndpoints == 1) {
-ERCStaking stakingContract = ERCStaking(
+StakingInterface stakingContract = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  );
  unstakeAmount = stakingContract.totalStakedFor(msg.sender);
@@ -310,7 +310,7 @@ contract ServiceProviderFactory is RegistryContract {
  "Registered endpoint required to decrease stake"
  );
 
-ERCStaking stakingContract = ERCStaking(
+StakingInterface stakingContract = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  );
 
@@ -350,7 +350,7 @@ contract ServiceProviderFactory is RegistryContract {
  "Registered endpoint required to decrease stake"
  );
 
-ERCStaking stakingContract = ERCStaking(
+StakingInterface stakingContract = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
  );
 
@@ -528,10 +528,9 @@ contract ServiceProviderFactory is RegistryContract {
  function validateAccountStakeBalance(address sp)
  external view returns (uint stakedForOwner)
  {
-ERCStaking stakingContract = ERCStaking(
+uint currentlyStakedForOwner = StakingInterface(
  registry.getContract(stakingProxyOwnerKey)
- );
- uint currentlyStakedForOwner = stakingContract.totalStakedFor(sp);
+ ).totalStakedFor(sp);
 
  require(
  currentlyStakedForOwner >= spDetails[sp].minAccountStake,
@@ -552,11 +551,10 @@ contract ServiceProviderFactory is RegistryContract {
  * @notice Update service provider bound status
  */
  function updateServiceProviderBoundStatus(address _serviceProvider) internal {
- ERCStaking stakingContract = ERCStaking(
- registry.getContract(stakingProxyOwnerKey)
- );
  // Validate bounds for total stake
- uint totalSPStake = stakingContract.totalStakedFor(_serviceProvider);
+ uint totalSPStake = StakingInterface(
+ registry.getContract(stakingProxyOwnerKey)
+ ).totalStakedFor(_serviceProvider);
  if (totalSPStake < spDetails[_serviceProvider].minAccountStake ||
  totalSPStake > spDetails[_serviceProvider].maxAccountStake) {
  // Indicate this service provider is out of bounds

eth-contracts/contracts/staking/Staking.sol

@@ -1,19 +1,18 @@
 pragma solidity ^0.5.0;
 
-import "./ERCStaking.sol";
+import "./StakingInterface.sol";
 import "./Checkpointing.sol";
 import "../service/interface/registry/RegistryInterface.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/math/SafeMath.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/SafeERC20.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20.sol";
 import "@openzeppelin/contracts-ethereum-package/contracts/token/ERC20/ERC20Burnable.sol";
 import "../res/IsContract.sol";
-import "../res/TimeHelpers.sol";
 import "../service/registry/RegistryContract.sol";
 
 
 /** NOTE - will call RegistryContract.constructor, which calls Ownable constructor */
-contract Staking is RegistryContract, ERCStaking, ERCStakingHistory, IsContract, TimeHelpers {
+contract Staking is RegistryContract, StakingInterface, IsContract {
  using SafeMath for uint256;
  using Checkpointing for Checkpointing.History;
  using SafeERC20 for ERC20;
@@ -96,7 +95,7 @@ contract Staking is RegistryContract, ERCStaking, ERCStakingHistory, IsContract,
  bytes("")); // TODO: RM bytes requirement if unused
 
  // Update claim history even if no value claimed
- accounts[_stakerAccount].claimHistory.add64(getBlockNumber64(), _amount);
+ accounts[_stakerAccount].claimHistory.add(block.number, _amount);
  }
 
  /**
@@ -385,7 +384,7 @@ contract Staking is RegistryContract, ERCStaking, ERCStakingHistory, IsContract,
  }
 
  // add new value to account history
- accounts[_accountAddress].stakedHistory.add64(getBlockNumber64(), newStake);
+ accounts[_accountAddress].stakedHistory.add(block.number, newStake);
  }
 
  function _modifyTotalStaked(uint256 _by, bool _increase) internal {
@@ -399,17 +398,6 @@ contract Staking is RegistryContract, ERCStaking, ERCStakingHistory, IsContract,
  }
 
  // add new value to total history
- totalStakedHistory.add64(getBlockNumber64(), newStake);
- }
-
- function _transfer(address _from, address _to, uint256 _amount) internal {
- // transferring 0 staked tokens is invalid
- require(_amount > 0, ERROR_AMOUNT_ZERO);
-
- // update stakes
- _modifyStakeBalance(_from, _amount, false);
- _modifyStakeBalance(_to, _amount, true);
-
- emit StakeTransferred(_from,_amount, _to);
+ totalStakedHistory.add(block.number, newStake);
  }
 }

eth-contracts/contracts/staking/ERCStaking.sol → eth-contracts/contracts/staking/StakingInterface.sol

@@ -4,22 +4,27 @@ pragma solidity ^0.5.0;
 
 // Modified interface for ERC900: https://eips.ethereum.org/EIPS/eip-900
 // Eliminates direct stake operations
-interface ERCStaking {
+interface StakingInterface {
  event Staked(address indexed user, uint256 amount, uint256 total, bytes data);
  event Unstaked(address indexed user, uint256 amount, uint256 total, bytes data);
 
  function stakeFor(address user, uint256 amount, bytes calldata data) external;
  function unstakeFor(address user, uint256 amount, bytes calldata data) external;
 
+ function stakeRewards(uint256 amount, address stakerAccount) external;
+ function delegateStakeFor(address accountAddress, address delegatorAddress, uint256 amount, bytes calldata data) external;
+ function undelegateStakeFor(address accountAddress, address delegatorAddress, uint256 amount, bytes calldata data) external;
+ function slash(uint256 amount, address slashAddress) external;
+
+
  function totalStakedFor(address addr) external view returns (uint256);
  function totalStaked() external view returns (uint256);
  function token() external view returns (address);
 
  function supportsHistory() external pure returns (bool);
-}
 
-interface ERCStakingHistory {
  function lastStakedFor(address addr) external view returns (uint256);
  function totalStakedForAt(address addr, uint256 blockNumber) external view returns (uint256);
  function totalStakedAt(uint256 blockNumber) external view returns (uint256);
+ function lastClaimedFor(address addr) external view returns (uint256);
 }