Skip to content
This repository was archived by the owner on Mar 19, 2019. It is now read-only.
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
6 changes: 3 additions & 3 deletions contracts/TokenTransferDelegate.sol
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ contract TokenTransferDelegate {
external;

function batchUpdateHistoryAndTransferTokens(
address lrcTokenAddress,
address minerFeeRecipient,
address lrcTokenAddress,
address minerFeeRecipient,
bytes32[] historyBatch,
bytes32[] transferBatch
)
Expand Down Expand Up @@ -122,7 +122,7 @@ contract TokenTransferDelegate {
function checkCutoffsBatch(
address[] owners,
bytes20[] tradingPairs,
uint[] validSince
uint[] validSince
)
external
view;
Expand Down
2 changes: 1 addition & 1 deletion contracts/TokenTransferDelegateImpl.sol
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ contract TokenTransferDelegateImpl is TokenTransferDelegate, Claimable {
}

uint walletFee = (wallet == 0x0) ? 0 : fee.mul(walletSplitPercentage) / 100;
uint minerFee = fee - walletFee;
uint minerFee = fee.sub(walletFee);

if (walletFee > 0 && wallet != owner) {
require(
Expand Down
4 changes: 2 additions & 2 deletions contracts/lib/MathUint.sol
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ library MathUint {

uint avg = 0;
for (uint i = 0; i < len; i++) {
avg += arr[i];
avg = add(avg, arr[i]);
}

avg = avg / len;
Expand All @@ -101,7 +101,7 @@ library MathUint {
for (uint i = 0; i < len; i++) {
item = arr[i];
s = item > avg ? item - avg : avg - item;
cvs += mul(s, s);
cvs = add(cvs, mul(s, s));
}

return ((mul(mul(cvs, scale), scale) / avg) / avg) / (len - 1);
Expand Down
4 changes: 2 additions & 2 deletions contracts/lib/MultihashUtil.sol
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ library MultihashUtil {
require(
signer == ecrecover(
keccak256(
SIG_PREFIX,
plaintext
SIG_PREFIX,
plaintext
),
uint8(multihash[2]),
BytesUtil.bytesToBytes32(multihash, 3),
Expand Down