aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into json-schemaLeonid2017-06-094-5/+87
|\
| * Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-093-16/+36
| |\
| * | Address feedbackLeonid Logvinov2017-06-092-6/+3
| * | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-091-4/+0
| |\ \
| * | | Add signedOrdersScxhemaLeonid Logvinov2017-06-092-0/+9
| * | | Address feedbackLeonid Logvinov2017-06-092-2/+2
| * | | Add assert.hashAtMostOneUniqueValueLeonid Logvinov2017-06-093-7/+10
| * | | Merge branch 'master' into fillOrderUpToAsyncLeonid2017-06-096-38/+128
| |\ \ \
| * | | | Add tests for fillOrdersUpToLeonid Logvinov2017-06-091-7/+7
| * | | | Implement fillOrderUpToAsyncLeonid Logvinov2017-06-082-0/+73
* | | | | Fix tests one moreLeonid Logvinov2017-06-091-1/+1
* | | | | Fix testsLeonid Logvinov2017-06-091-1/+1
* | | | | Merge branch 'master' into json-schemaLeonid2017-06-093-12/+31
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Fix the other schema bugLeonid Logvinov2017-06-091-2/+2
| * | | | Merge branch 'master' into schemasLeonid2017-06-091-4/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Fix schema errorLeonid Logvinov2017-06-091-2/+2
| * | | | Add orderCancelrequestsSchema and orderFillRequestsSchemaLeonid Logvinov2017-06-093-16/+36
| | |_|/ | |/| |
* | | | Make static function publicLeonid Logvinov2017-06-092-2/+1
* | | | Convert to JSON schema compatible object by defaultLeonid Logvinov2017-06-092-22/+11
| |/ / |/| |
* | | Remove isSenderAddressAvailableAsyncLeonid Logvinov2017-06-091-4/+0
|/ /
* | 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-095-18/+33
* | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-094-34/+111
|\|
| * Merge pull request #48 from 0xProject/interfaceTweaksLeonid2017-06-082-9/+9
| |\
| | * Merge branch 'master' into interfaceTweaksLeonid2017-06-081-0/+6
| | |\
| | * | Make web3Wrapper protected instead of publicFabio Berger2017-06-081-1/+1
| | * | Fix commentsFabio Berger2017-06-081-2/+2
| | * | rename decimals to numDecimals for clarityFabio Berger2017-06-081-6/+6
| * | | 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
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Remove unused importLeonid Logvinov2017-06-081-1/+0
| | * | | Move isValidSignature back from utilsLeonid Logvinov2017-06-082-16/+13
| | * | | Refactor isValidSignatureLeonid Logvinov2017-06-083-15/+19
| | | |/ | | |/|
| * | | Merge branch 'master' into batchFillAsyncLeonid2017-06-081-0/+6
| |\ \ \ | | | |/ | | |/|
| * | | Address feedbackLeonid Logvinov2017-06-081-9/+12
| * | | Fix names in typesLeonid Logvinov2017-06-081-2/+2
| * | | Use isSenderAddressAsyncLeonid Logvinov2017-06-081-2/+2
| * | | Address old feedbackLeonid Logvinov2017-06-082-8/+3
| * | | Fix spacingLeonid Logvinov2017-06-081-2/+2
| * | | Merge branch 'master' into batchFillAsyncLeonid Logvinov2017-06-083-30/+119
| |\ \ \ | | | |/ | | |/|
| * | | 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-072-27/+8
| |\ \ \
| * \ \ \ Merge branch 'batchCancelAsync' into batchFillAsyncLeonid Logvinov2017-06-072-17/+24
| |\ \ \ \
| * | | | | Add assertion for empty batchLeonid Logvinov2017-06-071-0/+1
| * | | | | Fix linter errorsLeonid Logvinov2017-06-071-1/+2
| * | | | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-072-3/+3
| * | | | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-072-0/+51
| * | | | | Remove assertions from utils methodsLeonid Logvinov2017-06-073-11/+5
| * | | | | Use ContractInstance from globalsLeonid Logvinov2017-06-072-4/+3
| * | | | | Update 0x.js.tsLeonid2017-06-071-2/+1
| * | | | | Add initial implementation of batchCancelAsyncLeonid Logvinov2017-06-073-21/+55
* | | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-081-0/+6
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Add getOrderHashHexUsingContractCallAsyncLeonid Logvinov2017-06-081-0/+6
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' into batchFillOrKillFabio Berger2017-06-082-2/+68
|\| | | |
| * | | | 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-083-12/+69
| |\ \ \ \
| * | | | | Fix linter errorLeonid Logvinov2017-06-071-1/+1
| * | | | | Address feedbackLeonid Logvinov2017-06-072-8/+12
| | |_|_|/ | |/| | |
| * | | | Use batchCancel for normal cancelLeonid Logvinov2017-06-071-28/+5
| | |_|/ | |/| |
| * | | Refactor to use OrderCancellationRequestLeonid Logvinov2017-06-073-23/+24
| * | | Add tests for batchCancelAsyncLeonid Logvinov2017-06-072-3/+3
| * | | Add initial batchCancelAsync implementationLeonid Logvinov2017-06-073-0/+57
* | | | Implement batchFillOrKill and testsFabio Berger2017-06-082-7/+81
| |/ / |/| |
* | | make txOpts optionalFabio Berger2017-06-071-2/+2
* | | Remove catch of invalid jump throws since there are many reasons the contract...Fabio Berger2017-06-072-25/+14
* | | add `hex` to function and variable name for clarityFabio Berger2017-06-072-6/+6
* | | Spacing fixFabio Berger2017-06-071-2/+1
* | | remove unused argFabio Berger2017-06-071-2/+1
* | | remove spaceFabio Berger2017-06-071-1/+0
* | | merge masterFabio Berger2017-06-074-44/+108
|\| |
| * | Remove assertions from utils methodsLeonid Logvinov2017-06-073-11/+5
| * | Use ContractInstance from globalsLeonid Logvinov2017-06-072-4/+3
| * | Update 0x.js.tsLeonid2017-06-071-2/+1
| |/
| * Use union type Order|SignedOrderLeonid Logvinov2017-06-072-4/+4
| * Make txOpts optionalLeonid Logvinov2017-06-071-7/+7
| * Address feedbackLeonid Logvinov2017-06-074-45/+58
| * Add missing semicolonLeonid Logvinov2017-06-061-1/+1
| * Add test when the order was already cancelled or filledLeonid Logvinov2017-06-062-31/+39
| * Add checks and tests for expired order and zero fill amountLeonid Logvinov2017-06-062-1/+9
| * Merge branch 'master' into cancelAsyncLeonid Logvinov2017-06-061-2/+3
| |\
| * | Fix testsLeonid Logvinov2017-06-061-1/+1
| * | Add initial implementation with success testLeonid Logvinov2017-06-062-1/+58
* | | Implement fillOrKill & testsFabio Berger2017-06-076-45/+131
| |/ |/|
* | avoid newline issues by putting the assertion message on a single lineFabio Berger2017-06-061-2/+3
|/
* Merge pull request #39 from 0xProject/senderAccountLeonid2017-06-066-66/+38
|\
| * Address feedbackLeonid Logvinov2017-06-063-5/+5
| * Add isAnyAddressAvailableAsyncLeonid Logvinov2017-06-064-6/+7
| * Rename isSenderAddressHexAsync to isSenderAddressAsyncLeonid Logvinov2017-06-064-13/+13
| * Rename senderAddress to signerAddressLeonid Logvinov2017-06-061-4/+4
| * Use variable name in assertin messageLeonid Logvinov2017-06-061-3/+4
| * Rename accounts to addresesLeonid Logvinov2017-06-063-10/+10
| * Rename senderAccount to senderAddressLeonid Logvinov2017-06-064-23/+23
| * Rename assert.isSenderAccountHexAsync to assert.isSenderAddressHexAsyncLeonid Logvinov2017-06-064-6/+6
| * Rename senderAccount to takerAddressLeonid Logvinov2017-06-061-5/+5
| * Remove redundant reassignmentLeonid Logvinov2017-06-061-3/+2
| * Fix commentsLeonid Logvinov2017-06-061-1/+1
| * Fix testsLeonid Logvinov2017-06-061-1/+1
| * Add variableName to isSenderAddcountHexAsyncLeonid Logvinov2017-06-063-7/+8
| * Make methods accept senderAccountLeonid Logvinov2017-06-056-68/+38
* | Add tests to number regex and BigNumber serialization & fix bugsLeonid Logvinov2017-06-051-1/+1
|/
* Merge pull request #32 from 0xProject/addEventSubscriptionsFabio Berger2017-06-0310-568/+131
|\
| * Consolidate the ExchangeContract type and flesh out type definition for isVal...Fabio Berger2017-06-031-20/+19
| * Run stopWatching in parallelFabio Berger2017-06-031-3/+4
| * Be more specific with blockParam valid valuesFabio Berger2017-06-031-2/+4
| * Update artifactsFabio Berger2017-06-036-566/+35
| * Revert unintentional artifact changesFabio Berger2017-06-036-35/+566
| * Merge branch 'master' into addEventSubscriptionsFabio Berger2017-06-034-52/+126
| |\
| * \ Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-021-4/+14
| |\ \
| * | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ...Fabio Berger2017-06-024-3/+91
| * | | Merge branch 'fillOrderAsync' into addEventSubscriptionsFabio Berger2017-06-023-4/+10
| |\ \ \
| * | | | Update artifactsFabio Berger2017-06-026-561/+30
* | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-036-9/+70
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-034-56/+126
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-023-7/+23
| |\ \ \ \ \ | | |_|/ / / | |/| | | / | | | |_|/ | | |/| |
| * | | | improve commentFabio Berger2017-06-021-1/+4
| * | | | Add comment about the isString assertion lest the next developer tries to use...Fabio Berger2017-06-021-0/+2
| * | | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and...Fabio Berger2017-06-021-3/+9
| * | | | 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-023-4/+9
| |\ \ \ \
| * | | | | fix tslint errorFabio Berger2017-06-021-1/+2
| * | | | | Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-023-5/+21
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fillOrderAsync' into unavailableFilledCancelledFabio Berger2017-06-029-69/+329
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into unavailableFilledCancelledFabio Berger2017-06-012-1/+17
| |\ \ \ \ \ \ \
| * | | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCa...Fabio Berger2017-06-012-0/+42
| * | | | | | | | Move isValidOrderHash to utils and implement assert.isValidOrderHashFabio Berger2017-06-013-4/+12
* | | | | | | | | Fix bugFabio Berger2017-06-031-1/+1
* | | | | | | | | Fix commentFabio Berger2017-06-031-1/+1
* | | | | | | | | Add missing async suffixFabio Berger2017-06-032-2/+2
* | | | | | | | | Merge branch 'master' into remainingTokenMethodsFabio Berger2017-06-039-77/+451
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | 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
| * | | | | | | Add test for insufficient balance and make all async tests asyncLeonid Logvinov2017-06-021-0/+3
| * | | | | | | Introduce coinBase accountLeonid Logvinov2017-06-022-0/+9
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | 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 ar...Fabio Berger2017-06-011-28/+41
| * | | | 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 fillTakerAmountIn...Fabio Berger2017-06-011-6/+11
| |/ / / /
| * | | | Revert "Add EXPIRED test"Leonid Logvinov2017-06-012-4/+0
| * | | | 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-012-1/+23
| |\ \ \ \
| | * | | | 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
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | 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
| |\ \ \ \
| * | | | | 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
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | 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-025-18/+93
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Fix tslint issuesFabio Berger2017-06-021-2/+2
| |_|_|_|/ / |/| | | | |
* | | | | | 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 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
* | | | | 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 supp...Fabio Berger2017-05-302-7/+30
* | | | Merge branch 'master' into erc20WrapperFabio Berger2017-05-304-13/+44
|\ \ \ \ | | |_|/ | |/| |
| * | | Remove mention of internal cleanup from public commentFabio Berger2017-05-301-2/+1
| * | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter that...Fabio Berger2017-05-302-13/+15
| * | | 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
| |\ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 18:05:31 +0800