aboutsummaryrefslogtreecommitdiffstats
path: root/src/contract_wrappers
Commit message (Expand)AuthorAgeFilesLines
* Additional EtherToken comment changesFabio Berger2017-06-271-10/+10
* Improve EtherToken commentsFabio Berger2017-06-271-10/+10
* refactor getBalanceInEthAsync to getBalanceInWeiAsync and change the test ass...Fabio Berger2017-06-271-2/+1
* Fix typoFabio Berger2017-06-271-1/+1
* Implement EtherTokenWrapper and tests, with deposit and withdraw methodsFabio Berger2017-06-261-0/+76
* Add missing return commentFabio Berger2017-06-261-0/+1
* Fix incorrect merge consequencesLeonid Logvinov2017-06-231-3/+3
* Merge branch 'master' into fill-order-amuontLeonid2017-06-234-44/+37
|\
| * Revert "Use different lodash import syntax which allows to include only used ...Leonid2017-06-224-43/+37
* | Return filledTakerTokenAmount from fillOrdersUpToAsyncLeonid Logvinov2017-06-221-3/+10
* | Return cancelledAmount from cancelOrderAsyncLeonid Logvinov2017-06-221-1/+6
* | Fix return commentLeonid Logvinov2017-06-221-1/+1
* | Return filledAmount from fillOrderAsyncLeonid Logvinov2017-06-211-1/+6
|/
* Fall back to import x = require() syntaxLeonid Logvinov2017-06-214-10/+10
* Use different lodash import syntax which allows to include only used functionsLeonid Logvinov2017-06-214-37/+43
* Add missing semi-colonFabio Berger2017-06-201-1/+1
* Improve commentFabio Berger2017-06-201-3/+3
* Merge branch 'master' of github.com:0xProject/0x.jsFabio Berger2017-06-191-1/+2
|\
| * Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgsLeonid Logvinov2017-06-191-2/+2
| * Add actual type for contract event argumentsLeonid Logvinov2017-06-151-1/+2
* | Add and improve commentsFabio Berger2017-06-163-12/+25
|/
* Remove types that are not used in public interface from export and rename Eve...Leonid Logvinov2017-06-141-7/+7
* Rename ZeroExEvent to EventEmitterLeonid Logvinov2017-06-131-12/+12
* Bind watch function on an eventLeonid Logvinov2017-06-131-1/+1
* Refactor subscription to return zeroExSignature objectLeonid Logvinov2017-06-131-16/+27
* Add getContractAddressAsync and testsLeonid Logvinov2017-06-131-0/+9
* Duplicate truffle contracts typesLeonid Logvinov2017-06-111-1/+1
* Merge branch 'master' into privateLeonid2017-06-111-14/+22
|\
| * Merge pull request #60 from 0xProject/error-decoratorFabio Berger2017-06-111-0/+8
| |\
| | * Merge branch 'master' into error-decoratorLeonid2017-06-103-12/+93
| | |\
| | * | Add initial error handling decorator implementationLeonid Logvinov2017-06-101-0/+8
| * | | Remove Hex suffix from public functions parameters namesLeonid Logvinov2017-06-101-14/+14
| | |/ | |/|
* | | Fix last testsLeonid Logvinov2017-06-113-20/+20
* | | Prefix private vars with _Leonid Logvinov2017-06-104-116/+117
|/ /
* | Align all param comments so that they are more readableFabio Berger2017-06-103-64/+76
* | Add param & return comments to all public methods and add comments to some pu...Fabio Berger2017-06-103-12/+81
|/
* Address feedbackLeonid Logvinov2017-06-101-1/+1
* Fix testLeonid Logvinov2017-06-101-8/+5
* Merge branch 'master' into json-schemaLeonid2017-06-101-5/+4
|\
| * Merge branch 'master' into async-bugLeonid2017-06-091-20/+83
| |\
| * | Use for ofLeonid Logvinov2017-06-091-2/+2
| * | Fix the bug of not awaiting an async functionLeonid Logvinov2017-06-091-4/+3
* | | Merge branch 'master' into json-schemaLeonid2017-06-091-4/+71
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-16/+12
| |\ \
| * | | Address feedbackLeonid Logvinov2017-06-091-5/+2
| * | | Add signedOrdersScxhemaLeonid Logvinov2017-06-091-0/+4
| * | | Address feedbackLeonid Logvinov2017-06-091-1/+1
| * | | Add assert.hashAtMostOneUniqueValueLeonid Logvinov2017-06-091-6/+6
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-24/+89
| |\ \ \ | | | |/ | | |/|
| * | | Add tests for fillOrdersUpToLeonid Logvinov2017-06-091-7/+7
| * | | Implement fillOrderUpToAsyncLeonid Logvinov2017-06-081-0/+66
* | | | Fix tests one moreLeonid Logvinov2017-06-091-1/+1
* | | | Fix testsLeonid Logvinov2017-06-091-1/+1
* | | | Merge branch 'master' into json-schemaLeonid2017-06-091-12/+7
|\ \ \ \ | | |_|/ | |/| |
| * | | Add orderCancelrequestsSchema and orderFillRequestsSchemaLeonid Logvinov2017-06-091-16/+12
| | |/ | |/|
* | | Make static function publicLeonid Logvinov2017-06-091-1/+0
* | | Convert to JSON schema compatible object by defaultLeonid Logvinov2017-06-091-19/+7
|/ /
* | fix indentationFabio Berger2017-06-091-13/+13
* | add comment explaining the use of anyFabio Berger2017-06-091-0/+1
* | Improve commentFabio Berger2017-06-091-1/+1
* | Add orderFillOrKillRequestsSchema and validate using it instead of looping ov...Fabio Berger2017-06-091-4/+5
* | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-092-26/+92
|\|
| * Merge pull request #48 from 0xProject/interfaceTweaksLeonid2017-06-081-1/+1
| |\
| | * Merge branch 'master' into interfaceTweaksLeonid2017-06-081-0/+6
| | |\
| | * | Make web3Wrapper protected instead of publicFabio Berger2017-06-081-1/+1
| * | | Merge pull request #47 from 0xProject/is-valid-signature-contractLeonid2017-06-081-2/+2
| |\ \ \
| | * \ \ Merge branch 'master' into is-valid-signature-contractLeonid2017-06-081-0/+6
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Refactor isValidSignatureLeonid Logvinov2017-06-081-2/+2
| | | |/ | | |/|
| * | | Merge branch 'master' into batchFillAsyncLeonid2017-06-081-0/+6
| |\ \ \ | | | |/ | | |/|
| * | | Address feedbackLeonid Logvinov2017-06-081-9/+12
| * | | Use isSenderAddressAsyncLeonid Logvinov2017-06-081-2/+2
| * | | Address old feedbackLeonid Logvinov2017-06-081-2/+3
| * | | Fix spacingLeonid Logvinov2017-06-081-2/+2
| * | | Merge branch 'master' into batchFillAsyncLeonid Logvinov2017-06-081-25/+106
| |\ \ \ | | | |/ | | |/|
| * | | Don't use batchFillOrderAsync for fillOrderAsyncLeonid Logvinov2017-06-081-3/+37
| * | | Add no-op testLeonid Logvinov2017-06-081-1/+3
| * | | Remove old commentLeonid Logvinov2017-06-081-1/+0
| * | | Refactor to use OrderFillRequestLeonid Logvinov2017-06-071-22/+26
| * | | Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-071-27/+3
| |\ \ \
| * \ \ \ Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-071-17/+19
| |\ \ \ \
| * | | | | Add assertion for empty batchLeonid Logvinov2017-06-071-0/+1
| * | | | | Fix linter errorsLeonid Logvinov2017-06-071-1/+2
| * | | | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-071-1/+1
| * | | | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-071-0/+45
| * | | | | Remove assertions from utils methodsLeonid Logvinov2017-06-071-4/+1
| * | | | | Add initial implementation of batchCancelAsyncLeonid Logvinov2017-06-071-21/+43
* | | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-0/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-081-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-2/+56
|\| | | |
| * | | | Address feedbackLeonid Logvinov2017-06-081-6/+9
| * | | | Address feedbackLeonid Logvinov2017-06-081-5/+6
| * | | | Don't use batch function for normal oneLeonid Logvinov2017-06-081-3/+27
| * | | | Merge branch 'master' into batchCancelAsyncLeonid2017-06-081-7/+57
| |\ \ \ \
| * | | | | Address feedbackLeonid Logvinov2017-06-071-8/+11
| | |_|_|/ | |/| | |
| * | | | Use batchCancel for normal cancelLeonid Logvinov2017-06-071-28/+5
| | |_|/ | |/| |
| * | | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-071-17/+19
| * | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-071-1/+1
| * | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-071-0/+45
* | | | Implement batchFillOrKill and testsFabio Berger2017-06-081-7/+70
| |/ / |/| |
* | | Remove catch of invalid jump throws since there are many reasons the contract...Fabio Berger2017-06-071-24/+14
* | | add `hex` to function and variable name for clarityFabio Berger2017-06-071-4/+4
* | | remove unused argFabio Berger2017-06-071-2/+1
* | | merge masterFabio Berger2017-06-071-31/+79
|\| |
| * | Remove assertions from utils methodsLeonid Logvinov2017-06-071-4/+1
| |/
| * Use union type Order|SignedOrderLeonid Logvinov2017-06-071-2/+2
| * Address feedbackLeonid Logvinov2017-06-071-16/+15
| * Add test when the order was already cancelled or filledLeonid Logvinov2017-06-061-31/+35
| * Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-061-1/+7
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| * Add initial implementation with success testLeonid Logvinov2017-06-061-1/+52
* | Implement fillOrKill & testsFabio Berger2017-06-071-17/+88
|/
* Address feedbackLeonid Logvinov2017-06-062-3/+3
* Add isAnyAddressAvailableAsyncLeonid Logvinov2017-06-062-0/+3
* Rename isSenderAddressHexAsync to isSenderAddressAsyncLeonid Logvinov2017-06-062-4/+4
* Rename senderAccount to senderAddressLeonid Logvinov2017-06-062-13/+13
* Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsyncLeonid Logvinov2017-06-062-4/+4
* Rename senderAccount to takerAddressLeonid Logvinov2017-06-061-5/+5
* Add variableName to isSenderAddcountHexAsyncLeonid Logvinov2017-06-062-4/+4
* Make methods accept senderAccountLeonid Logvinov2017-06-052-27/+19
* Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-031-1/+46
|\
| * Run stopWatching in parallelFabio Berger2017-06-031-3/+4
| * Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-031-31/+98
| |\
| * \ Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-021-4/+14
| |\ \
| * | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ...Fabio Berger2017-06-021-1/+45
| * | | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-021-0/+3
| |\ \ \
* | \ \ \ Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-032-2/+41
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-031-31/+98
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-3/+16
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| * | | | Always wrap BigNumbers returned by web3 with our own version and add commentFabio Berger2017-06-022-5/+11
| * | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-3/+4
| |\ \ \ \
| * | | | | fix tslint errorFabio Berger2017-06-021-1/+2
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-3/+15
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-021-7/+106
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-011-1/+16
| |\ \ \ \ \ \ \
| * | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCa...Fabio Berger2017-06-011-0/+33
* | | | | | | | | Fix bugFabio Berger2017-06-031-1/+1
* | | | | | | | | Fix commentFabio Berger2017-06-031-1/+1
* | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 21:59:11 +0800