diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-03-22 20:00:41 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-03-22 20:00:41 +0800 |
| commit | beb483ea85ca0df707e81883d612125be1968389 (patch) | |
| tree | 9b9a043b2225cb980fa04d0be8a8040147a8b5df /packages/0x.js/src | |
| parent | 46b7fecafe283e814e2088373ec857747e4cf314 (diff) | |
| parent | 8478dc8d6d05efcdeac6653872f35149f3c9589c (diff) | |
| download | dexon-sol-tools-beb483ea85ca0df707e81883d612125be1968389.tar.gz dexon-sol-tools-beb483ea85ca0df707e81883d612125be1968389.tar.zst dexon-sol-tools-beb483ea85ca0df707e81883d612125be1968389.zip | |
Merge branch 'development' into addExtraDocs
* development:
Change blockchain prop to not optional
Other style changes
Updated padding and colors
Refactor TokenState type
Fix a bug causing fillOrdersUpTo validation to fail because of some extra orders being passed
Implement initial wallet interface
# Conflicts:
# packages/react-shared/CHANGELOG.md
# packages/website/ts/types.ts
Diffstat (limited to 'packages/0x.js/src')
| -rw-r--r-- | packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts index 6414985e6..124750d81 100644 --- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts +++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts @@ -281,6 +281,9 @@ export class ExchangeWrapper extends ContractWrapper { zrxTokenAddress, ); filledTakerTokenAmount = filledTakerTokenAmount.plus(singleFilledTakerTokenAmount); + if (filledTakerTokenAmount.eq(fillTakerTokenAmount)) { + break; + } } } |