Merge pull request #16 from OpenBazaar/rewards-audit-fixes

Rewards audit fixes
OpenBazaar · Mar 12, 2019 · e98108a · e98108a
2 parents 72ef7e9 + 9fba2fb
commit e98108a
Show file tree

Hide file tree

Showing 54 changed files with 7,258 additions and 9,066 deletions.
diff --git a/.gitattributes b/.gitattributes
diff --git a/.gitignore b/.gitignore
diff --git a/.solcover.js b/.solcover.js
diff --git a/.soliumignore b/.soliumignore
diff --git a/.soliumrc.json b/.soliumrc.json
diff --git a/.travis.yml b/.travis.yml
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/build/contracts/Address.json b/build/contracts/Address.json
diff --git a/build/contracts/BasicToken.json b/build/contracts/BasicToken.json
diff --git a/build/contracts/ContractManager.json b/build/contracts/ContractManager.json
diff --git a/build/contracts/ERC20.json b/build/contracts/ERC20.json
diff --git a/build/contracts/ERC20Basic.json b/build/contracts/ERC20Basic.json
diff --git a/build/contracts/ERC20Burnable.json b/build/contracts/ERC20Burnable.json
diff --git a/build/contracts/EscrowWithoutToken.json b/build/contracts/EscrowWithoutToken.json
diff --git a/build/contracts/Escrow_v1_0.json b/build/contracts/Escrow_v1_0.json
diff --git a/build/contracts/IERC20.json b/build/contracts/IERC20.json
diff --git a/build/contracts/IEscrow.json b/build/contracts/IEscrow.json
diff --git a/build/contracts/ITokenContract.json b/build/contracts/ITokenContract.json
diff --git a/build/contracts/Migrations.json b/build/contracts/Migrations.json
diff --git a/build/contracts/OBRewards.json b/build/contracts/OBRewards.json
diff --git a/build/contracts/OBToken.json b/build/contracts/OBToken.json
diff --git a/build/contracts/Ownable.json b/build/contracts/Ownable.json
diff --git a/build/contracts/PowerUps.json b/build/contracts/PowerUps.json
diff --git a/build/contracts/SafeMath.json b/build/contracts/SafeMath.json
diff --git a/build/contracts/StandardToken.json b/build/contracts/StandardToken.json
diff --git a/build/contracts/TestToken.json b/build/contracts/TestToken.json
diff --git a/contracts/Migrations.sol b/contracts/Migrations.sol
diff --git a/contracts/escrow/EscrowSpec.md b/contracts/escrow/EscrowSpec.md
diff --git a/contracts/escrow/Escrow_v1_0.sol b/contracts/escrow/Escrow_v1_0.sol
diff --git a/contracts/escrow/IEscrow.sol b/contracts/escrow/IEscrow.sol
diff --git a/contracts/powerUps/PowerUps.sol b/contracts/powerUps/PowerUps.sol
diff --git a/contracts/powerUps/PowerUpsSpec.md b/contracts/powerUps/PowerUpsSpec.md
diff --git a/contracts/registry/ContractManager.sol b/contracts/registry/ContractManager.sol
diff --git a/contracts/registry/ContractManagerSpec.md b/contracts/registry/ContractManagerSpec.md
diff --git a/contracts/rewards/OBRewards.sol b/contracts/rewards/OBRewards.sol
@@ -94,32 +94,24 @@ contract OBRewards is Ownable {
 
     /**
     * @dev Add details to rewards contract at the time of deployment
-    * @param _promotedSellers List of promoted sellers
     * @param _maxRewardPerSeller Maximum reward to be distributed from
     * each seller
     * @param _timeWindow A time window, in seconds, where purchases
     * will be rewarded with tokens
     * @param _escrowContractAddress Escrow address to be considered for
     * rewards distribution.
     * @param obTokenAddress Address of the reward token
-    * @param _endDate end date of the promotion
     */
     constructor(
-        address[] _promotedSellers,
         uint256 _maxRewardPerSeller,
         uint256 _timeWindow,
         address _escrowContractAddress, // this should be a trusted contract
-        address obTokenAddress,
-        uint256 _endDate
+        address obTokenAddress
     )
         public
         nonZeroAddress(_escrowContractAddress)
         nonZeroAddress(obTokenAddress)
     {
-        require(
-            _promotedSellers.length > 0,
-            "Please provide atleast 1 promoted seller"
-        );
 
         require(
             _maxRewardPerSeller > 0,
@@ -135,26 +127,10 @@ contract OBRewards is Ownable {
         timeWindow = _timeWindow;
         escrowContract = IEscrow(_escrowContractAddress);
         obToken = ITokenContract(obTokenAddress);
-        endDate = _endDate;
         maxRewardToBuyerPerSeller = uint256(50).mul(
             10 ** uint256(obToken.decimals())
         );
 
-        for (uint256 i = 0; i < _promotedSellers.length; i++) {
-            require(
-                _promotedSellers[i] != address(0),
-                "Please provide valid address for promoted seller"
-            );
-
-            require(
-                !promotedSellers[_promotedSellers[i]],
-                "Same promoted seller provided twice"
-            );
-
-            promotedSellers[_promotedSellers[i]] = true;
-        }
-
-        emit PromotedSellersAdded(_promotedSellers);
     }
 
     /**
@@ -261,7 +237,7 @@ contract OBRewards is Ownable {
     }
 
     /**
-    * @dev Method to allow the onwer to adjust the maximum reward per seller
+    * @dev Method to allow the owner to adjust the maximum reward per seller
     * @param _maxRewardPerSeller Max reward to be distributed for each seller
     */
     function changeMaxRewardPerSeller(

diff --git a/contracts/rewards/RewardsSpec.md b/contracts/rewards/RewardsSpec.md
diff --git a/contracts/test/EscrowWithoutToken.sol b/contracts/test/EscrowWithoutToken.sol
diff --git a/contracts/test/TestToken.sol b/contracts/test/TestToken.sol
diff --git a/contracts/token/ITokenContract.sol b/contracts/token/ITokenContract.sol
diff --git a/contracts/token/OBToken.sol b/contracts/token/OBToken.sol
diff --git a/migrations/1_initial_migration.js b/migrations/1_initial_migration.js
diff --git a/migrations/escrow/2_Escrow_v1_0_migration.js b/migrations/escrow/2_Escrow_v1_0_migration.js
diff --git a/migrations/registry/3_contract_manager_migration.js b/migrations/registry/3_contract_manager_migration.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/scripts/signing.js b/scripts/signing.js
diff --git a/scripts/usage.txt b/scripts/usage.txt
diff --git a/test/escrow/1_Escrow_v1_0_test.js b/test/escrow/1_Escrow_v1_0_test.js
diff --git a/test/helper.js b/test/helper.js
diff --git a/test/powerUps/3_PowerUps_tests.js b/test/powerUps/3_PowerUps_tests.js
diff --git a/test/registry/2_contract_manager_test.js b/test/registry/2_contract_manager_test.js
diff --git a/test/rewards/6_OB_Rewards_Test.js b/test/rewards/6_OB_Rewards_Test.js
@@ -105,11 +105,10 @@ contract("OB Rewards Contract", function() {
         this.escrow = await Escrow_v1_0.new({from:acct[0]});
 
         this.OBT = await OBToken.new("Open Bazaar", "OBT", 18, 100000000, {from:acct[0]});
-
-        var endDate = 0;
 
-        this.rewards = await OBRewards.new(promotedSellers, 500000000000000000000, 432000, this.escrow.address, this.OBT.address, endDate, {from:acct[0]});
-
+        this.rewards = await OBRewards.new(500000000000000000000, 432000, this.escrow.address, this.OBT.address, {from:acct[0]});
+        await this.rewards.addPromotedSellers(promotedSellers, {from:acct[0]});
+
         await this.OBT.transfer(this.rewards.address, 570000000000000000000, {from:acct[0]});
 
     });

diff --git a/truffle.js b/truffle.js