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
2 changes: 1 addition & 1 deletion Dockerfile.test
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM mhart/alpine-node:9.11.1

RUN apk add --no-cache git curl make gcc g++ python linux-headers

RUN npm install -g truffle@4.0.1 typescript@2.4.2
RUN npm install -g truffle@4.1.7 typescript@2.7.1

ADD package.json package.json

Expand Down
12 changes: 6 additions & 6 deletions contracts/LoopringProtocol.sol
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ contract LoopringProtocol {
uint8 public constant OPTION_MASK_CAP_BY_AMOUNTB = 0x01;

struct Fill {
bytes32 orderHash;
uint amountS;
uint lrcReward;
uint lrcFee;
uint splitS;
uint splitB;
bytes32 orderHash;
address owner;
address tokenS;
uint amountS;
int split; // Positive number for splitS and negaive for splitB .
int lrcFee;
}

event RingMined(
Expand Down
8 changes: 4 additions & 4 deletions contracts/LoopringProtocolImpl.sol
Original file line number Diff line number Diff line change
Expand Up @@ -768,11 +768,11 @@ contract LoopringProtocolImpl is LoopringProtocol {

fills[i] = Fill(
order.orderHash,
order.owner,
order.tokenS,
order.fillAmountS,
order.lrcReward,
order.lrcFeeState,
order.splitS,
order.splitB
order.splitS > 0 ? int(order.splitS) : -int(order.splitB),
int(order.lrcFeeState) - int(order.lrcReward)
);

prevSplitB = order.splitB;
Expand Down