Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'development' into orderWatcher | Fabio Berger | 2017-11-12 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | * development: 0.22.6 Add new changes to CHANGELOG use util fn no race, reject from interval cb and clear allow timeout for await transaction mined # Conflicts: # src/types.ts | ||||
| * | allow timeout for await transaction mined | Luke Autry | 2017-11-10 | 1 | -0/+1 |
| | | |||||
* | | Declare OnOrderStateChangeCallback as either sync or async | Fabio Berger | 2017-11-11 | 1 | -3/+3 |
| | | |||||
* | | Improve comment | Fabio Berger | 2017-11-10 | 1 | -1/+2 |
| | | |||||
* | | Fix bug where we hard-coded using pendingBlock for fetching the orderState. ↵ | Fabio Berger | 2017-11-10 | 1 | -0/+1 |
| | | | | | | | | Moved numConfirmations to become a global orderStateWatcher config | ||||
* | | Fix comment | Fabio Berger | 2017-11-10 | 1 | -1/+1 |
| | | |||||
* | | Add nested config for orderWatcher | Fabio Berger | 2017-11-10 | 1 | -2/+9 |
| | | |||||
* | | Rename MempoolEventCallback to EventWatcherCallback | Fabio Berger | 2017-11-10 | 1 | -3/+3 |
| | | |||||
* | | Add SubscriptionAlreadyPresent error | Leonid Logvinov | 2017-11-10 | 1 | -0/+1 |
| | | |||||
* | | Add naive order state watcher implementation | Leonid Logvinov | 2017-10-31 | 1 | -9/+6 |
| | | | | | | | | | | Revalidate all orders upon event received and emit order states even if not changed | ||||
* | | Change fields in OrderState to represent taker side values | Leonid Logvinov | 2017-10-31 | 1 | -2/+2 |
| | | |||||
* | | Introduce OrderState interface | Leonid Logvinov | 2017-10-31 | 1 | -5/+9 |
| | | |||||
* | | Add empty implementation of order state watcher | Leonid Logvinov | 2017-10-31 | 1 | -1/+1 |
| | | |||||
* | | Move mempoolPollingIntervalMs to OrderWatcherConfig | Leonid Logvinov | 2017-10-31 | 1 | -1/+6 |
| | | |||||
* | | Add types for order state watcher | Leonid Logvinov | 2017-10-31 | 1 | -0/+21 |
| | | |||||
* | | Add initial mempool watching implememtation | Leonid Logvinov | 2017-10-31 | 1 | -11/+13 |
|/ | |||||
* | Upgrade bignumber to the version with native typings and remove typings | Leonid Logvinov | 2017-10-26 | 1 | -49/+50 |
| | |||||
* | Merge branch 'development' into setFillOrKillToUseRequestInterface | Leonid | 2017-10-16 | 1 | -8/+8 |
|\ | |||||
| * | Make logs fetching and sunscriptions more type-safe | Leonid Logvinov | 2017-10-13 | 1 | -8/+8 |
| | | |||||
* | | Use OrderFillRequest interface for batchFillOrKill | Assaf | 2017-10-11 | 1 | -6/+1 |
|/ | |||||
* | Add types for TradeSide and TransferType | Leonid Logvinov | 2017-10-06 | 1 | -0/+10 |
| | |||||
* | introduce BlockParamLiteral | Leonid Logvinov | 2017-10-06 | 1 | -1/+7 |
| | |||||
* | Implement subscriptions based on ethereumjs-blockstream | Leonid Logvinov | 2017-10-05 | 1 | -18/+6 |
| | |||||
* | Move ZRX_NOT_IN_TOKEN_REGISTRY to InternalZeroExError | Leonid Logvinov | 2017-10-04 | 1 | -1/+1 |
| | |||||
* | Use SolidityTypes | Leonid Logvinov | 2017-10-04 | 1 | -0/+2 |
| | |||||
* | Move NoAbiDecoder to InternalZeroExErrors | Leonid Logvinov | 2017-10-04 | 1 | -0/+3 |
| | |||||
* | Add NO_ABI_DECODER and ContractEvents | Leonid Logvinov | 2017-10-04 | 1 | -0/+3 |
| | |||||
* | Add type aliases for web3 types | Leonid Logvinov | 2017-10-04 | 1 | -0/+4 |
| | |||||
* | Add OrderTransactionOpts to enable optional validation to exchange_wrapper | Brandon Millman | 2017-09-28 | 1 | -0/+8 |
| | |||||
* | improve comment | Fabio Berger | 2017-09-26 | 1 | -2/+2 |
| | |||||
* | Add validateOrderFillableThrowIfNotFillableAsync to public methods in order ↵ | Fabio Berger | 2017-09-26 | 1 | -0/+10 |
| | | | | to validate orders in an orderbook without a specific taker in mind | ||||
* | Fix the typo | Leonid Logvinov | 2017-09-20 | 1 | -1/+1 |
| | |||||
* | Add a comment for ZeroExConfig type | Leonid Logvinov | 2017-09-19 | 1 | -0/+6 |
| | |||||
* | Make contract addresses configurable | Leonid Logvinov | 2017-09-18 | 1 | -0/+3 |
| | |||||
* | Fetch tokenTransferProxy address from exchange contract | Leonid Logvinov | 2017-09-18 | 1 | -0/+3 |
| | |||||
* | Add a comment for MethodOpts | Leonid Logvinov | 2017-09-08 | 1 | -0/+6 |
| | |||||
* | Rename CallOpts to MethodOpts | Leonid Logvinov | 2017-09-08 | 1 | -1/+1 |
| | |||||
* | Allow user to specify defaultBlock when calling const exchange methods | Leonid Logvinov | 2017-09-08 | 1 | -3/+3 |
| | |||||
* | Allow user to specify defaultBlock when calling const token methods | Leonid Logvinov | 2017-09-08 | 1 | -2/+3 |
| | |||||
* | Define CallOpts type | Leonid Logvinov | 2017-09-08 | 1 | -0/+4 |
| | |||||
* | Move Aftifact type definition to 'types' | Leonid Logvinov | 2017-09-08 | 1 | -0/+7 |
| | |||||
* | Handle the case, when it's not possible to decode args | Leonid Logvinov | 2017-09-06 | 1 | -1/+1 |
| | |||||
* | Implement custom ABI decoder | Leonid Logvinov | 2017-09-06 | 1 | -1/+3 |
| | |||||
* | Decode logs args in awaitTransactionMinedAsync | Leonid Logvinov | 2017-09-06 | 1 | -0/+13 |
| | |||||
* | Define AbiType | Leonid Logvinov | 2017-09-05 | 1 | -0/+7 |
| | |||||
* | Rename x.call -> x.callAsync x() -> x.sendTransactionAsync() x.estimateGas() ↵ | Leonid Logvinov | 2017-09-05 | 1 | -66/+83 |
| | | | | -> x.estimateGasAsync() | ||||
* | Add TransationReceipt as a public exported type | Leonid Logvinov | 2017-09-05 | 1 | -0/+2 |
| | |||||
* | Change non-exhange contracts to also return txHash | Leonid Logvinov | 2017-09-05 | 1 | -5/+5 |
| | |||||
* | Use Web3.ContractInstance type | Leonid Logvinov | 2017-09-05 | 1 | -14/+5 |
| | |||||
* | Make the functions immidiately return txHash instead of awaiting for a ↵ | Leonid Logvinov | 2017-09-05 | 1 | -19/+10 |
| | | | | transaction to be mined | ||||
* | Fix type of ExchangeContract.getOrderHash.call | Brandon Millman | 2017-08-31 | 1 | -1/+1 |
| | |||||
* | Fix incorrect types related to contract interactions in types.ts | Brandon Millman | 2017-08-31 | 1 | -18/+18 |
| | |||||
* | Document gasPrice in ZeroExConfig | Leonid Logvinov | 2017-08-29 | 1 | -1/+1 |
| | |||||
* | Add ZeroExConfig type | Leonid Logvinov | 2017-08-29 | 1 | -0/+4 |
| | |||||
* | Add all public tokenRegistry functions | Leonid Logvinov | 2017-08-24 | 1 | -0/+12 |
| | |||||
* | Add validation for the case where the order is fully filled or canceled and ↵ | Leonid Logvinov | 2017-08-24 | 1 | -0/+1 |
| | | | | a test | ||||
* | Rename internally Proxy to TokenTransferProxy | Leonid Logvinov | 2017-08-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #118 from 0xProject/artifacts-update | Fabio Berger | 2017-08-21 | 1 | -6/+5 |
|\ | | | | | Update artifacts with the latest mainnet version | ||||
| * | Remove url from token registry | Leonid Logvinov | 2017-08-15 | 1 | -3/+2 |
| | | |||||
| * | Update Exchange artifacts and adjust ExchangeWrapper | Leonid Logvinov | 2017-08-15 | 1 | -3/+3 |
| | | |||||
* | | Add JSONRPCPayload type and remove unused import | Leonid Logvinov | 2017-08-17 | 1 | -0/+5 |
|/ | |||||
* | Remove unused imports | Leonid Logvinov | 2017-07-26 | 1 | -1/+0 |
| | |||||
* | Use PascalCase names as string enum keys | Leonid Logvinov | 2017-07-12 | 1 | -35/+35 |
| | |||||
* | Migrate to using native string enums | Leonid Logvinov | 2017-07-12 | 1 | -67/+50 |
| | |||||
* | Migrate events | Leonid Logvinov | 2017-07-11 | 1 | -10/+10 |
| | |||||
* | Migrate fillOrKillOrder | Leonid Logvinov | 2017-07-11 | 1 | -3/+4 |
| | |||||
* | Migrate ZRX_TOKEN_AMOUNT | Leonid Logvinov | 2017-07-11 | 1 | -1/+1 |
| | |||||
* | Migrate getUnavailableTakerTokenAmount | Leonid Logvinov | 2017-07-11 | 1 | -1/+1 |
| | |||||
* | Migrate batchFillOrKillOrders | Leonid Logvinov | 2017-07-11 | 1 | -3/+4 |
| | |||||
* | Migrate batchFillOrders | Leonid Logvinov | 2017-07-11 | 1 | -5/+8 |
| | |||||
* | Migrate fillOrder | Leonid Logvinov | 2017-07-11 | 1 | -5/+8 |
| | |||||
* | Migrate fillOrdersUpTo and remove min | Leonid Logvinov | 2017-07-11 | 1 | -5/+8 |
| | |||||
* | Migrate batchCancelOrders | Leonid Logvinov | 2017-07-11 | 1 | -3/+4 |
| | |||||
* | Migrate cencelOrder | Leonid Logvinov | 2017-07-11 | 1 | -3/+4 |
| | |||||
* | Revert "Migrate isRoundingError parameter changes" | Leonid Logvinov | 2017-07-11 | 1 | -2/+2 |
| | | | | This reverts commit 9a200c67210599faf5eb735893abae99f72a4d1f. | ||||
* | Revert "Rename ZRX to ZRX_TOKEN_CONTRACT" | Leonid Logvinov | 2017-07-11 | 1 | -1/+1 |
| | | | | This reverts commit 6f0b8a185b6fcf58b7427fb907599dbc82c10eaf. | ||||
* | Migrate isRoundingError parameter changes | Leonid Logvinov | 2017-07-11 | 1 | -2/+2 |
| | |||||
* | Rename ZRX to ZRX_TOKEN_CONTRACT | Leonid Logvinov | 2017-07-11 | 1 | -1/+1 |
| | |||||
* | Add StringEnum type | Leonid Logvinov | 2017-07-05 | 1 | -1/+4 |
| | |||||
* | Make IndexedFilterValues type scricter | Leonid Logvinov | 2017-07-04 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into subscribe-token | Leonid | 2017-07-04 | 1 | -0/+3 |
|\ | |||||
| * | Merge pull request #89 from 0xProject/proxy | Leonid | 2017-07-04 | 1 | -0/+3 |
| |\ | | | | | | | Add zeroEx.proxy | ||||
| | * | Add zeroEx.proxy.getAuthorizedAddressesAsync and tests | Leonid Logvinov | 2017-07-04 | 1 | -0/+3 |
| | | | |||||
* | | | Add initial implementation and tests for zeroEx.token.subscribeAsync | Leonid Logvinov | 2017-07-04 | 1 | -1/+21 |
|/ / | |||||
* | | Merge branch 'master' into wrap-log-bignumber | Leonid | 2017-07-04 | 1 | -0/+21 |
|\| | |||||
| * | Fix a typo in authorized | Leonid Logvinov | 2017-06-30 | 1 | -1/+1 |
| | | |||||
| * | Add type for a ProxyContract | Leonid Logvinov | 2017-06-30 | 1 | -0/+6 |
| | | |||||
| * | Rename ZeroExError.CONTRACT_DOES_NOT_EXIST to ↵ | Leonid Logvinov | 2017-06-30 | 1 | -0/+1 |
| | | | | | | | | ZeroExError.EXCHANGE_CONTRACT_DOES_NOT_EXIST | ||||
| * | Remove _getExchangeAddressAsync | Leonid Logvinov | 2017-06-27 | 1 | -0/+1 |
| | | |||||
| * | Allow multiple exchange versions t be functional at the same time | Leonid Logvinov | 2017-06-27 | 1 | -0/+13 |
| | | |||||
* | | Wrap all event args in a newer version of BigNumber and test it | Leonid Logvinov | 2017-07-02 | 1 | -0/+1 |
|/ | |||||
* | Fix typo | Fabio Berger | 2017-06-27 | 1 | -1/+1 |
| | |||||
* | Implement EtherTokenWrapper and tests, with deposit and withdraw methods | Fabio Berger | 2017-06-26 | 1 | -0/+8 |
| | |||||
* | Revert "Use different lodash import syntax which allows to include only used ↵ | Leonid | 2017-06-22 | 1 | -2/+2 |
| | | | | functions" | ||||
* | Rename Log*Args to Log*ContractEventArgs | Leonid Logvinov | 2017-06-21 | 1 | -3/+3 |
| | |||||
* | Fall back to import x = require() syntax | Leonid Logvinov | 2017-06-21 | 1 | -1/+1 |
| | |||||
* | Use different lodash import syntax which allows to include only used functions | Leonid Logvinov | 2017-06-21 | 1 | -2/+2 |
| | |||||
* | Add newline between type defs | Fabio Berger | 2017-06-20 | 1 | -0/+1 |
| | |||||
* | Rename LogErrorArgs to LogErrorEventArgs and EventArgs to ContractEventArgs | Leonid Logvinov | 2017-06-19 | 1 | -3/+3 |
| | |||||
* | Merge branch 'master' into event-types | Leonid | 2017-06-15 | 1 | -0/+7 |
|\ | |||||
| * | Add explaining comment for the web3Provider type | Leonid Logvinov | 2017-06-15 | 1 | -1/+5 |
| | | |||||
| * | Make ZeroEx constructor accept Web3Provider instead of Web3 instance | Leonid Logvinov | 2017-06-15 | 1 | -0/+3 |
| | | |||||
* | | Add actual type for contract event arguments | Leonid Logvinov | 2017-06-15 | 1 | -1/+30 |
|/ | |||||
* | Remove types that are not used in public interface from export and rename ↵ | Leonid Logvinov | 2017-06-14 | 1 | -3/+3 |
| | | | | EventEmitter to ContractEventEmitter and IndexFilterValues to IndexedFilterValues | ||||
* | Rename ZeroExEvent to EventEmitter | Leonid Logvinov | 2017-06-13 | 1 | -1/+1 |
| | |||||
* | Refactor subscription to return zeroExSignature object | Leonid Logvinov | 2017-06-13 | 1 | -0/+5 |
| | |||||
* | Duplicate truffle contracts types | Leonid Logvinov | 2017-06-11 | 1 | -0/+8 |
| | |||||
* | Add initial error handling decorator implementation | Leonid Logvinov | 2017-06-10 | 1 | -0/+4 |
| | |||||
* | Address feedback | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | |||||
* | Add assert.hashAtMostOneUniqueValue | Leonid Logvinov | 2017-06-09 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' into fillOrderUpToAsync | Leonid | 2017-06-09 | 1 | -0/+11 |
|\ | |||||
| * | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-09 | 1 | -0/+11 |
| |\ | | | | | | | | | | | | | # Conflicts: # test/exchange_wrapper_test.ts | ||||
| * \ | Merge branch 'master' into batchFillOrKill | Fabio Berger | 2017-06-08 | 1 | -0/+12 |
| |\ \ | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts | ||||
| * | | | Implement batchFillOrKill and tests | Fabio Berger | 2017-06-08 | 1 | -0/+11 |
| | | | | |||||
* | | | | Implement fillOrderUpToAsync | Leonid Logvinov | 2017-06-08 | 1 | -0/+7 |
| |_|/ |/| | | |||||
* | | | Fix names in types | Leonid Logvinov | 2017-06-08 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'master' into batchFillAsync | Leonid Logvinov | 2017-06-08 | 1 | -1/+8 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' into batchCancelAsync | Leonid | 2017-06-08 | 1 | -1/+7 |
| |\| | |||||
| | * | make txOpts optional | Fabio Berger | 2017-06-07 | 1 | -2/+2 |
| | | | |||||
| | * | remove space | Fabio Berger | 2017-06-07 | 1 | -1/+0 |
| | | | |||||
| | * | merge master | Fabio Berger | 2017-06-07 | 1 | -5/+17 |
| | |\ | |||||
| | * | | Implement fillOrKill & tests | Fabio Berger | 2017-06-07 | 1 | -4/+11 |
| | | | | |||||
| * | | | Fix linter error | Leonid Logvinov | 2017-06-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -0/+5 |
|\| | | | |||||
* | | | | Merge branch 'batchCancelAsync' into batchFillAsync | Leonid Logvinov | 2017-06-07 | 1 | -0/+5 |
|\| | | | |||||
| * | | | Refactor to use OrderCancellationRequest | Leonid Logvinov | 2017-06-07 | 1 | -0/+5 |
| | | | | |||||
| * | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 1 | -0/+6 |
| | |/ | |/| | |||||
| * | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 1 | -3/+0 |
| | | | |||||
* | | | Add initial batchCancelAsync implementation | Leonid Logvinov | 2017-06-07 | 1 | -0/+6 |
| | | | |||||
* | | | Use ContractInstance from globals | Leonid Logvinov | 2017-06-07 | 1 | -3/+0 |
| | | | |||||
* | | | Add initial implementation of batchCancelAsync | Leonid Logvinov | 2017-06-07 | 1 | -0/+6 |
|/ / | |||||
* | | Make txOpts optional | Leonid Logvinov | 2017-06-07 | 1 | -7/+7 |
| | | |||||
* | | Address feedback | Leonid Logvinov | 2017-06-07 | 1 | -3/+6 |
| | | |||||
* | | Add missing semicolon | Leonid Logvinov | 2017-06-06 | 1 | -1/+1 |
| | | |||||
* | | Add test when the order was already cancelled or filled | Leonid Logvinov | 2017-06-06 | 1 | -0/+4 |
| | | |||||
* | | Add checks and tests for expired order and zero fill amount | Leonid Logvinov | 2017-06-06 | 1 | -0/+2 |
| | | |||||
* | | Add initial implementation with success test | Leonid Logvinov | 2017-06-06 | 1 | -0/+6 |
|/ | |||||
* | Make methods accept senderAccount | Leonid Logvinov | 2017-06-05 | 1 | -2/+2 |
| | |||||
* | Merge pull request #32 from 0xProject/addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -4/+50 |
|\ | | | | | Implement zeroEx.exchange.subscribeAsync | ||||
| * | Consolidate the ExchangeContract type and flesh out type definition for ↵ | Fabio Berger | 2017-06-03 | 1 | -20/+19 |
| | | | | | | | | isValidSignature.call | ||||
| * | Be more specific with blockParam valid values | Fabio Berger | 2017-06-03 | 1 | -2/+4 |
| | | |||||
| * | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -19/+26 |
| |\ | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts | ||||
| * | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵ | Fabio Berger | 2017-06-02 | 1 | -0/+41 |
| | | | | | | | | | | | | if user updates the provider | ||||
* | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 1 | -0/+9 |
|\ \ \ | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/token_wrapper.ts | ||||
| * \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-03 | 1 | -23/+26 |
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts | ||||
| * | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -0/+4 |
| |\ \ | |||||
| * \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -0/+4 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -2/+64 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts | ||||
| * \ \ \ \ | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-01 | 1 | -0/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and ↵ | Fabio Berger | 2017-06-01 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | getCanceledTakerAmountAsync | ||||
* | | | | | | | Merge branch 'master' into remainingTokenMethods | Fabio Berger | 2017-06-03 | 1 | -7/+80 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/types.ts # src/web3_wrapper.ts | ||||
| * | | | | | | Add ZRX_TOKEN_NOT_IN_REGISTRY | Leonid Logvinov | 2017-06-03 | 1 | -5/+6 |
| | | | | | | | |||||
| * | | | | | | Address feedback | Leonid Logvinov | 2017-06-03 | 1 | -8/+8 |
| | | | | | | | |||||
| * | | | | | | Move FillOrderValidatinErrs to ExchangeContractErrs | Leonid Logvinov | 2017-06-03 | 1 | -9/+3 |
| | | | | | | | |||||
| * | | | | | | Rename EXPIRED to FILL_ORDER_EXPIRED | Leonid Logvinov | 2017-06-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Rename NOT_A_TAKER to TRANSACTION_SENDER_IS_NOT_FILL_ORDER_TAKER | Leonid Logvinov | 2017-06-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | rename fillTakerAmountInBaseUnits to fillTakerAmount | Fabio Berger | 2017-06-02 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Improve error names and remove duplicate import | Fabio Berger | 2017-06-02 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-02 | 1 | -4/+0 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add tests and checks for fees balances and allowances | Leonid Logvinov | 2017-06-02 | 1 | -0/+7 |
| | | | | | | | | |||||
| * | | | | | | | Add check for ROUNDING_ERROR and test for it | Leonid Logvinov | 2017-06-02 | 1 | -0/+5 |
| | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 1 | -0/+4 |
| | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 1 | -0/+4 |
| | |_|_|/ | |/| | | | |||||
| * | | | | rename txData to txOpts | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add EXPIRED error type | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c. | ||||
| * | | | | Add ExchangeContractErrs string enum | Fabio Berger | 2017-06-01 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | fix formatting | Fabio Berger | 2017-06-01 | 1 | -4/+2 |
| | | | | | |||||
| * | | | | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -1/+8 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | ||||
| | * | | | | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | Rename ExchangeContractErrs to ExchangeContractErrCodes | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| |/ / / / | |||||
| * | | | | Make taker required on Order object and expect NULL_ADDRESS from 0x.js | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Type estimateGas | Leonid Logvinov | 2017-06-01 | 1 | -4/+6 |
| | | | | | |||||
| * | | | | Remove TxData | Leonid Logvinov | 2017-06-01 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 1 | -7/+8 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Fix linter errors | Leonid Logvinov | 2017-05-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 1 | -0/+16 |
| |\ \ \ \ | |||||
| * | | | | | Remove spaces in types | Leonid Logvinov | 2017-05-30 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 1 | -0/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | Fix order type | Leonid Logvinov | 2017-05-30 | 1 | -1/+0 |
| | | | | | | | |||||
| * | | | | | | Add Order and SignedOrder types | Leonid Logvinov | 2017-05-30 | 1 | -0/+23 |
| | | | | | | | |||||
| * | | | | | | Add initial implementation of fillOrderAsync | Leonid Logvinov | 2017-05-30 | 1 | -0/+33 |
| | | | | | | | |||||
* | | | | | | | Add setAllowanceAsync, getAllowanceAsync and transferFrom to tokenWrapper | Fabio Berger | 2017-06-02 | 1 | -1/+5 |
| |_|_|_|/ / |/| | | | | | |||||
* | | | | | | Fix tslint issues | Fabio Berger | 2017-06-02 | 1 | -2/+2 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge branch 'master' into erc20transfer | Leonid | 2017-05-31 | 1 | -7/+8 |
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Add TxOpts type | Fabio Berger | 2017-05-31 | 1 | -1/+6 |
| | | | | |||||
| * | | | remove InternalError type since this error could surface through the public ↵ | Fabio Berger | 2017-05-31 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | interface | ||||
* | | | | Add transfer function and tests for it | Leonid Logvinov | 2017-05-31 | 1 | -0/+1 |
|/ / / | |||||
* | | | Implement setProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+1 |
| | | | |||||
* | | | Implement zeroEx.token.getProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+8 |
| | | | |||||
* | | | rename ERC20Contract to TokenContract | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into erc20Wrapper | Fabio Berger | 2017-05-30 | 1 | -2/+9 |
|\ \ \ | | |/ | |/| | | | | | | | # Conflicts: # src/0x.js.ts | ||||
| * | | Improve type definitions | Fabio Berger | 2017-05-30 | 1 | -2/+6 |
| | | | |||||
| * | | Add TokenMetadata type | Fabio Berger | 2017-05-30 | 1 | -0/+3 |
| | | | |||||
* | | | Implement ERC20Wrapper and it's first method getBalanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+6 |
|/ / | |||||
* / | Add TokenRegistryWrapper and getTokensAsync method | Fabio Berger | 2017-05-30 | 1 | -0/+13 |
|/ | |||||
* | Port over signOrderHashAsync | Fabio Berger | 2017-05-29 | 1 | -0/+1 |
| | |||||
* | Move files up and remove ts folder | Leonid Logvinov | 2017-05-29 | 1 | -0/+36 |