Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions contracts/balancer/BNum.sol
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ contract BNum is BConst {
require(base >= MIN_BPOW_BASE, 'ERR_BPOW_BASE_TOO_LOW');
require(base <= MAX_BPOW_BASE, 'ERR_BPOW_BASE_TOO_HIGH');

uint whole = bfloor(exp);
uint whole = bfloor(exp);
uint remain = bsub(exp, whole);

uint wholePow = bpowi(base, btoi(whole));
Expand All @@ -131,10 +131,10 @@ contract BNum is BConst {
returns (uint)
{
// term 0:
uint a = exp;
(uint x, bool xneg) = bsubSign(base, BONE);
uint a = exp;
(uint x, bool xneg) = bsubSign(base, BONE);
uint term = BONE;
uint sum = term;
uint sum = term;
bool negative = false;


Expand Down
5 changes: 3 additions & 2 deletions contracts/templates/DataTokenTemplate.sol
Original file line number Diff line number Diff line change
Expand Up @@ -240,12 +240,12 @@ contract DataTokenTemplate is IERC20Template, ERC20 {
}
uint256 totalFee = communityFee.add(marketFee);
transfer(_minter, amount.sub(totalFee));

emit OrderStarted(
consumer,
msg.sender,
amount,
serviceId,
/* solium-disable-next-line */
block.timestamp,
mrktFeeCollector,
marketFee
Expand Down Expand Up @@ -275,13 +275,14 @@ contract DataTokenTemplate is IERC20Template, ERC20 {
transfer(consumer, amount),
'DataTokenTemplate: failed to finish order'
);

emit OrderFinished(
orderTxId,
consumer,
amount,
serviceId,
msg.sender,
/* solium-disable-next-line */
block.timestamp
);
}
Expand Down