Bump lodash from 4.17.10 to 4.17.15

README.md

@@ -13,6 +13,15 @@ ARTIS specific changes were limited to the introduction of a collateral requirem
 - [PoA Consensus Audit](https://github.com/poanetwork/poa-network-consensus-contracts/blob/master/audit/MixBytes/PoA%20Consensus%20Audit.pdf) by MixBytes
 - [PoA Consensus Audit](https://github.com/poanetwork/poa-network-consensus-contracts/blob/master/audit/ChainSecurity/ChainSecurity_PoA.pdf) by ChainSecurity
 
+## Run tests
+
+Use node.js v8.
+
+- `npm ci`
+- `npm test`
+
+The test script builds the contracts, starts an instance of [ganache-cli](https://github.com/trufflesuite/ganache-cli) in the background and then executes all tests (takes a while).
+
 ## Start a network
 
 New networks are bootstrapped by a _Master of Ceremony_.  

contracts/ProxyStorage.sol

@@ -52,7 +52,8 @@ contract ProxyStorage is EternalStorage, IProxyStorage {
         BallotsStorage,
         PoaConsensus,
         ValidatorMetadata,
-        ProxyStorage
+        ProxyStorage,
+        RewardByBlock
     }
 
     event ProxyInitialized(
@@ -210,6 +211,10 @@ contract ProxyStorage is EternalStorage, IProxyStorage {
             ).upgradeTo(_contractAddress);
         } else if (_contractType == uint256(ContractTypes.ProxyStorage)) {
             success = IEternalStorageProxy(this).upgradeTo(_contractAddress);
+        } else if (_contractType == uint256(ContractTypes.RewardByBlock)) {
+            success = IEternalStorageProxy(
+                getRewardByBlock()
+            ).upgradeTo(_contractAddress);
         }
         if (success) {
             emit AddressSet(_contractType, _contractAddress);

contracts/RewardByBlock.sol

@@ -100,6 +100,11 @@ contract RewardByBlock is EternalStorage, IRewardByBlock {
 
         address miningKey = benefactors[0];
 
+        if (miningKey == address(0)) {
+            // Return empty arrays
+            return (new address[](0), new uint256[](0));
+        }
+
         require(_isMiningActive(miningKey));
 
         uint256 extraLength = extraReceiversLength();
@@ -153,7 +158,7 @@ contract RewardByBlock is EternalStorage, IRewardByBlock {
     }
 
     function emissionFundsActivationTimestamp() public pure returns(uint) {
-        return 1573732800; // 14. Nov 2019
+        return (2^256)-1; // never
     }
 
     function bridgeAmount(address _bridge) public view returns(uint256) {