Merge branch 'development' into feature/orderExpired

2 files changed, 139 insertions, 85 deletions

diff --git a/packages/0x.js/test/order_state_watcher_test.ts b/packages/0x.js/test/order_state_watcher_test.ts
index 32f493ee6..00b290252 100644
--- a/packages/0x.js/test/order_state_watcher_test.ts
+++ b/packages/0x.js/test/order_state_watcher_test.ts
@@ -47,7 +47,7 @@ describe('OrderStateWatcher', () => {
     let taker: string;
     let web3Wrapper: Web3Wrapper;
     let signedOrder: SignedOrder;
-    const fillableAmount = new BigNumber(5);
+    const fillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(5), 18);
     before(async () => {
         web3 = web3Factory.create();
         zeroEx = new ZeroEx(web3.currentProvider);
@@ -61,19 +61,25 @@ describe('OrderStateWatcher', () => {
         [makerToken, takerToken] = tokenUtils.getNonProtocolTokens();
         web3Wrapper = (zeroEx as any)._web3Wrapper;
     });
+    beforeEach(async () => {
+        await blockchainLifecycle.startAsync();
+    });
+    afterEach(async () => {
+        await blockchainLifecycle.revertAsync();
+    });
     describe('#removeOrder', async () => {
         it('should successfully remove existing order', async () => {
             signedOrder = await fillScenarios.createFillableSignedOrderAsync(
                 makerToken.address, takerToken.address, maker, taker, fillableAmount,
             );
             const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-            zeroEx.orderStateWatcher.addOrder(signedOrder);
+            await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
             expect((zeroEx.orderStateWatcher as any)._orderByOrderHash).to.include({
                 [orderHash]: signedOrder,
             });
             let dependentOrderHashes = (zeroEx.orderStateWatcher as any)._dependentOrderHashes;
             expect(dependentOrderHashes[signedOrder.maker][signedOrder.makerTokenAddress]).to.have.keys(orderHash);
-            zeroEx.orderStateWatcher.removeOrder(orderHash);
+            await zeroEx.orderStateWatcher.removeOrderAsync(orderHash);
             expect((zeroEx.orderStateWatcher as any)._orderByOrderHash).to.not.include({
                 [orderHash]: signedOrder,
             });
@@ -86,7 +92,7 @@ describe('OrderStateWatcher', () => {
             );
             const orderHash = ZeroEx.getOrderHashHex(signedOrder);
             const nonExistentOrderHash = `0x${orderHash.substr(2).split('').reverse().join('')}`;
-            zeroEx.orderStateWatcher.removeOrder(nonExistentOrderHash);
+            await zeroEx.orderStateWatcher.removeOrderAsync(nonExistentOrderHash);
         });
     });
     describe('#subscribe', async () => {
@@ -103,7 +109,7 @@ describe('OrderStateWatcher', () => {
         afterEach(async () => {
             zeroEx.orderStateWatcher.unsubscribe();
             const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-            zeroEx.orderStateWatcher.removeOrder(orderHash);
+            await zeroEx.orderStateWatcher.removeOrderAsync(orderHash);
         });
         it('should emit orderStateInvalid when maker allowance set to 0 for watched order', (done: DoneCallback) => {
             (async () => {
@@ -111,7 +117,7 @@ describe('OrderStateWatcher', () => {
                     makerToken.address, takerToken.address, maker, taker, fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
                     const invalidOrderState = orderState as OrderStateInvalid;
@@ -129,7 +135,7 @@ describe('OrderStateWatcher', () => {
                     makerToken.address, takerToken.address, maker, taker, fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                     throw new Error('OrderState callback fired for irrelevant order');
                 });
@@ -150,7 +156,7 @@ describe('OrderStateWatcher', () => {
                     makerToken.address, takerToken.address, maker, taker, fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
                     const invalidOrderState = orderState as OrderStateInvalid;
@@ -170,7 +176,7 @@ describe('OrderStateWatcher', () => {
                     makerToken.address, takerToken.address, maker, taker, fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 
                 let eventCount = 0;
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
@@ -202,7 +208,7 @@ describe('OrderStateWatcher', () => {
 
                 const fillAmountInBaseUnits = new BigNumber(2);
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 
                 let eventCount = 0;
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
@@ -215,6 +221,8 @@ describe('OrderStateWatcher', () => {
                     const remainingFillable = fillableAmount.minus(fillAmountInBaseUnits);
                     expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal(
                         remainingFillable);
+                    expect(orderRelevantState.remainingFillableTakerTokenAmount).to.be.bignumber.equal(
+                        remainingFillable);
                     expect(orderRelevantState.makerBalance).to.be.bignumber.equal(remainingMakerBalance);
                     if (eventCount === 2) {
                         done();
@@ -227,84 +235,108 @@ describe('OrderStateWatcher', () => {
                 );
             })().catch(done);
         });
-        describe('remainingFillableMakerTokenAmount', () => {
-          it('should calculate correct remaining fillable', (done: DoneCallback) => {
-              (async () => {
-                  const takerFillableAmount = new BigNumber(10);
-                  const makerFillableAmount = new BigNumber(20);
-                  signedOrder = await fillScenarios.createAsymmetricFillableSignedOrderAsync(
-                      makerToken.address, takerToken.address, maker, taker, makerFillableAmount, takerFillableAmount);
-                  const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
-                  const takerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, taker);
-                  const fillAmountInBaseUnits = new BigNumber(2);
-                  const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                  zeroEx.orderStateWatcher.addOrder(signedOrder);
-                  let eventCount = 0;
-                  const callback = reportCallbackErrors(done)((orderState: OrderState) => {
-                      eventCount++;
-                      expect(orderState.isValid).to.be.true();
-                      const validOrderState = orderState as OrderStateValid;
-                      expect(validOrderState.orderHash).to.be.equal(orderHash);
-                      const orderRelevantState = validOrderState.orderRelevantState;
-                      expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal(
-                          new BigNumber(16));
-                      if (eventCount === 2) {
-                          done();
-                      }
-                  });
-                  zeroEx.orderStateWatcher.subscribe(callback);
-                  const shouldThrowOnInsufficientBalanceOrAllowance = true;
-                  await zeroEx.exchange.fillOrderAsync(
-                      signedOrder, fillAmountInBaseUnits, shouldThrowOnInsufficientBalanceOrAllowance, taker,
-                  );
-              })().catch(done);
-          });
-          it('should equal approved amount when approved amount is lowest', (done: DoneCallback) => {
-              (async () => {
-                  signedOrder = await fillScenarios.createFillableSignedOrderAsync(
-                      makerToken.address, takerToken.address, maker, taker, fillableAmount,
-                  );
+        it('should trigger the callback when orders backing ZRX allowance changes', (done: DoneCallback) => {
+            (async () => {
+                const makerFee = ZeroEx.toBaseUnitAmount(new BigNumber(2), 18);
+                const takerFee = ZeroEx.toBaseUnitAmount(new BigNumber(0), 18);
+                signedOrder = await fillScenarios.createFillableSignedOrderWithFeesAsync(
+                    makerToken.address, takerToken.address, makerFee, takerFee, maker, taker, fillableAmount,
+                    taker);
+                const orderHash = ZeroEx.getOrderHashHex(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
+                const callback = reportCallbackErrors(done)((orderState: OrderState) => {
+                    done();
+                });
+                zeroEx.orderStateWatcher.subscribe(callback);
+                await zeroEx.token.setProxyAllowanceAsync(zrxTokenAddress, maker, new BigNumber(0));
+            })().catch(done);
+        });
+        describe('remainingFillable(M|T)akerTokenAmount', () => {
+            it('should calculate correct remaining fillable', (done: DoneCallback) => {
+                (async () => {
+                    const takerFillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(10), 18);
+                    const makerFillableAmount = ZeroEx.toBaseUnitAmount(new BigNumber(20), 18);
+                    signedOrder = await fillScenarios.createAsymmetricFillableSignedOrderAsync(
+                        makerToken.address, takerToken.address, maker, taker, makerFillableAmount,
+                        takerFillableAmount,
+                    );
+                    const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
+                    const takerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, taker);
+                    const fillAmountInBaseUnits = ZeroEx.toBaseUnitAmount(new BigNumber(2), 18);
+                    const orderHash = ZeroEx.getOrderHashHex(signedOrder);
+                    await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
+                    let eventCount = 0;
+                    const callback = reportCallbackErrors(done)((orderState: OrderState) => {
+                        eventCount++;
+                        expect(orderState.isValid).to.be.true();
+                        const validOrderState = orderState as OrderStateValid;
+                        expect(validOrderState.orderHash).to.be.equal(orderHash);
+                        const orderRelevantState = validOrderState.orderRelevantState;
+                        expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal(
+                            ZeroEx.toBaseUnitAmount(new BigNumber(16), 18));
+                        expect(orderRelevantState.remainingFillableTakerTokenAmount).to.be.bignumber.equal(
+                            ZeroEx.toBaseUnitAmount(new BigNumber(8), 18));
+                        if (eventCount === 2) {
+                            done();
+                        }
+                    });
+                    zeroEx.orderStateWatcher.subscribe(callback);
+                    const shouldThrowOnInsufficientBalanceOrAllowance = true;
+                    await zeroEx.exchange.fillOrderAsync(
+                        signedOrder, fillAmountInBaseUnits, shouldThrowOnInsufficientBalanceOrAllowance, taker,
+                    );
+                })().catch(done);
+            });
+            it('should equal approved amount when approved amount is lowest', (done: DoneCallback) => {
+                (async () => {
+                    signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                        makerToken.address, takerToken.address, maker, taker, fillableAmount,
+                    );
 
-                  const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
+                    const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
 
-                  const changedMakerApprovalAmount = new BigNumber(3);
-                  zeroEx.orderStateWatcher.addOrder(signedOrder);
+                    const changedMakerApprovalAmount = ZeroEx.toBaseUnitAmount(new BigNumber(3), 18);
+                    await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 
-                  const callback = reportCallbackErrors(done)((orderState: OrderState) => {
-                      const validOrderState = orderState as OrderStateValid;
-                      const orderRelevantState = validOrderState.orderRelevantState;
-                      expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal(
-                          changedMakerApprovalAmount);
-                      done();
-                  });
-                  zeroEx.orderStateWatcher.subscribe(callback);
-                  await zeroEx.token.setProxyAllowanceAsync(makerToken.address, maker, changedMakerApprovalAmount);
-              })().catch(done);
-          });
-          it('should equal balance amount when balance amount is lowest', (done: DoneCallback) => {
-              (async () => {
-                  signedOrder = await fillScenarios.createFillableSignedOrderAsync(
-                      makerToken.address, takerToken.address, maker, taker, fillableAmount,
-                  );
+                    const callback = reportCallbackErrors(done)((orderState: OrderState) => {
+                        const validOrderState = orderState as OrderStateValid;
+                        const orderRelevantState = validOrderState.orderRelevantState;
+                        expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal(
+                            changedMakerApprovalAmount);
+                        expect(orderRelevantState.remainingFillableTakerTokenAmount).to.be.bignumber.equal(
+                            changedMakerApprovalAmount);
+                        done();
+                    });
+                    zeroEx.orderStateWatcher.subscribe(callback);
+                    await zeroEx.token.setProxyAllowanceAsync(makerToken.address, maker, changedMakerApprovalAmount);
+                })().catch(done);
+            });
+            it('should equal balance amount when balance amount is lowest', (done: DoneCallback) => {
+                (async () => {
+                    signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                        makerToken.address, takerToken.address, maker, taker, fillableAmount,
+                    );
 
-                  const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
+                    const makerBalance = await zeroEx.token.getBalanceAsync(makerToken.address, maker);
 
-                  const remainingAmount = new BigNumber(1);
-                  const transferAmount = makerBalance.sub(remainingAmount);
-                  zeroEx.orderStateWatcher.addOrder(signedOrder);
+                    const remainingAmount = ZeroEx.toBaseUnitAmount(new BigNumber(1), 18);
+                    const transferAmount = makerBalance.sub(remainingAmount);
+                    await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 
-                  const callback = reportCallbackErrors(done)((orderState: OrderState) => {
-                      const validOrderState = orderState as OrderStateValid;
-                      const orderRelevantState = validOrderState.orderRelevantState;
-                      expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal(
-                          remainingAmount);
-                      done();
-                  });
-                  zeroEx.orderStateWatcher.subscribe(callback);
-                  await zeroEx.token.transferAsync(
-                      makerToken.address, maker, ZeroEx.NULL_ADDRESS, transferAmount);
-              })().catch(done);
-          });
+                    const callback = reportCallbackErrors(done)((orderState: OrderState) => {
+                        const validOrderState = orderState as OrderStateValid;
+                        const orderRelevantState = validOrderState.orderRelevantState;
+                        expect(orderRelevantState.remainingFillableMakerTokenAmount).to.be.bignumber.equal(
+                            remainingAmount);
+                        expect(orderRelevantState.remainingFillableTakerTokenAmount).to.be.bignumber.equal(
+                            remainingAmount);
+                        done();
+                    });
+                    zeroEx.orderStateWatcher.subscribe(callback);
+                    await zeroEx.token.transferAsync(
+                        makerToken.address, maker, ZeroEx.NULL_ADDRESS, transferAmount);
+                })().catch(done);
+            });
         });
         it('should emit orderStateInvalid when watched order cancelled', (done: DoneCallback) => {
             (async () => {
@@ -312,7 +344,7 @@ describe('OrderStateWatcher', () => {
                     makerToken.address, takerToken.address, maker, taker, fillableAmount,
                 );
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.false();
@@ -327,6 +359,28 @@ describe('OrderStateWatcher', () => {
                 await zeroEx.exchange.cancelOrderAsync(signedOrder, fillableAmount);
             })().catch(done);
         });
+        it('should emit orderStateInvalid when within rounding error range', (done: DoneCallback) => {
+            (async () => {
+                const remainingFillableAmountInBaseUnits = new BigNumber(100);
+                signedOrder = await fillScenarios.createFillableSignedOrderAsync(
+                    makerToken.address, takerToken.address, maker, taker, fillableAmount,
+                );
+                const orderHash = ZeroEx.getOrderHashHex(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
+
+                const callback = reportCallbackErrors(done)((orderState: OrderState) => {
+                    expect(orderState.isValid).to.be.false();
+                    const invalidOrderState = orderState as OrderStateInvalid;
+                    expect(invalidOrderState.orderHash).to.be.equal(orderHash);
+                    expect(invalidOrderState.error).to.be.equal(ExchangeContractErrs.OrderFillRoundingError);
+                    done();
+                });
+                zeroEx.orderStateWatcher.subscribe(callback);
+                await zeroEx.exchange.cancelOrderAsync(
+                    signedOrder, fillableAmount.minus(remainingFillableAmountInBaseUnits),
+                );
+            })().catch(done);
+        });
         it('should emit orderStateValid when watched order partially cancelled', (done: DoneCallback) => {
             (async () => {
                 signedOrder = await fillScenarios.createFillableSignedOrderAsync(
@@ -338,7 +392,7 @@ describe('OrderStateWatcher', () => {
 
                 const cancelAmountInBaseUnits = new BigNumber(2);
                 const orderHash = ZeroEx.getOrderHashHex(signedOrder);
-                zeroEx.orderStateWatcher.addOrder(signedOrder);
+                await zeroEx.orderStateWatcher.addOrderAsync(signedOrder);
 
                 const callback = reportCallbackErrors(done)((orderState: OrderState) => {
                     expect(orderState.isValid).to.be.true();
diff --git a/packages/0x.js/test/token_registry_wrapper_test.ts b/packages/0x.js/test/token_registry_wrapper_test.ts
index 6b5dd517e..d3497451b 100644
--- a/packages/0x.js/test/token_registry_wrapper_test.ts
+++ b/packages/0x.js/test/token_registry_wrapper_test.ts
@@ -1,7 +1,7 @@
 import * as _ from 'lodash';
 import 'mocha';
 import * as chai from 'chai';
-import {SchemaValidator, schemas} from '0x-json-schemas';
+import {SchemaValidator, schemas} from '@0xproject/json-schemas';
 import {chaiSetup} from './utils/chai_setup';
 import {web3Factory} from './utils/web3_factory';
 import {ZeroEx, Token} from '../src';