aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix lerna commandFabio Berger2017-11-141-4/+4
* Fix package.jsonFabio Berger2017-11-141-1/+1
* Add checkoutFabio Berger2017-11-141-0/+1
* Merge branch 'monoRepo' of github.com:0xProject/0x.js into monoRepoFabio Berger2017-11-141-1/+1
|\
| * Fix package.jsonLeonid Logvinov2017-11-141-1/+1
* | Upgrade circleci to version 2.0Fabio Berger2017-11-142-23/+27
|/
* leave out yarn version pegFabio Berger2017-11-141-3/+1
* Use lernaFabio Berger2017-11-141-4/+4
* use yarn instead of lernaFabio Berger2017-11-141-4/+4
* Install older version of yarnFabio Berger2017-11-141-1/+3
* Add circle.yml and move testrpc command to top-level repoFabio Berger2017-11-134-29/+791
* Switch over to Lerna + Yarn Workspaces setup for a mono-repo approachFabio Berger2017-11-1372-10540/+160
* Merge pull request #200 from 0xProject/feature/receipt-statusFabio Berger2017-11-135-686/+948
|\
| * Merge branch 'development' into feature/receipt-statusFabio Berger2017-11-1329-141/+1285
| |\ | |/ |/|
* | Merge pull request #205 from 0xProject/orderWatcherFabio Berger2017-11-1327-141/+1280
|\ \
| * \ Merge branch 'orderWatcher' of github.com:0xProject/0x.js into orderWatcherFabio Berger2017-11-1313-220/+283
| |\ \
| | * \ Merge pull request #211 from 0xProject/feature/orderWatcherLocalStateStoreFabio Berger2017-11-1313-220/+283
| | |\ \
| | | * | Remove old testsLeonid Logvinov2017-11-131-62/+0
| | | * | Remove unused codeLeonid Logvinov2017-11-135-10/+6
| | | * | Fix testsLeonid Logvinov2017-11-131-4/+4
| | | * | Remove redundant spacesLeonid Logvinov2017-11-131-1/+1
| | | * | Don't store empty objectsLeonid Logvinov2017-11-131-0/+6
| | | * | Fix a typoLeonid Logvinov2017-11-131-1/+1
| | | * | Remove duplicate operationsLeonid Logvinov2017-11-131-2/+0
| | | * | Remove redundant instance variablesLeonid Logvinov2017-11-131-8/+2
| | | * | Fix testsLeonid Logvinov2017-11-131-1/+1
| | | * | Remove blockStore and default to numConfirmations === 0Leonid Logvinov2017-11-139-123/+25
| | | * | Add a commentLeonid Logvinov2017-11-131-0/+2
| | | * | Store number of confirmations in a blockStoreLeonid Logvinov2017-11-137-30/+26
| | | * | Remove tautology checkLeonid Logvinov2017-11-131-3/+0
| | | * | Pass blockStore to eventWatcherLeonid Logvinov2017-11-133-16/+22
| | | * | Fix last merge conflictsLeonid Logvinov2017-11-131-13/+3
| | | * | Clear cache on unsubscribeLeonid Logvinov2017-11-133-0/+10
| | | * | Clear store cache on eventsLeonid Logvinov2017-11-132-33/+76
| | | * | Add more configs for order watcherLeonid Logvinov2017-11-131-3/+5
| | | * | Make subscribe function async and make blockStore operationalLeonid Logvinov2017-11-132-21/+59
| | | * | Adjust tests to new interfaceLeonid Logvinov2017-11-131-14/+11
| | | * | Add more errorsLeonid Logvinov2017-11-131-0/+2
| | | * | Create stores in orderStateWatcherLeonid Logvinov2017-11-132-17/+24
| | | * | Make orderStateUtils operate on storesLeonid Logvinov2017-11-132-30/+32
| | | * | Create fake blockStore for exchange transfer simulatorLeonid Logvinov2017-11-131-1/+4
| | | * | Add initial incomplete BlockStore implementationLeonid Logvinov2017-11-131-0/+38
| | | * | Make stores accept numConfirmations and blockStore instead of defaultBlockLeonid Logvinov2017-11-132-10/+20
| | | * | Add LatestBlockNumberNotSet internal errorLeonid Logvinov2017-11-131-0/+1
| | | * | Add functions to clear stores cacheLeonid Logvinov2017-11-132-0/+16
| | | * | Add store for order filled/cancelled stateLeonid Logvinov2017-11-131-0/+52
| | | * | Make store configurable by blockParamLeonid Logvinov2017-11-132-5/+14
| | | * | Fix testsLeonid Logvinov2017-11-131-10/+8
| | | * | Make a store an instance variable of exchange transfer simulator and stop inh...Leonid Logvinov2017-11-132-15/+22
| | | * | Refactor out BalanceAndProxyAllowanceLazyStoreLeonid Logvinov2017-11-132-53/+56
| | |/ /
| * | | Merge branch 'development' into orderWatcherFabio Berger2017-11-1310-52/+153
| |\ \ \ | |/ / / |/| / / | |/ /
* | | 0.23.0v0.23.0Brandon Millman2017-11-132-2/+2
* | | Update CHANGELOGBrandon Millman2017-11-131-0/+5
| * | Merge pull request #210 from dekz/orderWatcherRemainingFabio Berger2017-11-133-0/+94
| |\ \
| | * | remove commentsJacob Evans2017-11-131-3/+0
| | * | Perform the division after multiplication to reduce compounding the rounding ...Jacob Evans2017-11-132-10/+11
| | * | Update commentJacob Evans2017-11-131-1/+1
| | * | text description updateJacob Evans2017-11-131-2/+2
| | * | remove onlyJacob Evans2017-11-131-3/+3
| | * | Added specs for allowance and balance changesJacob Evans2017-11-132-2/+79
| | * | Calculate the remaining order amount in maker unitsJacob Evans2017-11-133-0/+19
| * | | Merge pull request #207 from 0xProject/orderWatcherTestsFabio Berger2017-11-133-0/+97
| |\ \ \ | | |/ / | |/| |
| | * | Don't return anythingFabio Berger2017-11-131-2/+1
| | * | Add tests for the numConfirmations config to ensure that the events are being...Fabio Berger2017-11-113-2/+78
| | * | Test that the orderStateWatcher doesn't emit an event when an irrelevant bloc...Fabio Berger2017-11-101-0/+22
| * | | Update testRPC snapshot used by CircleCiFabio Berger2017-11-121-1/+1
| * | | Merge branch 'development' into orderWatcherFabio Berger2017-11-125-3/+20
| |\ \ \
| * | | | Add commentFabio Berger2017-11-121-0/+2
| * | | | rename isDecodedLog to isLogDecodedFabio Berger2017-11-111-2/+2
| * | | | Improve commentFabio Berger2017-11-111-1/+2
| * | | | Fix test given that we now do delete the keys in dependentOrderHashesFabio Berger2017-11-111-1/+1
| * | | | Fix missing renamesFabio Berger2017-11-111-2/+2
| * | | | Declare OnOrderStateChangeCallback as either sync or asyncFabio Berger2017-11-111-3/+3
| * | | | Fix commentFabio Berger2017-11-111-3/+0
| * | | | Remove keys from dependentOrderHashes if emptyFabio Berger2017-11-111-2/+10
| * | | | establish convention of initializing empty instances in instance declarationFabio Berger2017-11-111-4/+2
| * | | | Use enum instead of boolean to avoid potential bugs from isRemoved incorrectl...Fabio Berger2017-11-111-6/+10
| * | | | rename _orders to _orderByOrderhash for clarityFabio Berger2017-11-111-7/+7
| * | | | Add comment above orderStateWatcher classFabio Berger2017-11-111-0/+6
| * | | | Fix expected balanceFabio Berger2017-11-111-2/+2
| * | | | Fix type declaration in testFabio Berger2017-11-111-6/+6
| * | | | Feather the callback down to _emitDifferencesAsync and don't store it as a cl...Fabio Berger2017-11-111-11/+11
| * | | | Throw if trying to subscribe multiple timesFabio Berger2017-11-111-1/+9
| * | | | Fix alignmentFabio Berger2017-11-111-2/+2
| * | | | Add comment above the eventWatcher classFabio Berger2017-11-111-0/+4
| * | | | Rename method since it's not more then just mempoolFabio Berger2017-11-111-2/+2
| | |/ / | |/| |
| * | | Fix test descriptionFabio Berger2017-11-101-1/+1
| * | | Fix test descriptionFabio Berger2017-11-101-1/+1
| * | | Move numConfirmations to constructor callFabio Berger2017-11-101-3/+3
| * | | Improve commentFabio Berger2017-11-101-1/+2
| * | | Make sure to set the defaultBlock to the blockNumber rather then the number o...Fabio Berger2017-11-101-5/+9
| * | | Simplify to/from block codeFabio Berger2017-11-101-8/+5
| * | | Add assertionFabio Berger2017-11-101-0/+2
| * | | Merge branch 'orderWatcher' of github.com:0xProject/0x.js into orderWatcherFabio Berger2017-11-101-0/+14
| |\ \ \
| | * | | Add forgotten fileLeonid Logvinov2017-11-101-0/+14
| * | | | remove no longer needed argFabio Berger2017-11-101-3/+2
| * | | | rename intervalId to intervalIdIfExistsFabio Berger2017-11-101-3/+5
| |/ / /
| * | | Merge branch 'orderWatcher' of github.com:0xProject/0x.js into orderWatcherFabio Berger2017-11-101-13/+55
| |\ \ \
| | * | | Add order state watcher tests for LogCancelLeonid Logvinov2017-11-101-13/+55
| * | | | Fix bug where we hard-coded using pendingBlock for fetching the orderState. M...Fabio Berger2017-11-105-20/+36
| |/ / /
| * | | Fix commentsFabio Berger2017-11-101-3/+2
| * | | comment improvementsFabio Berger2017-11-101-3/+3
| * | | Closing paren on same level as openFabio Berger2017-11-101-1/+2
| * | | Rename _callbackAsync to _callbackIfExistsAsync for clarityFabio Berger2017-11-102-11/+11
| * | | Merge branches 'orderWatcher' and 'orderWatcher' of github.com:0xProject/0x.j...Fabio Berger2017-11-101-2/+3
| |\ \ \
| | * | | Fix getting events from non-mempoolLeonid Logvinov2017-11-101-2/+3
| * | | | use explicit importFabio Berger2017-11-101-1/+1
| |/ / /
| * | | Remove finished TODOsFabio Berger2017-11-102-2/+0
| * | | Merge branch 'orderWatcher' of github.com:0xProject/0x.js into orderWatcherFabio Berger2017-11-101-2/+2
| |\ \ \
| | * | | Revert test amount changesLeonid Logvinov2017-11-101-2/+2
| * | | | Create assert.isValidSignature method and use it in `addOrder`Fabio Berger2017-11-102-2/+9
| * | | | Move isValidSignature implementation into signatureUtilsFabio Berger2017-11-102-13/+17
| |/ / /
| * | | Fix commentFabio Berger2017-11-101-1/+1
| * | | Merge branch 'orderWatcher' of github.com:0xProject/0x.js into orderWatcherFabio Berger2017-11-101-8/+9
| |\ \ \
| | * | | Revert "Use _.get for optional configs"Leonid Logvinov2017-11-101-8/+9
| * | | | Add nested config for orderWatcherFabio Berger2017-11-106-12/+27
| |/ / /
| * | | Rename MempoolEventCallback to EventWatcherCallbackFabio Berger2017-11-104-9/+9
| * | | Merge branch 'orderWatcher' of github.com:0xProject/0x.js into orderWatcherFabio Berger2017-11-101-5/+5
| |\ \ \
| | * | | Fix namingsLeonid Logvinov2017-11-101-5/+5
| * | | | rename folder to order_watcherFabio Berger2017-11-103-10/+10
| |/ / /
| * | | Remove redundant assertionsLeonid Logvinov2017-11-104-16/+1
| * | | Use _.get for optional configsFabio Berger2017-11-101-9/+8
| * | | Improve commentFabio Berger2017-11-101-1/+2
| * | | Add SubscriptionAlreadyPresent errorLeonid Logvinov2017-11-103-2/+8
| * | | Pass numConfirmationsLeonid Logvinov2017-11-101-2/+2
| * | | Removed unused order adding in testsLeonid Logvinov2017-11-101-1/+0
| * | | Add a test that a second subscription failsLeonid Logvinov2017-11-101-0/+14
| * | | fix merge conflictsFabio Berger2017-11-102-89/+123
| |\ \ \
| | * | | Add tests for order removalsLeonid Logvinov2017-11-101-85/+116
| | * | | Pass orderHash instead of an order to removeOrder and adjust the testsLeonid Logvinov2017-11-102-4/+7
| * | | | Add comments to public methodsFabio Berger2017-11-101-1/+21
| * | | | Add numConfirmations arg so that caller can decide on numConfirmations at whi...Fabio Berger2017-11-104-13/+27
| * | | | Merge branch 'orderWatcher' of github.com:0xProject/0x.js into orderWatcherFabio Berger2017-11-103-2/+6
| |\| | |
| | * | | Remove check for now, we need a more robust checkFabio Berger2017-11-101-3/+0
| | * | | Rename test file and add test for a partial fillFabio Berger2017-11-101-2/+46
| | * | | Fix tests by making the expected balance be 2^27 not 2^26Fabio Berger2017-11-101-2/+2
| | * | | Add assert.isValidBaseUnitAmount that checks for decimals in amounts that sho...Fabio Berger2017-11-104-0/+22
| | * | | Look for relevant events in the decodedLogs and emit orderState events for or...Fabio Berger2017-11-102-52/+144
| | * | | Remove unused importFabio Berger2017-11-101-1/+0
| | * | | Fix typoFabio Berger2017-11-101-1/+1
| | * | | Add todo commentsFabio Berger2017-11-102-1/+3
| | * | | fix stylingFabio Berger2017-11-101-1/+2
| | * | | remove unused typeFabio Berger2017-11-101-1/+0
| | * | | Add naive order state watcher implementationLeonid Logvinov2017-11-109-64/+232
| | * | | Change fields in OrderState to represent taker side valuesLeonid Logvinov2017-11-101-2/+2
| | * | | Introduce OrderState interfaceLeonid Logvinov2017-11-102-8/+12
| | * | | Fix config schemaLeonid Logvinov2017-11-101-1/+4
| | * | | Add empty implementation of order state watcherLeonid Logvinov2017-11-105-29/+120
| | * | | Add new public typesLeonid Logvinov2017-11-101-0/+4
| | * | | Move mempoolPollingIntervalMs to OrderWatcherConfigLeonid Logvinov2017-11-101-1/+6
| | * | | Adjust tests for mempool event watcherLeonid Logvinov2017-11-101-12/+13
| | * | | Clear event cache on unsubscribeLeonid Logvinov2017-11-101-0/+1
| | * | | Remove mempool event watcher configLeonid Logvinov2017-11-101-1/+0
| | * | | Move provider altering logic to Web3WrapperLeonid Logvinov2017-11-103-18/+19
| | * | | Add types for order state watcherLeonid Logvinov2017-11-101-0/+21
| | * | | Add initial interface of an OrderWatcherLeonid Logvinov2017-11-101-0/+27
| | * | | Rename MempoolWatcher to EventWatcher and remove from public interfaceLeonid Logvinov2017-11-102-10/+1
| | * | | Fix namingsLeonid Logvinov2017-11-101-2/+2
| | * | | Add mempool testsLeonid Logvinov2017-11-101-0/+125
| | * | | Don't emit new events if already unsubscribedLeonid Logvinov2017-11-101-1/+3
| | * | | Compare logs by string representationLeonid Logvinov2017-11-101-2/+2
| | * | | Upgrade web3-typescript-typingsLeonid Logvinov2017-11-102-4/+4
| | * | | Add initial mempool watching implememtationLeonid Logvinov2017-11-108-32/+115
| * | | | Remove check for now, we need a more robust checkFabio Berger2017-11-091-3/+0
| * | | | Rename test file and add test for a partial fillFabio Berger2017-11-091-2/+46
| * | | | Fix tests by making the expected balance be 2^27 not 2^26Fabio Berger2017-11-091-2/+2
| * | | | Add assert.isValidBaseUnitAmount that checks for decimals in amounts that sho...Fabio Berger2017-11-094-0/+22
| * | | | Look for relevant events in the decodedLogs and emit orderState events for or...Fabio Berger2017-11-092-52/+144
| * | | | Remove unused importFabio Berger2017-11-091-1/+0
| * | | | Fix typoFabio Berger2017-11-091-1/+1
| * | | | Add todo commentsFabio Berger2017-11-092-1/+3
| * | | | fix stylingFabio Berger2017-11-091-1/+2
| * | | | remove unused typeFabio Berger2017-11-091-1/+0
| * | | | Add naive order state watcher implementationLeonid Logvinov2017-10-319-64/+232
| * | | | Change fields in OrderState to represent taker side valuesLeonid Logvinov2017-10-311-2/+2
| * | | | Introduce OrderState interfaceLeonid Logvinov2017-10-312-8/+12
| * | | | Fix config schemaLeonid Logvinov2017-10-311-1/+4
| * | | | Add empty implementation of order state watcherLeonid Logvinov2017-10-315-29/+120
| * | | | Add new public typesLeonid Logvinov2017-10-311-0/+4
| * | | | Move mempoolPollingIntervalMs to OrderWatcherConfigLeonid Logvinov2017-10-311-1/+6
| * | | | Adjust tests for mempool event watcherLeonid Logvinov2017-10-311-12/+13
| * | | | Clear event cache on unsubscribeLeonid Logvinov2017-10-311-0/+1
| * | | | Remove mempool event watcher configLeonid Logvinov2017-10-311-1/+0
| * | | | Move provider altering logic to Web3WrapperLeonid Logvinov2017-10-313-18/+19
| * | | | Add types for order state watcherLeonid Logvinov2017-10-311-0/+21
| * | | | Add initial interface of an OrderWatcherLeonid Logvinov2017-10-311-0/+27
| * | | | Rename MempoolWatcher to EventWatcher and remove from public interfaceLeonid Logvinov2017-10-312-10/+1
| * | | | Fix namingsLeonid Logvinov2017-10-311-2/+2
| * | | | Add mempool testsLeonid Logvinov2017-10-311-0/+125
| * | | | Don't emit new events if already unsubscribedLeonid Logvinov2017-10-311-1/+3
| * | | | Compare logs by string representationLeonid Logvinov2017-10-311-2/+2
| * | | | Upgrade web3-typescript-typingsLeonid Logvinov2017-10-312-4/+4
| * | | | Add initial mempool watching implememtationLeonid Logvinov2017-10-318-32/+115
| | | | * Fix tslint issueLeonid Logvinov2017-11-132-26/+15
| | | | * Fix testsLeonid Logvinov2017-11-131-1/+1
| | | | * Normalize the way we return the transaction statusLeonid Logvinov2017-11-136-700/+973
| |_|_|/ |/| | |
* | | | Merge pull request #209 from 0xProject/fixUnhandledPromiseBugBrandon Millman2017-11-138-58/+154
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix amounts in tests one last time. Now that we updated the testRPC snapshot,...Fabio Berger2017-11-121-2/+2
| * | | Update testRPC snapshot used by CircleCiFabio Berger2017-11-121-1/+1
| * | | Merge pull request #208 from dekz/fixUnhandledPromiseBugFabio Berger2017-11-124-33/+115
| |\ \ \
| | * | | Push unsubscribe to the base class rather than superJacob Evans2017-11-123-25/+16
| | * | | Check for null rather than undefinedJacob Evans2017-11-121-1/+0
| | * | | Removed nitsJacob Evans2017-11-122-9/+2
| | * | | Test case was error then unsubscribeJacob Evans2017-11-121-4/+13
| | * | | Clean up subscription state.Jacob Evans2017-11-124-17/+107
| |/ / /
| * / / Fix unhandled promise rejection error on subscriptionsFabio Berger2017-11-114-24/+38
|/ / /
* | | 0.22.6v0.22.6Leonid Logvinov2017-11-112-2/+2
* | | Add new changes to CHANGELOGLeonid Logvinov2017-11-111-0/+4
* | | Merge pull request #206 from lukeautry/await_transaction_timeoutLeonid2017-11-112-1/+14
|\ \ \ | |_|/ |/| |
| * | use util fnLuke Autry2017-11-111-1/+1
| * | no race, reject from interval cb and clearLuke Autry2017-11-111-9/+10
| * | allow timeout for await transaction minedLuke Autry2017-11-102-1/+13
|/ /
* | 0.22.5v0.22.5Fabio Berger2017-11-082-2/+2
* | Update changelogFabio Berger2017-11-081-0/+4
|/
* Remove unnecessary depFabio Berger2017-10-311-1/+0
* Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2017-10-3027-175/+201
|\
| * Update CHANGELOGLeonid Logvinov2017-10-261-0/+4
| * 0.22.4v0.22.4Leonid Logvinov2017-10-262-2/+2
| * Merge pull request #202 from 0xProject/fix/bignumber-typesLeonid2017-10-2625-173/+195
| |\
| | * Add HACK commentsLeonid Logvinov2017-10-261-0/+5
| | * Add a forgotten augmentation fileLeonid Logvinov2017-10-261-0/+18
| | * Upgrade bignumber to the version with native typings and remove typingsLeonid Logvinov2017-10-2622-153/+149
| | * Downgrade typedocLeonid Logvinov2017-10-262-33/+37
| | * Upgrade bignumber to the version with native typings and remove typingsLeonid Logvinov2017-10-262-35/+34
| |/
* / Fix commentFabio Berger2017-10-301-2/+2
|/
* 0.22.3v0.22.3Leonid Logvinov2017-10-252-2/+2
* Update CHANGELOGLeonid Logvinov2017-10-251-0/+4
* Merge pull request #199 from NoteGio/raise-allowance-gasLeonid2017-10-251-1/+1
|\
| * Increase ALLOWANCE_TO_ZERO_GAS_AMOUNTAustin Roberts2017-10-251-1/+1
|/
* 0.22.2Leonid Logvinov2017-10-242-2/+2
* Merge pull request #197 from 0xProject/fix/roundingLeonid2017-10-243-11/+72
|\
| * Update CHANGELOGLeonid Logvinov2017-10-241-0/+4
| * Fix indexLeonid Logvinov2017-10-241-1/+1
| * Use more meaningful variable namesLeonid Logvinov2017-10-241-3/+6
| * Fix the rounding of makerFillAmount and correctly validate partial feesLeonid Logvinov2017-10-241-9/+34
| * Add tests testing that rounding or makerFillAmount is correct and that we onl...Leonid Logvinov2017-10-241-2/+31
|/
* Revert CHANGELOGLeonid Logvinov2017-10-241-4/+0
* Merge pull request #198 from 0xProject/revert-195-minificationLeonid2017-10-2432-146/+1449
|\
| * Revert "Reduce final bundle size by 11% (82kB)"Leonid2017-10-2432-146/+1449
|/
* Merge pull request #196 from 0xProject/bmillman_fix_tslintBrandon Millman2017-10-242-2/+2
|\
| * Fix lint script to analyze nested filesBrandon Millman2017-10-202-2/+2
|/
* 0.22.1Leonid Logvinov2017-10-192-2/+2
* Update CHANGELOGLeonid Logvinov2017-10-191-0/+4
* Merge pull request #195 from 0xProject/minificationLeonid2017-10-1932-1449/+146
|\
| * Fix linter errorsLeonid Logvinov2017-10-191-5/+8
| * Update 0x-json-schemasLeonid Logvinov2017-10-193-6/+10
| * Transform lodash-es to commonjs module formatLeonid Logvinov2017-10-193-4/+6
| * Fix testsLeonid Logvinov2017-10-192-7/+7
| * Remove unused parts from artifactsLeonid Logvinov2017-10-185-1382/+1
| * Include only used lodash functionsLeonid Logvinov2017-10-1825-59/+128