Skip to content

Commit c82061d

Browse files
committed
OBRewards contract-Removing addition of promoted sellers from constructor
1 parent 32b4b59 commit c82061d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+13327
-14912
lines changed

Diff for: .gitattributes

100644100755
File mode changed.

Diff for: .gitignore

100644100755
File mode changed.

Diff for: .solcover.js

100644100755
File mode changed.

Diff for: .soliumignore

100644100755
File mode changed.

Diff for: .soliumrc.json

100644100755
File mode changed.

Diff for: .travis.yml

100644100755
File mode changed.

Diff for: LICENSE

100644100755
File mode changed.

Diff for: README.md

100644100755
File mode changed.

Diff for: build/contracts/Address.json

100644100755
File mode changed.

Diff for: build/contracts/BasicToken.json

100644100755
File mode changed.

Diff for: build/contracts/ContractManager.json

100644100755
File mode changed.

Diff for: build/contracts/ERC20.json

100644100755
File mode changed.

Diff for: build/contracts/ERC20Basic.json

100644100755
File mode changed.

Diff for: build/contracts/ERC20Burnable.json

100644100755
File mode changed.

Diff for: build/contracts/EscrowWithoutToken.json

100644100755
File mode changed.

Diff for: build/contracts/Escrow_v1_0.json

100644100755
+6,450-6,380
Large diffs are not rendered by default.

Diff for: build/contracts/IERC20.json

100644100755
File mode changed.

Diff for: build/contracts/IEscrow.json

100644100755
+561-561
Large diffs are not rendered by default.

Diff for: build/contracts/ITokenContract.json

100644100755
+253-253
Large diffs are not rendered by default.

Diff for: build/contracts/Migrations.json

100644100755
File mode changed.

Diff for: build/contracts/OBRewards.json

100644100755
+4,857-6,497
Large diffs are not rendered by default.

Diff for: build/contracts/OBToken.json

100644100755
File mode changed.

Diff for: build/contracts/Ownable.json

100644100755
+527-527
Large diffs are not rendered by default.

Diff for: build/contracts/PowerUps.json

100644100755
File mode changed.

Diff for: build/contracts/SafeMath.json

100644100755
+667-667
Large diffs are not rendered by default.

Diff for: build/contracts/StandardToken.json

100644100755
File mode changed.

Diff for: build/contracts/TestToken.json

100644100755
File mode changed.

Diff for: contracts/Migrations.sol

100644100755
File mode changed.

Diff for: contracts/escrow/EscrowSpec.md

100644100755
File mode changed.

Diff for: contracts/escrow/Escrow_v1_0.sol

100644100755
File mode changed.

Diff for: contracts/escrow/IEscrow.sol

100644100755
File mode changed.

Diff for: contracts/powerUps/PowerUps.sol

100644100755
File mode changed.

Diff for: contracts/powerUps/PowerUpsSpec.md

100644100755
File mode changed.

Diff for: contracts/registry/ContractManager.sol

100644100755
File mode changed.

Diff for: contracts/registry/ContractManagerSpec.md

100644100755
File mode changed.

Diff for: contracts/rewards/OBRewards.sol

100644100755
-21
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,6 @@ contract OBRewards is Ownable {
9494

9595
/**
9696
* @dev Add details to rewards contract at the time of deployment
97-
* @param _promotedSellers List of promoted sellers
9897
* @param _maxRewardPerSeller Maximum reward to be distributed from
9998
* each seller
10099
* @param _timeWindow A time window, in seconds, where purchases
@@ -105,7 +104,6 @@ contract OBRewards is Ownable {
105104
* @param _endDate end date of the promotion
106105
*/
107106
constructor(
108-
address[] _promotedSellers,
109107
uint256 _maxRewardPerSeller,
110108
uint256 _timeWindow,
111109
address _escrowContractAddress, // this should be a trusted contract
@@ -116,10 +114,6 @@ contract OBRewards is Ownable {
116114
nonZeroAddress(_escrowContractAddress)
117115
nonZeroAddress(obTokenAddress)
118116
{
119-
require(
120-
_promotedSellers.length > 0,
121-
"Please provide atleast 1 promoted seller"
122-
);
123117

124118
require(
125119
_maxRewardPerSeller > 0,
@@ -140,21 +134,6 @@ contract OBRewards is Ownable {
140134
10 ** uint256(obToken.decimals())
141135
);
142136

143-
for (uint256 i = 0; i < _promotedSellers.length; i++) {
144-
require(
145-
_promotedSellers[i] != address(0),
146-
"Please provide valid address for promoted seller"
147-
);
148-
149-
require(
150-
!promotedSellers[_promotedSellers[i]],
151-
"Same promoted seller provided twice"
152-
);
153-
154-
promotedSellers[_promotedSellers[i]] = true;
155-
}
156-
157-
emit PromotedSellersAdded(_promotedSellers);
158137
}
159138

160139
/**

Diff for: contracts/rewards/RewardsSpec.md

100644100755
File mode changed.

Diff for: contracts/test/EscrowWithoutToken.sol

100644100755
File mode changed.

Diff for: contracts/test/TestToken.sol

100644100755
File mode changed.

Diff for: contracts/token/ITokenContract.sol

100644100755
File mode changed.

Diff for: contracts/token/OBToken.sol

100644100755
File mode changed.

Diff for: migrations/1_initial_migration.js

100644100755
File mode changed.

Diff for: migrations/escrow/2_Escrow_v1_0_migration.js

100644100755
File mode changed.

Diff for: migrations/registry/3_contract_manager_migration.js

100644100755
File mode changed.

Diff for: package-lock.json

100644100755
+9-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: package.json

100644100755
File mode changed.

Diff for: scripts/signing.js

100644100755
File mode changed.

Diff for: scripts/usage.txt

100644100755
File mode changed.

Diff for: test/escrow/1_Escrow_v1_0_test.js

100644100755
File mode changed.

Diff for: test/helper.js

100644100755
File mode changed.

Diff for: test/powerUps/3_PowerUps_tests.js

100644100755
File mode changed.

Diff for: test/registry/2_contract_manager_test.js

100644100755
File mode changed.

Diff for: test/rewards/6_OB_Rewards_Test.js

100644100755
+3-2
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,9 @@ contract("OB Rewards Contract", function() {
108108

109109
var endDate = 0;
110110

111-
this.rewards = await OBRewards.new(promotedSellers, 500000000000000000000, 432000, this.escrow.address, this.OBT.address, endDate, {from:acct[0]});
112-
111+
this.rewards = await OBRewards.new(500000000000000000000, 432000, this.escrow.address, this.OBT.address, endDate, {from:acct[0]});
112+
await this.rewards.addPromotedSellers(promotedSellers, {from:acct[0]});
113+
113114
await this.OBT.transfer(this.rewards.address, 570000000000000000000, {from:acct[0]});
114115

115116
});

Diff for: truffle.js

100644100755
File mode changed.

0 commit comments

Comments
 (0)