permission checking for service transaction for announceAvailability for free.

Author: SurfingNerd

.solhint.json

@@ -2,7 +2,7 @@
   "extends": "solhint:default",
   "plugins": [],
   "rules": {
-    "code-complexity": ["warn", 19],
-    "function-max-lines": ["warn", 135]
+    "code-complexity": ["warn", 20],
+    "function-max-lines": ["warn", 137]
   }
 }

contracts/TxPermissionHbbft.sol

@@ -249,9 +249,11 @@ contract TxPermissionHbbft is UpgradeableOwned, ITxPermission {
                 (bool callable,) = validatorSetContract.reportMaliciousCallable(
                     _sender, maliciousMiningAddress, blockNumber
                 );
-
                 return (callable ? CALL : NONE, false);
-            } else if (_gasPrice > 0) {
+            } else if (signature == ANNOUNCE_AVAILABILITY_SIGNATURE) {
+                return (validatorSetContract.canCallAnnounceAvailability(_sender) ? CALL : NONE, false);
+            }
+            else if (_gasPrice > 0) {
                 // The other functions of ValidatorSet contract can be called
                 // by anyone except validators' mining addresses if gasPrice is not zero
                 return (validatorSetContract.isValidator(_sender) ? NONE : CALL, false);
@@ -368,7 +370,10 @@ contract TxPermissionHbbft is UpgradeableOwned, ITxPermission {
 
     // bytes4(keccak256("writeAcks(uint256,bytes[])"))
     bytes4 public constant WRITE_ACKS_SIGNATURE = 0xc56aef48;
-    
+
+    // bytes4(keccak256("announceAvailability()"))
+    bytes4 public constant ANNOUNCE_AVAILABILITY_SIGNATURE = 0x292525af;
+
     /// @dev An internal function used by the `addAllowedSender` and `initialize` functions.
     /// @param _sender The address for which transactions of any type must be allowed.
     function _addAllowedSender(address _sender)

contracts/ValidatorSetHbbft.sol

@@ -624,7 +624,6 @@ contract ValidatorSetHbbft is UpgradeabilityAdmin, IValidatorSetHbbft {
 
         if (stakingByMiningAddress[_miningAddress] == address(0)) {
             // not a validator node.
-            // revert('this address is not a validator');
             return false;
         }
 
@@ -718,13 +717,16 @@ contract ValidatorSetHbbft is UpgradeabilityAdmin, IValidatorSetHbbft {
 
     //     if (stakingByMiningAddress[_miningAddress] == address(0)) {
     //         // not a validator node.
+    //         // revert('this address is not a validator');
     //         return false;
     //     }
 
-    //     if (validatorAvailableSince[_miningAddress] == 0) {
+    //     if (validatorAvailableSince[_miningAddress] != 0) {
     //          // "Validator was not marked as unavailable."
     //         return false;
     //     }
+
+    //     return true;
     // }
 
     /// @dev Updates the total reporting counter (see the `reportingCounterTotal` public mapping) for the current

contracts/interfaces/IValidatorSetHbbft.sol

@@ -21,7 +21,7 @@ interface IValidatorSetHbbft {
     function handleFailedKeyGeneration() external;
     function areDelegatorsBanned(address) external view returns(bool);
     function blockRewardContract() external view returns(address);
-    //function canCallAnnounceAvailability() external view returns(bool);
+    function canCallAnnounceAvailability(address _miningAddress) external view returns(bool);
     function getPendingValidators() external view returns(address[] memory);
     function getPreviousValidators() external view returns(address[] memory);
     function getValidators() external view returns(address[] memory);

test/KeyGenHistory.js

@@ -246,9 +246,11 @@ contract('InitializerHbbft', async accounts => {
       // they are gone :-o
       //(await validatorSetHbbft.getPendingValidators.call()).should.be.deep.equal([]);
 
+      
       // announcing availability.
       // this should place us back on the list of active and available pools.
-      (await validatorSetHbbft.announceAvailability({ from: newPoolMiningAddress }));
+      await announceAvailability(newPoolMiningAddress);
+      
 
       await printValidatorState('after announceAvailability:');
 
@@ -456,6 +458,38 @@ async function call2ParaFunction(functionName, from, upcommingEpochNumber, parts
   await call.send({ from, gas: '7000000' });
 }
 
+async function announceAvailability( pool ) {
+
+  const call = validatorSetHbbft.contract.methods.announceAvailability();
+
+  const asEncoded = call.encodeABI();
+
+  if (logOutput) {
+    console.log('calling: announceAvailability');
+    console.log('pool: ', pool)
+    console.log('ecodedCall: ', asEncoded);
+  }
+
+  const allowedTxType = await txPermission.allowedTxTypes(pool, validatorSetHbbft.address, '0x0' /* value */, '0x0' /* gas price */, asEncoded);
+
+  //console.log(allowedTxType.typesMask.toString());
+  // don't ask to cache this result.
+  allowedTxType.cache.should.be.equal(false);
+
+  /// 0x01 - basic transaction (e.g. ether transferring to user wallet);
+  /// 0x02 - contract call;
+  /// 0x04 - contract creation;
+  /// 0x08 - private transaction.
+
+  allowedTxType.typesMask.should.be.bignumber.equal(new BN('2'), 'Transaction should be allowed according to TxPermission Contract.');
+
+  // we know now, that this call is allowed. 
+  // so we can execute it.
+  await call.send({ from: pool, gas: '7000000' });
+
+}
+
+
 async function callReward(isEpochEndBlock) {
   // console.log('getting validators...');
   // note: this call used to crash because of a internal problem with a previous call of evm_mine and evm_increase_time https://github.com/DMDcoin/hbbft-posdao-contracts/issues/13