aboutsummaryrefslogtreecommitdiffstats
path: root/src/contract_wrappers
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-031-8/+201
|\
| * Address feedbackLeonid Logvinov2017-06-031-12/+12
| * Allign argumentsLeonid Logvinov2017-06-031-3/+3
| * Rewrite commentLeonid Logvinov2017-06-031-5/+11
| * Move FillOrderValidatinErrs to ExchangeContractErrsLeonid Logvinov2017-06-031-13/+12
| * Assign wouldRoundingErrorOccur to a variableLeonid Logvinov2017-06-021-2/+4
| * Rename EXPIRED to FILL_ORDER_EXPIREDLeonid Logvinov2017-06-021-1/+1
| * Assign timestamp to a variableLeonid Logvinov2017-06-021-1/+2
| * Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKERLeonid Logvinov2017-06-021-1/+1
| * Don't pass zrxTokenAsignLeonid Logvinov2017-06-021-6/+7
| * Rename validation functionsLeonid Logvinov2017-06-021-8/+8
| * Add getZRXTokenAddressAsyncLeonid Logvinov2017-06-021-1/+4
| * rename fillTakerAmountInBaseUnits to fillTakerAmountFabio Berger2017-06-021-15/+15
| * Improve fillOrderAsync commentFabio Berger2017-06-021-3/+6
| * Improve error names and remove duplicate importFabio Berger2017-06-021-5/+5
| * Add tests and checks for fees balances and allowancesLeonid Logvinov2017-06-021-9/+45
| * Add check for ROUNDING_ERROR and test for itLeonid Logvinov2017-06-021-0/+16
| * Validate maker balance and allowance & testsLeonid Logvinov2017-06-021-4/+14
| * Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-021-0/+3
| * Create a FillsScenario utils module and use it in the fillOrder testsFabio Berger2017-06-021-4/+6
| * Make validateFillOrder asyncronousLeonid Logvinov2017-06-021-2/+2
| * Add not enough taker balance testsLeonid Logvinov2017-06-021-2/+14
| * 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-011-0/+3
| |\
| | * Add expired checkLeonid Logvinov2017-06-011-0/+3
| * | Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountIn...Fabio Berger2017-06-011-6/+11
| |/
| * Revert "Add EXPIRED test"Leonid Logvinov2017-06-011-3/+0
| * Add ExchangeContractErrs string enumFabio Berger2017-06-011-8/+9
| * Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsyncFabio Berger2017-06-011-0/+15
| |\
| | * Add EXPIRED testLeonid Logvinov2017-06-011-0/+3
| | * Add NOT_A_TAKER checkLeonid Logvinov2017-06-011-0/+3
| | * Add FILL_AMOUNT_IS_ZERO checkLeonid Logvinov2017-06-011-0/+9
| * | Rename ExchangeContractErrs to ExchangeContractErrCodesFabio Berger2017-06-011-9/+9
| |/
| * Make taker required on Order object and expect NULL_ADDRESS from 0x.jsFabio Berger2017-06-011-3/+1
| * rename signed_order_schema to order_schemasFabio Berger2017-06-011-1/+1
| * Add convertToJSONSchemaCompatibleObject methodFabio Berger2017-06-011-1/+4
| * Temporarily fix gas extimationLeonid Logvinov2017-06-011-0/+13
| * Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-06-011-8/+6
| |\
| * | Don't return contract responseLeonid Logvinov2017-05-311-2/+1
| * | Merge branch 'erc20transfer' into fillOrderAsyncLeonid Logvinov2017-05-311-0/+110
| |\ \
| * | | Add isBigNumber argument assertionLeonid Logvinov2017-05-301-0/+1
| * | | Merge branch 'master' into fillOrderAsyncLeonid Logvinov2017-05-302-1/+57
| |\ \ \
| * | | | Add throwErrorLogsAsErrorsLeonid Logvinov2017-05-301-6/+10
| * | | | Add fillAmount parameterLeonid Logvinov2017-05-301-2/+3
| * | | | Make fillOrderAsync accept signedOrder instead of a shit-ton of paramsLeonid Logvinov2017-05-301-35/+21
| * | | | 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-301-1/+63
| * | | | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsyncLeonid Logvinov2017-05-301-6/+7
* | | | | Add balance check to `transferAsync` and related testFabio Berger2017-06-021-0/+6
* | | | | Improve commentFabio Berger2017-06-021-0/+2
* | | | | Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapperFabio Berger2017-06-021-15/+66
| |_|_|/ |/| | |
* | | | Merge branch 'master' into erc20transferLeonid2017-05-311-8/+6
|\ \ \ \ | |_|_|/ |/| | |
| * | | remove InternalError type since this error could surface through the public i...Fabio Berger2017-05-311-2/+2
| * | | Remove superfluous undefined checkFabio Berger2017-05-311-4/+2
| * | | Add full stop to commentsFabio Berger2017-05-311-2/+2
* | | | Add transfer function and tests for itLeonid Logvinov2017-05-311-1/+16
|/ / /
* | | Implement setProxyAllowanceAsyncFabio Berger2017-05-301-4/+32
* | | Implement zeroEx.token.getProxyAllowanceAsyncFabio Berger2017-05-301-1/+26
* | | rename ERC20Contract to TokenContractFabio Berger2017-05-301-4/+4
* | | rename erc20Wrapper to tokenWrapper to be more generic in case we end up supp...Fabio Berger2017-05-301-3/+17
* | | Merge branch 'master' into erc20WrapperFabio Berger2017-05-302-7/+29
|\ \ \ | | |/ | |/|
| * | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that...Fabio Berger2017-05-302-13/+15
| * | remove unused importFabio Berger2017-05-301-1/+0
| * | Make tokenRegistry contract instantiation lazy and clear it on provider updateFabio Berger2017-05-301-4/+14
| * | rename invalidateExchangeContract to invalidateContractInstanceFabio Berger2017-05-301-1/+1
| * | Merge branch 'master' into dontReinstantiateContractInstancesFabio Berger2017-05-301-0/+33
| |\ \
| | * | Add TokenMetadata typeFabio Berger2017-05-301-2/+2
| | * | remove unused importFabio Berger2017-05-301-1/+1
| * | | Lazily instantiate exchangeContract and store as instance variable instead of...Fabio Berger2017-05-301-3/+14
| | |/ | |/|
* | | Implement ERC20Wrapper and it's first method getBalanceAsyncFabio Berger2017-05-301-0/+28
| |/ |/|
* | Add TokenRegistryWrapper and getTokensAsync methodFabio Berger2017-05-301-0/+33
|/
* Lowercase schema namesFabio Berger2017-05-301-2/+2
* Fix importsLeonid Logvinov2017-05-291-1/+1
* Move files up and remove ts folderLeonid Logvinov2017-05-292-0/+85