admin: operators for channel allocation actions (#247)

Provide a way for an indexer to add operator keys for actions that could be done automatically and the key exposed in an external service/server.

Author: abarmat

.soliumignore

@@ -6,7 +6,6 @@ contracts/ens
 contracts/erc1056
 contracts/openzeppelin
 
-contracts/staking/Staking.sol
 contracts/token/IGraphToken.sol
 contracts/upgrades/GraphProxy.sol
 

contracts/EpochManager.sol

@@ -29,7 +29,7 @@ contract EpochManager is Governed {
     event EpochLengthUpdate(uint256 indexed epoch, uint256 epochLength);
 
     /**
-     * @dev Contract Constructor
+     * @dev Contract Constructor.
      * @param _epochLength Epoch length in blocks
      */
     constructor(uint256 _epochLength) public {
@@ -43,7 +43,7 @@ contract EpochManager is Governed {
     }
 
     /**
-     * @dev Set the epoch length
+     * @dev Set the epoch length.
      * @notice Set epoch length to `_epochLength` blocks
      * @param _epochLength Epoch length in blocks
      */
@@ -59,7 +59,7 @@ contract EpochManager is Governed {
     }
 
     /**
-     * @dev Run a new epoch, should be called once at the start of any epoch
+     * @dev Run a new epoch, should be called once at the start of any epoch.
      * @notice Perform state changes for the current epoch
      */
     function runEpoch() external {
@@ -74,23 +74,23 @@ contract EpochManager is Governed {
     }
 
     /**
-     * @dev Return true if the current epoch has already run
+     * @dev Return true if the current epoch has already run.
      * @return Return true if epoch has run
      */
     function isCurrentEpochRun() public view returns (bool) {
         return lastRunEpoch == currentEpoch();
     }
 
     /**
-     * @dev Return current block number
+     * @dev Return current block number.
      * @return Block number
      */
     function blockNum() public view returns (uint256) {
         return block.number;
     }
 
     /**
-     * @dev Return blockhash for a block
+     * @dev Return blockhash for a block.
      * @return BlockHash for `_block` number
      */
     function blockHash(uint256 _block) public view returns (bytes32) {
@@ -106,41 +106,41 @@ contract EpochManager is Governed {
     }
 
     /**
-     * @dev Return the current epoch, it may have not been run yet
+     * @dev Return the current epoch, it may have not been run yet.
      * @return The current epoch based on epoch length
      */
     function currentEpoch() public view returns (uint256) {
         return lastLengthUpdateEpoch.add(epochsSinceUpdate());
     }
 
     /**
-     * @dev Return block where the current epoch started
+     * @dev Return block where the current epoch started.
      * @return The block number when the current epoch started
      */
     function currentEpochBlock() public view returns (uint256) {
         return lastLengthUpdateBlock.add(epochsSinceUpdate().mul(epochLength));
     }
 
     /**
-     * @dev Return the number of blocks that passed since current epoch started
+     * @dev Return the number of blocks that passed since current epoch started.
      * @return Blocks that passed since start of epoch
      */
     function currentEpochBlockSinceStart() public view returns (uint256) {
         return blockNum() - currentEpochBlock();
     }
 
     /**
-     * @dev Return the number of epoch that passed since another epoch
+     * @dev Return the number of epoch that passed since another epoch.
      * @param _epoch Epoch to use as since epoch value
      * @return Number of epochs and current epoch
      */
-    function epochsSince(uint256 _epoch) public view returns (uint256, uint256) {
+    function epochsSince(uint256 _epoch) public view returns (uint256) {
         uint256 epoch = currentEpoch();
-        return (_epoch < epoch ? epoch.sub(_epoch) : 0, epoch);
+        return _epoch < epoch ? epoch.sub(_epoch) : 0;
     }
 
     /**
-     * @dev Return number of epochs passed since last epoch length update
+     * @dev Return number of epochs passed since last epoch length update.
      * @return The number of epoch that passed since last epoch length update
      */
     function epochsSinceUpdate() public view returns (uint256) {

contracts/staking/IStaking.sol

@@ -33,9 +33,9 @@ interface IStaking {
     // -- Delegation Data --
 
     struct DelegationPool {
-        uint256 cooldownBlocks;
-        uint256 indexingRewardCut; // in PPM
-        uint256 queryFeeCut; // in PPM
+        uint32 cooldownBlocks;
+        uint32 indexingRewardCut; // in PPM
+        uint32 queryFeeCut; // in PPM
         uint256 updatedAtBlock;
         uint256 tokens;
         uint256 shares;
@@ -54,20 +54,24 @@ interface IStaking {
 
     function setMaxAllocationEpochs(uint256 _maxAllocationEpochs) external;
 
-    function setDelegationParametersCooldown(uint256 _blocks) external;
+    function setDelegationParametersCooldown(uint32 _blocks) external;
 
-    function setDelegationCapacity(uint256 _delegationCapacity) external;
+    function setDelegationCapacity(uint32 _delegationCapacity) external;
 
     function setDelegationParameters(
-        uint256 _indexingRewardCut,
-        uint256 _queryFeeCut,
-        uint256 _cooldownBlocks
+        uint32 _indexingRewardCut,
+        uint32 _queryFeeCut,
+        uint32 _cooldownBlocks
     ) external;
 
     function setSlasher(address _slasher, bool _allowed) external;
 
     function setThawingPeriod(uint256 _thawingPeriod) external;
 
+    // -- Operation --
+
+    function setOperator(address _operator, bool _allowed) external;
+
     // -- Staking --
 
     function stake(uint256 _tokens) external;
@@ -105,6 +109,15 @@ interface IStaking {
         uint256 _price
     ) external;
 
+    function allocateFrom(
+        address _indexer,
+        bytes32 _subgraphDeploymentID,
+        uint256 _tokens,
+        bytes calldata _channelPubKey,
+        address _channelProxy,
+        uint256 _price
+    ) external;
+
     function settle(address _channelID) external;
 
     function collect(uint256 _tokens, address _channelID) external;