Merge pull request #205 from varasev/RewardByBlock-fix

(Fix) Return empty results for zero input address in `RewardByBlock.reward` function
poanetwork · Dec 29, 2018 · 862c6e7 · 862c6e7
2 parents b0fc878 + 2665442
commit 862c6e7
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 1 deletion.
diff --git a/contracts/ProxyStorage.sol b/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);

diff --git a/contracts/RewardByBlock.sol b/contracts/RewardByBlock.sol
@@ -68,6 +68,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();

diff --git a/test/proxy_storage_test.js b/test/proxy_storage_test.js
@@ -272,6 +272,20 @@ contract('ProxyStorage [all features]', function (accounts) {
         await proxyStorageEternalStorage.version.call()
       );
     })
+    it('sets rewardByBlock', async () => {
+      const rewardByBlockNew = await RewardByBlock.new();
+
+      await proxyStorage.setVotingToChangeProxyMock(accounts[4]);
+      await setContractAddress(9, rewardByBlockNew.address, true, {from: accounts[4]});
+      await proxyStorage.setVotingToChangeProxyMock(votingToChangeProxyEternalStorage.address);
+
+      const eternalProxyAddress = await proxyStorage.getRewardByBlock.call();
+      const eternalProxy = await EternalStorageProxy.at(eternalProxyAddress);
+
+      rewardByBlockNew.address.should.be.equal(
+        await eternalProxy.implementation.call()
+      )
+    })
   })
   describe('#upgradeTo', async () => {
     it('may only be called by ProxyStorage (itself)', async () => {

diff --git a/test/proxy_storage_upgrade_test.js b/test/proxy_storage_upgrade_test.js
@@ -279,6 +279,20 @@ contract('ProxyStorage upgraded [all features]', function (accounts) {
         await proxyStorageEternalStorage.version.call()
       );
     })
+    it('sets rewardByBlock', async () => {
+      const rewardByBlockNew = await RewardByBlock.new();
+
+      await proxyStorage.setVotingToChangeProxyMock(accounts[4]);
+      await setContractAddress(9, rewardByBlockNew.address, true, {from: accounts[4]});
+      await proxyStorage.setVotingToChangeProxyMock(votingToChangeProxyEternalStorage.address);
+
+      const eternalProxyAddress = await proxyStorage.getRewardByBlock.call();
+      const eternalProxy = await EternalStorageProxy.at(eternalProxyAddress);
+
+      rewardByBlockNew.address.should.be.equal(
+        await eternalProxy.implementation.call()
+      )
+    })
   })
 })
 

diff --git a/test/voting_to_change_proxy_test.js b/test/voting_to_change_proxy_test.js
@@ -473,6 +473,15 @@ contract('VotingToChangeProxyAddress [all features]', function (accounts) {
       await deployAndTest({contractType, newAddress})
       newAddress.should.be.equal(await proxyStorageEternalStorage.implementation.call());
     })
+    it('should change RewardByBlock implementation', async () => {
+      const contractType = 9;
+      const rewardByBlockNew = await RewardByBlock.new();
+      const newAddress = rewardByBlockNew.address;
+      await deployAndTest({contractType, newAddress})
+      const eternalProxyAddress = await proxyStorageMock.getRewardByBlock.call();
+      const eternalProxy = await EternalStorageProxy.at(eternalProxyAddress);
+      newAddress.should.be.equal(await eternalProxy.implementation.call());
+    })
     it('prevents double finalize', async () => {
       let newAddress1 = accounts[4];
       let newAddress2 = accounts[5];

diff --git a/test/voting_to_change_proxy_upgrade_test.js b/test/voting_to_change_proxy_upgrade_test.js
@@ -480,6 +480,15 @@ contract('VotingToChangeProxyAddress upgraded [all features]', function (account
       await deployAndTest({contractType, newAddress})
       newAddress.should.be.equal(await proxyStorageEternalStorage.implementation.call());
     })
+    it('should change RewardByBlock implementation', async () => {
+      const contractType = 9;
+      const rewardByBlockNew = await RewardByBlock.new();
+      const newAddress = rewardByBlockNew.address;
+      await deployAndTest({contractType, newAddress})
+      const eternalProxyAddress = await proxyStorageMock.getRewardByBlock.call();
+      const eternalProxy = await EternalStorageProxy.at(eternalProxyAddress);
+      newAddress.should.be.equal(await eternalProxy.implementation.call());
+    })
     it('prevents double finalize', async () => {
       let newAddress1 = accounts[4];
       let newAddress2 = accounts[5];