aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-032-59/+66
|\
| * Add ZRX_TOKEN_NOT_IN_REGISTRYLeonid Logvinov2017-06-031-5/+6
| |
| * Address feedbackLeonid Logvinov2017-06-032-20/+20
| |
| * Allign argumentsLeonid Logvinov2017-06-031-3/+3
| |
| * Rewrite commentLeonid Logvinov2017-06-031-5/+11
| |
| * Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-032-22/+15
| |
| * Assign wouldRoundingErrorOccur to a variableLeonid Logvinov2017-06-021-2/+4
| |
| * Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-022-2/+2
| |
| * Assign timestamp to a variableLeonid Logvinov2017-06-021-1/+2
| |
| * Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKERLeonid Logvinov2017-06-022-2/+2
| |
| * Don't pass zrxTokenAsignLeonid Logvinov2017-06-021-6/+7
| |
| * Rename validation functionsLeonid Logvinov2017-06-021-8/+8
| |
| * Add getZRXTokenAddressAsyncLeonid Logvinov2017-06-021-1/+4
| |
* | Fix commentFabio Berger2017-06-031-1/+1
|/
* rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-022-16/+16
|
* 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
|/
* Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-021-4/+0
|\
| * Fix tslint issuesFabio Berger2017-06-021-2/+2
| |
* | Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-022-9/+52
| |
* | Add ProtocolTokenArtifactsLeonid Logvinov2017-06-021-0/+321
| |
* | Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-022-0/+21
| |
* | Validate maker balance and allowance & testsLeonid Logvinov2017-06-021-4/+14
| |
* | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵Fabio Berger2017-06-022-4/+5
| | | | | | | | undefined if non available
* | Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-021-0/+3
| |
* | Introduce coinBase accountLeonid Logvinov2017-06-022-0/+9
| | | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test
* | Create a FillsScenario utils module and use it in the fillOrder testsFabio Berger2017-06-023-5/+11
| |
* | Make validateFillOrder asyncronousLeonid Logvinov2017-06-021-2/+2
| |
* | Add not enough taker balance testsLeonid Logvinov2017-06-023-4/+20
| |
* | Fix importFabio Berger2017-06-011-1/+1
| |
* | Stop passing exchangeAddress into getOrderHash and instead get it from the ↵Fabio Berger2017-06-011-28/+41
| | | | | | | | artifacts
* | 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-012-0/+4
|\ \
| * | Add expired checkLeonid Logvinov2017-06-011-0/+3
| | |
| * | Add EXPIRED error typeLeonid Logvinov2017-06-011-0/+1
| | |
* | | Add comment for fillOrderAsync method, rename fillAmount to ↵Fabio Berger2017-06-011-6/+11
|/ / | | | | | | fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer
* | Revert "Add EXPIRED test"Leonid Logvinov2017-06-012-4/+0
| | | | | | | | This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c.
* | Get getSenderAddressOrThrowAsync everywhere where we throw if the ↵Fabio Berger2017-06-012-15/+12
| | | | | | | | senderAddress doesn't exist
* | 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-012-1/+23
|\ \ | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts
| * | Add EXPIRED testLeonid Logvinov2017-06-012-1/+5
| | |
| * | Add NOT_A_TAKER checkLeonid Logvinov2017-06-012-0/+4
| | |
| * | Add FILL_AMOUNT_IS_ZERO checkLeonid Logvinov2017-06-012-0/+14
| | |
* | | 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
| |
* | 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-011-4/+0
|\ \
| * | Fix types hell with, chai and chai-as-promisedLeonid Logvinov2017-06-011-4/+0
| | |
* | | 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-011-0/+4
| |
* | Add dirty-chaiLeonid Logvinov2017-06-011-0/+1
| |
* | Type estimateGasLeonid Logvinov2017-06-011-4/+6
| |
* | Remove TxDataLeonid Logvinov2017-06-011-5/+1
| |
* | Temporarily fix gas extimationLeonid Logvinov2017-06-011-0/+13
| |
* | Add setDefaultAccountLeonid Logvinov2017-06-012-0/+10
| |
* | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-012-15/+14
|\|
| * Merge branch 'master' into erc20transferLeonid2017-05-312-15/+14
| |\
| | * Add TxOpts typeFabio Berger2017-05-311-1/+6
| | |
| | * remove InternalError type since this error could surface through the public ↵Fabio Berger2017-05-312-7/+3
| | | | | | | | | | | | interface
| | * Remove superfluous undefined checkFabio Berger2017-05-311-4/+2
| | |
| | * Add full stop to commentsFabio Berger2017-05-311-2/+2
| | |
* | | Fix linter errorsLeonid Logvinov2017-05-313-4/+4
| | |
* | | Don't return contract responseLeonid Logvinov2017-05-311-2/+1
| | |
* | | Set bignumber configLeonid Logvinov2017-05-312-0/+11
| | |
* | | Merge branch 'erc20transfer' into fillOrderAsyncLeonid Logvinov2017-05-314-0/+131
|\| |
| * | Add transfer function and tests for itLeonid Logvinov2017-05-312-1/+17
| |/
| * Implement setProxyAllowanceAsyncFabio Berger2017-05-303-4/+34
| |
| * Implement zeroEx.token.getProxyAllowanceAsyncFabio Berger2017-05-302-1/+34
| |
| * use token instead of erc20Fabio Berger2017-05-301-3/+3
| |
| * rename ERC20Contract to TokenContractFabio Berger2017-05-302-5/+5
| |
| * rename erc20Wrapper to tokenWrapper to be more generic in case we end up ↵Fabio Berger2017-05-302-7/+30
| | | | | | | | supporting another spec
| * Merge branch 'master' into erc20WrapperFabio Berger2017-05-304-13/+44
| |\ | | | | | | | | | | | | # Conflicts: # src/0x.js.ts
| * \ Merge branch 'tokenRegistry' into erc20WrapperFabio Berger2017-05-301-1/+1
| |\ \
| * | | Implement ERC20Wrapper and it's first method getBalanceAsyncFabio Berger2017-05-303-0/+37
| | | |
* | | | Refactor getOrderHash to accept order as an objectLeonid Logvinov2017-05-301-29/+16
| | | |
* | | | Remove spaces in typesLeonid Logvinov2017-05-301-4/+0
| | | |
* | | | Add isBigNumber argument assertionLeonid Logvinov2017-05-301-0/+1
| | | |
* | | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-05-307-6/+109
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove mention of internal cleanup from public commentFabio Berger2017-05-301-2/+1
| | | |
| * | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter ↵Fabio Berger2017-05-302-13/+15
| | | | | | | | | | | | | | | | that instantiates contract instance if not already instantiated
| * | | remove unused declarationsFabio Berger2017-05-301-3/+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-302-4/+15
| | | |
| * | | rename invalidateExchangeContract to invalidateContractInstanceFabio Berger2017-05-302-2/+2
| | | |
| * | | Merge branch 'master' into dontReinstantiateContractInstancesFabio Berger2017-05-306-4/+73
| |\ \ \
| | * \ \ Merge branch 'master' into tokenRegistryFabio Berger2017-05-302-5/+4
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts
| | | * \ \ Merge pull request #22 from 0xProject/regex-fixFabio Berger2017-05-301-4/+3
| | | |\ \ \ | | | | | | | | | | | | | | Fix the empty code regex
| | | | * | | Fix the empty code regexLeonid Logvinov2017-05-301-4/+3
| | | | | | |
| | * | | | | 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-301-1/+1
| | |\ \ \ \ | | | | |/ / | | | |/| / | | | |_|/ | | |/| |
| | * | | Add tests for getTokensAsync including schema validationFabio Berger2017-05-302-0/+14
| | | | |
| | * | | Add TokenRegistryWrapper and getTokensAsync methodFabio Berger2017-05-303-0/+49
| | | | |
| * | | | Add setProvider method to 0x.js that updates the web3 provider and ↵Fabio Berger2017-05-302-0/+11
| | | | | | | | | | | | | | | | | | | | invalidates any contractInstances instantiated with the old provider
| * | | | Lazily instantiate exchangeContract and store as instance variable instead ↵Fabio Berger2017-05-302-3/+17
| | |_|/ | |/| | | | | | | | | | of re-instantiating on every call
| * | | make web3Wrapper a private instance variableFabio Berger2017-05-301-1/+1
| | |/ | |/|
* | | Add throwErrorLogsAsErrorsLeonid Logvinov2017-05-301-6/+10
| | |
* | | Fix order typeLeonid Logvinov2017-05-301-1/+0
| | |
* | | Fix orderSchemaLeonid Logvinov2017-05-301-4/+4
| | |
* | | Add fillAmount parameterLeonid 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 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-301-1/+1
|\| |
| * | Reverts: 7e96b45ea0c51ca5589640018172a91a35596148 which broke this regex for ↵Fabio Berger2017-05-301-1/+1
| |/ | | | | | | the `0x0` edge-case
* | Finish ecSignature renamingLeonid Logvinov2017-05-301-3/+3
| |
* | 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
|/
* Lowercase schema namesFabio Berger2017-05-304-12/+12
|
* improve commentFabio Berger2017-05-291-1/+1
|
* Merge branch 'master' into addSignOrderHashAndTestsFabio Berger2017-05-291-0/+1
|\ | | | | | | | | | | | | # Conflicts: # package.json # src/globals.d.ts # test/0x.js_test.ts
| * Merge pull request #16 from 0xProject/umd-testsFabio Berger2017-05-291-1/+2
| |\ | | | | | | Umd tests
| | * Address feedbackLeonid Logvinov2017-05-291-1/+1
| | |
| | * Make eventually a PromisedAssertionLeonid Logvinov2017-05-291-1/+2
| | |
* | | fix declarationFabio Berger2017-05-291-1/+1
| | |
* | | Use disable-next-line instead of disable and always put rule that is being ↵Fabio Berger2017-05-291-2/+1
| | | | | | | | | | | | disabled
* | | Add declarations for find-versions and compare-versionsFabio Berger2017-05-291-2/+12
| | |
* | | Port over signOrderHashAsyncFabio Berger2017-05-294-1/+71
|/ /
* / Standardize all commentsFabio Berger2017-05-291-4/+4
|/
* Fix importsLeonid Logvinov2017-05-291-1/+1
|
* Move files up and remove ts folderLeonid Logvinov2017-05-2911-0/+0
|
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-05-2915-25/+3199
|\ | | | | | | | | | | # Conflicts: # src/ts/0x.js.ts # src/ts/utils/utils.ts
| * 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 ↵Fabio Berger2017-05-271-1/+1
| |\ | | | | | | | | | into implementFirstExchangeMethod
| | * Simplify zero address regexLeonid Logvinov2017-05-271-1/+1
| | |
| * | remove todoFabio Berger2017-05-271-1/+0
| |/
| * remove outdated commentFabio Berger2017-05-261-2/+0
| |
| * return undefined if not address foundFabio Berger2017-05-261-3/+3
| |
| * Add missing return typesFabio Berger2017-05-262-3/+3
| |
| * move console log into UNHANDLED_ERROR clauseFabio Berger2017-05-261-1/+1
| |
| * rename networkId to networkIdIfExistsFabio Berger2017-05-261-2/+4
| |
| * remove commentFabio Berger2017-05-261-1/+0
| |
| * import re-orderFabio Berger2017-05-261-2/+2
| |
| * Setup blockchain snapshotting before/after every test, implemented unit ↵Fabio Berger2017-05-261-0/+5
| | | | | | | | tests for exchangeWrapper.isValidSignature
| * Add missing semi-colonFabio Berger2017-05-261-1/+1
| |
| * cleanup isValidSignature methodFabio Berger2017-05-261-5/+6
| |
| * Add missing requireFabio Berger2017-05-261-0/+1
| |
| * Spacing and import re-orderFabio Berger2017-05-261-3/+4
| |
| * Remove unused bignum importLeonid Logvinov2017-05-261-1/+0
| |
| * Merge branch 'master' into implementFirstExchangeMethodFabio Berger2017-05-264-1/+71
| |\ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # package.json # src/ts/0x.js.ts # src/ts/globals.d.ts # src/ts/types.ts
| * | Fix web3 imports againFabio Berger2017-05-263-3/+3
| | |
| * | Fix web3 importsFabio Berger2017-05-263-3/+3
| | |
| * | Change the order of params in isValidSignatureAsync to be consistentLeonid Logvinov2017-05-261-4/+4
| | |
| * | Fix exchange typeLeonid Logvinov2017-05-261-1/+1
| | |
| * | Remove unused importsLeonid Logvinov2017-05-261-3/+0
| | |
| * | Add initial exchange contract function, set up web3Wrapper, added types and ↵Fabio Berger2017-05-268-18/+249
| | | | | | | | | | | | utils
| * | Add npm command to update contact artifactsFabio Berger2017-05-266-0/+2958
| | |
* | | Move bigNumberToBN to utils moduleFabio Berger2017-05-292-17/+20
| |/ |/|
* | Address feedbackLeonid Logvinov2017-05-263-6/+4
| |
* | Address feedbackLeonid Logvinov2017-05-262-22/+36
| |
* | Port getOrderHashLeonid Logvinov2017-05-254-0/+69
|/
* Get rid of ETHLeonid Logvinov2017-05-251-4/+4
|
* Fix commentLeonid Logvinov2017-05-251-1/+1
|
* Fix testsLeonid Logvinov2017-05-251-1/+1
|
* Fix bracesLeonid Logvinov2017-05-251-0/+1
|
* Merge branch 'master' into isValidOrderHashLeonid2017-05-252-2/+38
|\
| * Add toUnitAmount and toBaseUnitAmount static helpers and testsFabio Berger2017-05-252-0/+39
| |
* | Address feedbackLeonid Logvinov2017-05-252-7/+8
| |
* | Remove type aliasesLeonid Logvinov2017-05-253-8/+7
| |
* | Merge branch 'master' into isValidOrderHashLeonid2017-05-255-4/+50
|\|
| * Merge branch 'master' into addSchemasFabio Berger2017-05-251-0/+15
| |\ | | | | | | | | | | | | # Conflicts: # package.json
| * | rename v to validator for clarityFabio Berger2017-05-251-6/+6
| | |
| * | Pretty print passed in order and schema validation errors in thrown assertionFabio Berger2017-05-251-2/+4
| | |
| * | Improve ECSignature schema to check signature parameters and that v is 27 or 28Fabio Berger2017-05-252-4/+15
| | |
| * | Add schema validation and assertion, create ECSignature schemaFabio Berger2017-05-255-4/+37
| | |
* | | Remove HexString typeLeonid Logvinov2017-05-252-7/+6
| | |
* | | Port isValidOrderHash and testsLeonid Logvinov2017-05-253-3/+16
| |/ |/|
* | More descriptive commentLeonid Logvinov2017-05-251-1/+5
| |
* | Add generateSalt and tests for itLeonid Logvinov2017-05-251-0/+11
|/
* Add assertions library and add them for all function argsFabio Berger2017-05-252-0/+37
|
* Address feedbackLeonid Logvinov2017-05-252-4/+5
|
* Type the ethereumjs-utilLeonid Logvinov2017-05-252-4/+12
|
* Add isSignatureValid method and tests for itLeonid Logvinov2017-05-252-3/+30
|
* Add command to generate docs from ts codeLeonid Logvinov2017-05-241-0/+1
|
* Add tslint command to npm scripts and fix linting errorsLeonid Logvinov2017-05-241-1/+1
|
* Create ts folderFabio Berger2017-05-241-0/+0
|
* Add empty zeroEx classLeonid Logvinov2017-05-241-0/+5