aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-023-37/+37
* Improve fillOrderAsync commentFabio Berger2017-06-021-3/+6
* Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-021-321/+0
|\
| * Remove protocol token artifactsLeonid Logvinov2017-06-021-321/+0
* | Improve error names and remove duplicate importFabio Berger2017-06-022-8/+8
* | Improve commentFabio Berger2017-06-021-2/+1
* | remove ProtocolTokenFabio Berger2017-06-021-1/+1
|/
* Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-021-4/+0
|\
| * Fix tslint issuesFabio Berger2017-06-021-2/+2
* | Rename coinBase to coinbaseLeonid Logvinov2017-06-022-12/+12
* | Refactor balance & allowance testsLeonid Logvinov2017-06-021-47/+42
* | Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-023-10/+96
* | Add success test for fill with feesLeonid Logvinov2017-06-022-5/+33
* | Add token utilsLeonid Logvinov2017-06-021-0/+23
* | Add ProtocolTokenArtifactsLeonid Logvinov2017-06-022-1/+322
* | Add fill scenario with feesLeonid Logvinov2017-06-022-10/+41
* | Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-024-18/+61
* | Validate maker balance and allowance & testsLeonid Logvinov2017-06-022-4/+39
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-021-0/+17
|\ \
| * | Add test for valid partial fillLeonid Logvinov2017-06-021-0/+17
* | | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ...Fabio Berger2017-06-023-6/+7
|/ /
* | Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-022-15/+35
* | Introduce coinBase accountLeonid Logvinov2017-06-024-16/+38
* | Fix testsLeonid Logvinov2017-06-021-2/+2
* | WorkLeonid Logvinov2017-06-022-15/+30
* | Create a FillsScenario utils module and use it in the fillOrder testsFabio Berger2017-06-025-42/+67
* | Change test nameLeonid Logvinov2017-06-021-3/+2
* | Make validateFillOrder asyncronousLeonid Logvinov2017-06-022-3/+4
* | Add not enough taker balance testsLeonid Logvinov2017-06-024-11/+37
* | Revert "Add test to check the balance"Leonid Logvinov2017-06-021-10/+0
* | Add test to check the balanceLeonid Logvinov2017-06-011-0/+10
* | rename variableFabio Berger2017-06-011-2/+2
* | Follow constants conventionLeonid Logvinov2017-06-011-2/+2
* | Fix getOrderHashAsync testFabio Berger2017-06-011-0/+13
* | Fix importFabio Berger2017-06-011-1/+1
* | remove unused argFabio Berger2017-06-012-7/+4
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-15/+3
|\ \
| * \ Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncLeonid Logvinov2017-06-011-2/+2
| |\ \
| * | | Remove duplicate declarationsLeonid Logvinov2017-06-011-15/+3
* | | | Add missing comma and semi-colonFabio Berger2017-06-011-2/+2
* | | | Stop passing exchangeAddress into getOrderHash and instead get it from the ar...Fabio Berger2017-06-013-52/+64
| |/ / |/| |
* | | move external imports to topFabio Berger2017-06-011-2/+2
|/ /
* | get rid of literal amount paramsFabio Berger2017-06-011-6/+16
* | remove duplicate declarationsFabio Berger2017-06-011-3/+0
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-8/+18
|\ \
| * | give some balance and allowance by defaultLeonid Logvinov2017-06-011-5/+4
| * | Add test, for throw when order is expiredLeonid Logvinov2017-06-011-3/+14
* | | Add async suffix and fix alignmentFabio Berger2017-06-011-9/+9
|/ /
* | reorder variabledFabio Berger2017-06-011-3/+3
* | remove legacy codeFabio Berger2017-06-011-1/+0
* | reorder importFabio Berger2017-06-011-1/+1
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-9/+10
|\ \
| * | Add shouldCheckTransferLeonid Logvinov2017-06-011-1/+1
| * | Refactor testsLeonid Logvinov2017-06-011-10/+11
* | | put external imports at the topFabio Berger2017-06-011-6/+6
* | | remove commentFabio Berger2017-06-011-1/+0
|/ /
* | rename txData to txOptsFabio Berger2017-06-011-2/+2
* | remove superfluous paramFabio Berger2017-06-011-1/+1
* | remove unused argFabio Berger2017-06-011-2/+1
* | remove unneeded methodFabio Berger2017-06-011-5/+1
* | improve commentFabio Berger2017-06-011-2/+2
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-014-4/+12
|\ \
| * | Add timestamp parameter to order factoryLeonid Logvinov2017-06-011-3/+7
| * | Add expired checkLeonid Logvinov2017-06-011-0/+3
| * | Add EXPIRED error typeLeonid Logvinov2017-06-011-0/+1
| * | Increase mocha timeoutLeonid Logvinov2017-06-011-1/+1
* | | Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountIn...Fabio Berger2017-06-012-9/+15
|/ /
* | Revert "Add EXPIRED test"Leonid Logvinov2017-06-015-34/+20
* | Get getSenderAddressOrThrowAsync everywhere where we throw if the senderAddre...Fabio Berger2017-06-012-15/+12
* | Add ExchangeContractErrs string enumFabio Berger2017-06-012-8/+17
* | fix formattingFabio Berger2017-06-011-4/+2
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-016-28/+63
|\ \
| * | Add EXPIRED testLeonid Logvinov2017-06-015-21/+35
| * | Fix testsLeonid Logvinov2017-06-011-8/+2
| * | Add NOT_A_TAKER checkLeonid Logvinov2017-06-013-1/+14
| * | Add FILL_AMOUNT_IS_ZERO checkLeonid Logvinov2017-06-013-2/+16
* | | Rename ExchangeContractErrs to ExchangeContractErrCodesFabio Berger2017-06-012-10/+10
|/ /
* | Make taker required on Order object and expect NULL_ADDRESS from 0x.jsFabio Berger2017-06-014-7/+6
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-012-9/+7
|\ \
| * | Add taker parameter to createSignedOrderLeonid Logvinov2017-06-012-3/+6
| * | Rename order to order_factoryLeonid Logvinov2017-06-012-1/+1
| * | Remove unnecessary checksLeonid Logvinov2017-06-011-5/+0
* | | rename signed_order_schema to order_schemasFabio Berger2017-06-014-3/+3
|/ /
* | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-014-46/+365
|\ \
| * | Fix types hell with, chai and chai-as-promisedLeonid Logvinov2017-06-014-46/+365
* | | Add convertToJSONSchemaCompatibleObject methodFabio Berger2017-06-013-2/+15
* | | move external imports to topFabio Berger2017-06-011-2/+2
|/ /
* | make bigNumberConfig a moduleFabio Berger2017-06-012-9/+13
* | Fix linter errorsLeonid Logvinov2017-06-013-22/+28
* | Add dirty-chaiLeonid Logvinov2017-06-014-26/+16
* | Type estimateGasLeonid Logvinov2017-06-011-4/+6
* | Allign parametersLeonid Logvinov2017-06-011-2/+2
* | Remove TxDataLeonid Logvinov2017-06-011-5/+1
* | Temporarily fix gas extimationLeonid Logvinov2017-06-011-0/+13
* | Use constLeonid Logvinov2017-06-011-1/+1
* | Add setDefaultAccountLeonid Logvinov2017-06-013-2/+12
* | Temp pushLeonid Logvinov2017-06-012-55/+58
* | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-015-43/+4064
|\|
| * Merge pull request #28 from 0xProject/erc20transferLeonid2017-06-013-23/+60
| |\
| | * Address feedbackLeonid Logvinov2017-05-311-26/+28
| | * Merge branch 'master' into erc20transferLeonid2017-05-313-15/+3840
| | |\
| * | | Fix testrpc verison to 3.0.5Leonid Logvinov2017-06-012-20/+214
| | |/ | |/|
| * | Merge pull request #26 from 0xProject/erc20WrapperFabio Berger2017-05-316-2/+206
| |\ \
| | * | Add TxOpts typeFabio Berger2017-05-311-1/+6
| | * | remove InternalError type since this error could surface through the public i...Fabio Berger2017-05-312-7/+3
| | * | Remove superfluous undefined checkFabio Berger2017-05-311-4/+2
| | * | Add full stop to commentsFabio Berger2017-05-311-2/+2
| * | | Merge pull request #27 from 0xProject/yarnFabio Berger2017-05-311-0/+3826
| |\ \ \
| | * | | Add yarn.lockLeonid Logvinov2017-05-311-0/+3826
| |/ / /
* | | | Add setAllowance functionLeonid Logvinov2017-05-311-4/+18
* | | | Fix linter errorsLeonid Logvinov2017-05-314-5/+5
* | | | Remove debug outputLeonid Logvinov2017-05-311-3/+0
* | | | Revert testsLeonid Logvinov2017-05-311-7/+43
* | | | Add createSignedOrder functionLeonid Logvinov2017-05-311-6/+23
* | | | Don't return contract responseLeonid Logvinov2017-05-311-2/+1
* | | | Set bignumber configLeonid Logvinov2017-05-312-0/+11
* | | | Fix linter commandLeonid Logvinov2017-05-311-1/+1
* | | | Merge branch 'erc20transfer' into fillOrderAsyncLeonid Logvinov2017-05-316-2/+242
|\ \ \ \ | | |_|/ | |/| |
| * | | Add transfer function and tests for itLeonid Logvinov2017-05-313-1/+36
| | |/ | |/|
| * | remove unused importsFabio Berger2017-05-302-4/+0
| * | Add test for setProxyAllowanceAsync and additional test for getProxyAllowance...Fabio Berger2017-05-301-2/+32
| * | Implement setProxyAllowanceAsyncFabio Berger2017-05-303-4/+34
| * | remove spaces after it keywordFabio Berger2017-05-301-2/+2
| * | Add first test for getProxyAllowanceAsyncFabio Berger2017-05-301-0/+9
| * | Implement zeroEx.token.getProxyAllowanceAsyncFabio Berger2017-05-302-1/+34
| * | use token instead of erc20Fabio Berger2017-05-302-6/+6
| * | rename ERC20Contract to TokenContractFabio Berger2017-05-302-5/+5
| * | rename erc20Wrapper to tokenWrapper to be more generic in case we end up supp...Fabio Berger2017-05-303-8/+31
| * | Merge branch 'master' into erc20WrapperFabio Berger2017-05-308-23/+85
| |\|
| * | Merge branch 'tokenRegistry' into erc20WrapperFabio Berger2017-05-302-1/+1
| |\ \
| * | | Add tests for getBalanceAsyncFabio Berger2017-05-301-0/+55
| * | | Implement ERC20Wrapper and it's first method getBalanceAsyncFabio Berger2017-05-303-0/+37
* | | | Refactor getOrderHash to accept order as an objectLeonid Logvinov2017-05-305-78/+61
* | | | Remove spaces in typesLeonid Logvinov2017-05-301-4/+0
* | | | Remove fixtureLeonid Logvinov2017-05-301-35/+0
* | | | Add first passing testLeonid Logvinov2017-05-301-4/+5
* | | | Add isBigNumber argument assertionLeonid Logvinov2017-05-301-0/+1
* | | | replace test fixture with the one from testrpcLeonid Logvinov2017-05-302-35/+35
* | | | Fix importLeonid Logvinov2017-05-301-1/+1
* | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-05-3010-13/+191
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove mention of internal cleanup from public commentFabio Berger2017-05-301-2/+1
| * | | Merge pull request #25 from 0xProject/dontReinstantiateContractInstancesLeonid2017-05-307-9/+74
| |\ \ \
| | * | | use .be.undefined instead of .be.an('undefined')Fabio Berger2017-05-301-4/+4
| | * | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that...Fabio Berger2017-05-303-15/+17
| | * | | Also test that web3Wrapper nested under tokenRegistryWrapper has updated prov...Fabio Berger2017-05-301-2/+4
| | * | | add assertions that contractInstances are not undefined before provider updateFabio Berger2017-05-301-0/+2
| | * | | Also instantiate tokenRegistry contract instanceFabio Berger2017-05-301-1/+2
| | * | | remove unused importFabio Berger2017-05-301-1/+0
| | * | | remove unused declarationsFabio Berger2017-05-301-3/+0
| | * | | remove unused importFabio Berger2017-05-301-1/+0
| | * | | remove unused importFabio Berger2017-05-301-1/+0
| | * | | improve commentFabio Berger2017-05-301-1/+1
| | * | | Make tokenRegistry contract instantiation lazy and clear it on provider updateFabio Berger2017-05-303-5/+17
| | * | | rename invalidateExchangeContract to invalidateContractInstanceFabio Berger2017-05-302-2/+2
| | * | | Merge branch 'master' into dontReinstantiateContractInstancesFabio Berger2017-05-307-4/+116
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #24 from 0xProject/tokenRegistryFabio Berger2017-05-306-0/+113
| |\ \ \ \
| | * \ \ \ Merge branch 'master' into tokenRegistryFabio Berger2017-05-303-9/+8
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #22 from 0xProject/regex-fixFabio Berger2017-05-301-4/+3
| |\ \ \ \ \
| | * | | | | Fix the empty code regexLeonid Logvinov2017-05-301-4/+3
| | | * | | | use to.have.lengthOfFabio Berger2017-05-301-2/+2
| | | * | | | Improve type definitionsFabio Berger2017-05-301-2/+6
| | | * | | | Add TokenMetadata typeFabio Berger2017-05-302-2/+5
| | | * | | | remove unused importFabio Berger2017-05-301-1/+1
| | | | |_|/ | | | |/| |
| | | * | | Merge branch 'removeSrcFilesNotUsedByTests' into tokenRegistryFabio Berger2017-05-302-1/+1
| | | |\ \ \ | | | | |_|/ | | | |/| |
| | | * | | Add tests for getTokensAsync including schema validationFabio Berger2017-05-303-0/+57
| | | * | | Add TokenRegistryWrapper and getTokensAsync methodFabio Berger2017-05-303-0/+49
| | | | | * Add tests for setProviderFabio Berger2017-05-302-3/+30
| | | | | * Add setProvider method to 0x.js that updates the web3 provider and invalidate...Fabio Berger2017-05-302-0/+11
| | | | | * Lazily instantiate exchangeContract and store as instance variable instead of...Fabio Berger2017-05-302-3/+17
| | |_|_|/ | |/| | |
| * | | | make web3Wrapper a private instance variableFabio Berger2017-05-302-5/+5
| |/ / /
* | | | Temporarily remove testLeonid Logvinov2017-05-301-2/+1
* | | | Add throwErrorLogsAsErrorsLeonid Logvinov2017-05-301-6/+10
* | | | Append _test to exchange_wrapperLeonid Logvinov2017-05-301-1/+11
* | | | Add order utilsLeonid Logvinov2017-05-301-0/+21
* | | | Fix order typeLeonid Logvinov2017-05-301-1/+0
* | | | Fix orderSchemaLeonid Logvinov2017-05-301-4/+4
* | | | Add fillAmount parameterLeonid Logvinov2017-05-301-2/+3
* | | | Add copy_fixtures commandLeonid Logvinov2017-05-301-2/+3
* | | | Make fillOrderAsync accept signedOrder instead of a shit-ton of paramsLeonid Logvinov2017-05-301-35/+21
* | | | Change BigNumber schema to Number schemaLeonid Logvinov2017-05-301-2/+2
* | | | Change BigNumber schema to Number schemaLeonid Logvinov2017-05-301-11/+10
* | | | Add id to signedOrderSchemaLeonid Logvinov2017-05-301-0/+1
* | | | Add first order fixtureLeonid Logvinov2017-05-301-0/+35
* | | | Add isBoolean assertionLeonid Logvinov2017-05-301-0/+3
* | | | Add signedOrderSchema and all subschemasLeonid Logvinov2017-05-302-1/+56
* | | | Add Order and SignedOrder typesLeonid Logvinov2017-05-301-0/+23
* | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-05-303-2/+3
|\| | |
| * | | Merge pull request #20 from 0xProject/removeSrcFilesNotUsedByTestsLeonid2017-05-301-1/+2
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'master' into removeSrcFilesNotUsedByTestsFabio Berger2017-05-302-1/+1
| | |\ \ | | |/ / | |/| / | | |/
| * | name exchangeWrapper test file properlyFabio Berger2017-05-301-0/+0
| * | Reverts: 7e96b45ea0c51ca5589640018172a91a35596148 which broke this regex for ...Fabio Berger2017-05-301-1/+1
| | * Instead of removing all files from ./lib/src for the UMD test, we leave the u...Fabio Berger2017-05-301-1/+2
| |/
* | Finish ecSignature renamingLeonid Logvinov2017-05-302-4/+4
* | Add assertions for parametersLeonid Logvinov2017-05-301-1/+15
* | Move field declaration to the begining of the classLeonid Logvinov2017-05-301-8/+8
* | Add initial implementation of fillOrderAsyncLeonid Logvinov2017-05-302-1/+96
* | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsyncLeonid Logvinov2017-05-302-6/+14
* | Add tests to linter targetsLeonid Logvinov2017-05-301-1/+1
* | Use npm run testrpc on circlecCILeonid Logvinov2017-05-301-1/+1
|/
* Merge pull request #19 from 0xProject/test-commands-refactorFabio Berger2017-05-302-11/+13
|\
| * Merge branch 'master' into test-commands-refactorLeonid2017-05-300-0/+0
| |\ | |/ |/|
* | Merge pull request #18 from 0xProject/fix-coverageLeonid2017-05-301-1/+1
|\ \
| * | Run cverage only for commonjs testLeonid Logvinov2017-05-291-1/+1
| | * Refactor test commandsLeonid Logvinov2017-05-302-10/+12
| |/ |/|
* | Lowercase schema namesFabio Berger2017-05-304-12/+12
* | Fix typosFabio Berger2017-05-291-2/+2
* | Merge pull request #17 from 0xProject/addSignOrderHashAndTestsFabio Berger2017-05-297-5/+159
|\ \ | |/ |/|
| * empty stubs array before next test runsFabio Berger2017-05-291-0/+1
| * improve commentFabio Berger2017-05-291-1/+1
| * Merge branch 'master' into addSignOrderHashAndTestsFabio Berger2017-05-295-26/+39
| |\ | |/ |/|
* | Merge pull request #16 from 0xProject/umd-testsFabio Berger2017-05-295-27/+40
|\ \
| * | Address feedbackLeonid Logvinov2017-05-293-5/+6
| * | Don't build before testLeonid Logvinov2017-05-291-1/+1
| * | Refactor test commandsLeonid Logvinov2017-05-292-13/+24
| * | Add umd test command and separate public and private npm scriptsLeonid Logvinov2017-05-291-7/+10
| * | Make eventually a PromisedAssertionLeonid Logvinov2017-05-292-3/+4
| * | Rename build:bundle to build:umdLeonid Logvinov2017-05-291-1/+1
| * | Use only 0x public interface in contract wrapper testsLeonid Logvinov2017-05-291-14/+11
| * | Use constants from test utilsLeonid Logvinov2017-05-291-1/+1
| | * fix declarationFabio Berger2017-05-291-1/+1
| | * Add mnemonic to nom testrpc commandFabio Berger2017-05-291-1/+1
| | * Use disable-next-line instead of disable and always put rule that is being di...Fabio Berger2017-05-292-6/+3
| | * Add declarations for find-versions and compare-versionsFabio Berger2017-05-291-2/+12
| | * Add static mnemonic when starting testrpc on circleCIFabio Berger2017-05-291-1/+1
| | * Implement tests for signOrderHashAsync that test the logic for Parity < v1.6....Fabio Berger2017-05-292-0/+74
| | * Port over signOrderHashAsyncFabio Berger2017-05-295-1/+73
| |/ |/|
* | don't use uppercase for constant variable unless it's global to the entire fileFabio Berger2017-05-291-3/+3
* | Standardize all commentsFabio Berger2017-05-291-4/+4
|/
* Merge pull request #15 from 0xProject/rm-tsLeonid2017-05-2914-6/+6
|\
| * Fix linter commandLeonid Logvinov2017-05-291-1/+1
| * Fix lint commandLeonid Logvinov2017-05-291-1/+1
| * Fix importsLeonid Logvinov2017-05-293-5/+5
| * Move files up and remove ts folderLeonid Logvinov2017-05-2911-0/+0
|/
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-05-2925-43/+3442
|\
| * Merge pull request #14 from 0xProject/implementFirstExchangeMethodFabio Berger2017-05-2725-40/+3439
| |\
| | * use commit hash instead of branchFabio Berger2017-05-271-2/+2
| | * clone specific branch where contract artifacts are fixed to the version of th...Fabio Berger2017-05-271-1/+1
| | * Refactor to ternaryFabio Berger2017-05-271-6/+1
| | * Make zero address regex stricterLeonid Logvinov2017-05-271-1/+1
| | * Merge branch 'implementFirstExchangeMethod' of github.com:0xProject/0x.js int...Fabio Berger2017-05-272-3/+3
| | |\
| | | * Remove unnecessary ./sLeonid Logvinov2017-05-271-2/+2
| | | * Simplify zero address regexLeonid Logvinov2017-05-271-1/+1
| | * | remove todoFabio Berger2017-05-271-1/+0
| | |/
| | * improve commentFabio Berger2017-05-271-1/+2
| | * rename BlockClean to BlockchainLifecycle and setupAsync to startAsync, restor...Fabio Berger2017-05-272-7/+7
| | * import reorderFabio Berger2017-05-261-1/+1
| | * remove outdated commentFabio Berger2017-05-261-2/+0
| | * remove stray console logFabio Berger2017-05-261-1/+0
| | * return undefined if not address foundFabio Berger2017-05-261-3/+3
| | * Add missing return typesFabio Berger2017-05-264-7/+7