aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Unit test edge case for ZRX and ZRX partial fillJacob Evans2017-11-213-44/+59
* setting a failed testJacob Evans2017-11-211-11/+46
* Move to base unitsJacob Evans2017-11-211-9/+10
* Added unit test for calculatorJacob Evans2017-11-211-0/+89
* Refactor into a calculator classJacob Evans2017-11-212-93/+76
* Fixes before refactorJacob Evans2017-11-211-35/+47
* fix bug when fees and partial asymmetricJacob Evans2017-11-202-1/+27
* remove importJacob Evans2017-11-201-1/+0
* calculate remaining maker token amountJacob Evans2017-11-201-25/+35
* Remove onlyJacob Evans2017-11-201-1/+1
* Split into Pooled and non-pooledJacob Evans2017-11-201-12/+50
* Incorrect amount when is zero or non-zrx feeJacob Evans2017-11-201-1/+1
* Readability variable namesJacob Evans2017-11-201-10/+10
* refactor upJacob Evans2017-11-162-17/+17
* Use 18 decimal place unitsJacob Evans2017-11-162-3/+3
* Shortcut if everything satisfies in the non dependent use caseJacob Evans2017-11-162-2/+32
* Fix testJacob Evans2017-11-161-7/+5
* Remove commentsJacob Evans2017-11-161-3/+0
* Initial testsJacob Evans2017-11-162-4/+65
* Add CHANGELOG files to each sub-packageFabio Berger2017-11-154-0/+21
* Fix 0x.js CHANGELOGFabio Berger2017-11-151-1/+1
* Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2017-11-1533-5/+1231
|\
| * Merge pull request #224 from 0xProject/feature/addConnectBrandon Millman2017-11-1533-5/+1231
| |\
| | * Add lodash noop to emptyOrderbookChannelHandlerBrandon Millman2017-11-151-4/+5
| | * Fix lint errorBrandon Millman2017-11-151-2/+1
| | * Add connect to monorepoBrandon Millman2017-11-1533-5/+1231
* | | Add title and install instructions to all sub-package READMEsFabio Berger2017-11-154-1/+28
|/ /
* | Add rocket.chat badge and remove 0x.js npm badgeFabio Berger2017-11-151-2/+2
* | Merge branch 'development' of github.com:0xProject/0x.js into developmentFabio Berger2017-11-151-2/+3
|\ \
| * | Change the way 0x.js assert extends the @0xproject/assert moduleBrandon Millman2017-11-151-2/+3
| |/
* / Add core packes to READMEFabio Berger2017-11-151-22/+8
|/
* Merge pull request #223 from dekz/bug/fix-readme-linksFabio Berger2017-11-151-1/+4
|\
| * Doubled upJacob Evans2017-11-151-2/+0
| * Change Slack to RocketJacob Evans2017-11-151-1/+3
| * Fix README linksJacob Evans2017-11-151-0/+3
|/
* Merge pull request #219 from 0xProject/feature/rounding-validationBrandon Millman2017-11-153-73/+119
|\
| * Name a constantLeonid Logvinov2017-11-151-2/+4
| * Fix namingsLeonid Logvinov2017-11-151-2/+2
| * Fix testsLeonid Logvinov2017-11-141-12/+11
| * Add a test for rounding errorLeonid Logvinov2017-11-141-0/+23
| * Add assertions for fillableTakerAmountLeonid Logvinov2017-11-141-72/+82
| * Add validation for rounding errorLeonid Logvinov2017-11-141-0/+7
| * Return remainingFillableTakerAmountLeonid Logvinov2017-11-141-0/+4
| * Add remainingFillableMakerAmount to typesLeonid Logvinov2017-11-141-0/+1
* | re-add commonjs buildFabio Berger2017-11-151-1/+1
* | PublishFabio Berger2017-11-151-2/+2
* | PublishFabio Berger2017-11-151-1/+1
* | PublishFabio Berger2017-11-151-1/+1
* | revert 0x.js version and change name so matches existing npm package nameFabio Berger2017-11-151-2/+2
* | Publish@0xproject/tslint-config@0.1.0@0xproject/json-schemas@0.6.7@0xproject/assert@0.0.4@0xproject/0x.js@0.24.0Fabio Berger2017-11-154-10/+10
* | Remove private flag because we need it published to npmFabio Berger2017-11-151-1/+0
* | Revert versionFabio Berger2017-11-151-1/+1
* | Update package name and version in package.jsonFabio Berger2017-11-151-2/+2
* | Merge pull request #221 from 0xProject/feature/addJsonSchemasBrandon Millman2017-11-1542-24/+1562
|\ \
| * | Update tslint rules for assert and json-schemasBrandon Millman2017-11-154-8/+9
| * | Merge branch 'development' into feature/addJsonSchemasBrandon Millman2017-11-1515-40/+146
| |\ \
| * | | Add json-schemas package to mono repoBrandon Millman2017-11-1441-20/+1557
* | | | Update CHANGELOGFabio Berger2017-11-151-0/+1
| |/ / |/| |
* | | Merge pull request #220 from 0xProject/feature/addTsLintPackageFabio Berger2017-11-158-24/+115
|\ \ \
| * | | Improve descriptionFabio Berger2017-11-152-2/+2
| * | | AlphabetizeFabio Berger2017-11-152-4/+4
| * | | Use tslint v5.8.0 everywhere and use the tslint-config sub-package instead of...Fabio Berger2017-11-142-26/+5
| * | | Add tslint-config sub-packageFabio Berger2017-11-146-11/+123
| * | | Fix tslint issueFabio Berger2017-11-141-1/+1
| |/ /
* | | Add exit 0 to 0x.js build commandBrandon Millman2017-11-151-1/+1
* | | Add snapshot save and revert to order_state_watcher_test.tsBrandon Millman2017-11-151-0/+6
* | | Fix changelogFabio Berger2017-11-141-1/+6
* | | Merge pull request #217 from dekz/fixCancelledNaming2Fabio Berger2017-11-147-16/+20
|\ \ \ | |/ / |/| |
| * | Public interface has changed, moved to minor versionJacob Evans2017-11-141-1/+1
| * | Update changelogJacob Evans2017-11-141-0/+4
| * | Renamed canceled to cancelledJacob Evans2017-11-146-16/+16
* | | Merge pull request #218 from 0xProject/bmillman_add_assertFabio Berger2017-11-1412-89/+558
|\ \ \ | |/ / |/| |
| * | remove new lineFabio Berger2017-11-141-1/+0
| * | Update urlsFabio Berger2017-11-141-3/+3
| * | Missing @Fabio Berger2017-11-141-2/+2
| * | Remove unused circle.ymlFabio Berger2017-11-141-14/+0
| * | Move conditional running of umd test to 0x.js's package.jsonFabio Berger2017-11-142-2/+1
| * | Add preliminary instructions to top-level READMEFabio Berger2017-11-141-0/+23
| * | remove image from sub-readmeFabio Berger2017-11-141-4/+0
| * | fix orderingsFabio Berger2017-11-142-3/+3
| * | Standardize around a `test:circleci` command that any sub-package can impleme...Fabio Berger2017-11-143-3/+4
| * | Rename backFabio Berger2017-11-1410-5/+5
| * | Rename assert sub-package and removed duplicate methods from 0x.js's assert m...Fabio Berger2017-11-149-78/+15
| * | fix mergeFabio Berger2017-11-141-2/+2
| |\ \
| | * | Add assert package to the monorepoBrandon Millman2017-11-1410-9/+537
| | |/
| * / Add assert package to the monorepoBrandon Millman2017-11-1410-9/+537
| |/
* / Re-add changelog for 0x.jsFabio Berger2017-11-141-0/+211
|/
* Merge pull request #215 from 0xProject/monoRepoFabio Berger2017-11-142-4/+3
|\
| * Upgrade to Typescript 2.6.1 and fix major & minor versionsFabio Berger2017-11-141-1/+1
| * Don't remove files before UMD test runFabio Berger2017-11-141-2/+1
| * Only run umd tests on developmentFabio Berger2017-11-141-1/+1
* | Merge pull request #214 from 0xProject/monoRepoFabio Berger2017-11-1475-10588/+981
|\|
| * Remove unused varFabio Berger2017-11-141-1/+0
| * Add interface typeFabio Berger2017-11-141-2/+6
| * Replace _.get for type safetyFabio Berger2017-11-141-6/+6
| * Declare as stringFabio Berger2017-11-141-1/+1
| * Merge branch 'monoRepo' of github.com:0xProject/0x.js into monoRepoFabio Berger2017-11-141-1/+1
| |\
| | * Fail the tests on tsc errorLeonid Logvinov2017-11-141-1/+1
| * | move tslint.json to 0x.js sub-packageFabio Berger2017-11-141-0/+0
| * | Fix lint and ts issuesFabio Berger2017-11-142-10/+10
| |/
| * point to top-level node_modulesFabio Berger2017-11-141-5/+5
| * remove unnecessary --Fabio Berger2017-11-141-5/+5
| * Add missing keyFabio Berger2017-11-141-0/+1
| * Simply lerna command and run bootstrap to install dependenciesFabio Berger2017-11-142-6/+8
| * 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