crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use 18 decimal place units

Browse Source
This commit is contained in:
Jacob Evans
2017-11-15 16:22:35 -05:00
parent c32938fa43
commit 9133e764a5
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/0x.js/src/utils/order_state_utils.ts
View File

@@ -116,12 +116,12 @@ export class OrderStateUtils {
return BigNumber.min(makerTransferrable, remainingMakerAmount);
}
const orderToFeeRatio = totalMakerAmount.dividedToIntegerBy(makerFee);
console.log('order to fee ratio: ', orderToFeeRatio.toString());
let fillableTimesInMakerToken = makerTransferrable.dividedToIntegerBy(orderToFeeRatio);
const fillableTimesInFeeToken = BigNumber.min(makerFeeTransferrable, remainingMakerFee);
if (makerTokenAddress === zrxTokenAddress) {
fillableTimesInMakerToken = makerTransferrable.plus(makerFeeTransferrable)
.dividedToIntegerBy(orderToFeeRatio.plus(new BigNumber(1)));
.dividedToIntegerBy(orderToFeeRatio.plus(
ZeroEx.toBaseUnitAmount(new BigNumber(1), 18)));
}
return BigNumber.min(fillableTimesInMakerToken.times(orderToFeeRatio),

2
packages/0x.js/test/order_state_watcher_test.ts
View File

@@ -235,7 +235,7 @@ describe('OrderStateWatcher', () => {
);
})().catch(done);
});
describe.only('remainingFillable(M|T)akerTokenAmount', () => {
describe('remainingFillable(M|T)akerTokenAmount', () => {
it('should calculate correct remaining fillable', (done: DoneCallback) => {
(async () => {
const takerFillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(10), 18);