Merge pull request #104 from skalenetwork/feature/SKALE-2157-fee-check

SKALE-2157 Add sanity check for the input values in registerValidator
skalenetwork · Mar 2, 2020 · 02c5f83 · 02c5f83
2 parents cde5a4f + 7854b11
commit 02c5f83
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/contracts/delegation/ValidatorService.sol b/contracts/delegation/ValidatorService.sol
@@ -35,7 +35,6 @@ contract ValidatorService is Permissions {
         uint feeRate;
         uint registrationTime;
         uint minimumDelegationAmount;
-        uint lastBountyCollectionMonth;
         uint[] nodeIndexes;
     }
 
@@ -64,6 +63,7 @@ contract ValidatorService is Permissions {
         returns (uint validatorId)
     {
         require(_validatorAddressToId[validatorAddress] == 0, "Validator with such address already exists");
+        require(feeRate < 1000, "Fee rate of validator should be lower than 100%");
         uint[] memory epmtyArray = new uint[](0);
         validatorId = ++numberOfValidators;
         validators[validatorId] = Validator(
@@ -74,7 +74,6 @@ contract ValidatorService is Permissions {
             feeRate,
             now,
             minimumDelegationAmount,
-            0,
             epmtyArray
         );
         setValidatorAddress(validatorId, validatorAddress);

diff --git a/test/delegation/ValidatorService.ts b/test/delegation/ValidatorService.ts
@@ -25,18 +25,15 @@ class Validator {
     public feeRate: BigNumber;
     public registrationTime: BigNumber;
     public minimumDelegationAmount: BigNumber;
-    public lastBountyCollectionMonth: BigNumber;
 
-    constructor(arrayData: [string, string, string, string, BigNumber, BigNumber, BigNumber, BigNumber]) {
+    constructor(arrayData: [string, string, string, string, BigNumber, BigNumber, BigNumber]) {
         this.name = arrayData[0];
         this.validatorAddress = arrayData[1];
         this.requestedAddress = arrayData[2];
         this.description = arrayData[3];
         this.feeRate = new BigNumber(arrayData[4]);
         this.registrationTime = new BigNumber(arrayData[5]);
         this.minimumDelegationAmount = new BigNumber(arrayData[6]);
-        this.lastBountyCollectionMonth = new BigNumber(arrayData[7]);
-
     }
 }
 
@@ -78,6 +75,16 @@ contract("ValidatorService", ([owner, holder, validator1, validator2, validator3
         assert.isTrue(await validatorService.checkValidatorAddressToId(validator1, validatorId));
     });
 
+    it("should reject if validator tried to register with a fee rate higher than 100 percent", async () => {
+        await delegationService.registerValidator(
+            "ValidatorName",
+            "Really good validator",
+            1500,
+            100,
+            {from: validator1})
+            .should.be.eventually.rejectedWith("Fee rate of validator should be lower than 100%");
+    });
+
     describe("when validator registered", async () => {
         beforeEach(async () => {
             await delegationService.registerValidator(