Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into addEventSubscriptions | Fabio Berger | 2017-06-03 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # test/exchange_wrapper_test.ts | ||||
| * | Improve comment | Fabio Berger | 2017-06-02 | 1 | -2/+1 |
| | | |||||
* | | Implement zeroEx.exchange.subscribeAsync made sure to clean up subscriptions ↵ | Fabio Berger | 2017-06-02 | 1 | -2/+2 |
| | | | | | | | | if user updates the provider | ||||
* | | Merge branch 'fillOrderAsync' into addEventSubscriptions | Fabio Berger | 2017-06-02 | 1 | -3/+3 |
|\| | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
| * | Fix getTransactionSenderAccountIfExistsAsync to return true senderAddress or ↵ | Fabio Berger | 2017-06-02 | 1 | -3/+4 |
| | | | | | | | | undefined if non available | ||||
| * | Introduce coinBase account | Leonid Logvinov | 2017-06-02 | 1 | -0/+6 |
| | | | | | | | | | | | | Add makerAccount parameter Adjust tests Add more assertions to success test | ||||
* | | improve comment | Fabio Berger | 2017-06-02 | 1 | -1/+4 |
| | | |||||
* | | Add comment about the isString assertion lest the next developer tries to ↵ | Fabio Berger | 2017-06-02 | 1 | -0/+2 |
| | | | | | | | | use a stricter assertion (i.e isHexString) which we intentionally did not do | ||||
* | | Write tests for getUnavailableTakerAmountAsync, getFilledTakerAmountAsync ↵ | Fabio Berger | 2017-06-02 | 1 | -3/+9 |
| | | | | | | | | and getCanceledTakerAmountAsync | ||||
* | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -1/+1 |
|\| | |||||
| * | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -2/+2 |
|\| | |||||
| * | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -51/+63 |
|\| | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts | ||||
| * | Fix import | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| | | |||||
| * | Stop passing exchangeAddress into getOrderHash and instead get it from the ↵ | Fabio Berger | 2017-06-01 | 1 | -28/+41 |
| | | | | | | | | artifacts | ||||
| * | Get getSenderAddressOrThrowAsync everywhere where we throw if the ↵ | Fabio Berger | 2017-06-01 | 1 | -7/+4 |
| | | | | | | | | senderAddress doesn't exist | ||||
| * | Make taker required on Order object and expect NULL_ADDRESS from 0x.js | Fabio Berger | 2017-06-01 | 1 | -1/+2 |
| | | |||||
| * | rename signed_order_schema to order_schemas | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| | | |||||
| * | Add convertToJSONSchemaCompatibleObject method | Fabio Berger | 2017-06-01 | 1 | -1/+4 |
| | | |||||
| * | move external imports to top | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | |||||
| * | make bigNumberConfig a module | Fabio Berger | 2017-06-01 | 1 | -2/+4 |
| | | |||||
| * | Add setDefaultAccount | Leonid Logvinov | 2017-06-01 | 1 | -0/+7 |
| | | |||||
| * | Fix linter errors | Leonid Logvinov | 2017-05-31 | 1 | -1/+1 |
| | | |||||
| * | Set bignumber config | Leonid Logvinov | 2017-05-31 | 1 | -0/+2 |
| | | |||||
| * | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 1 | -0/+4 |
| |\ | |||||
| * | | Refactor getOrderHash to accept order as an object | Leonid Logvinov | 2017-05-30 | 1 | -29/+16 |
| | | | |||||
| * | | Remove mention of internal cleanup from public comment | Fabio Berger | 2017-05-30 | 1 | -2/+1 |
| | | | |||||
| * | | improve comment | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | | | |||||
| * | | Make tokenRegistry contract instantiation lazy and clear it on provider update | Fabio Berger | 2017-05-30 | 1 | -0/+1 |
| | | | |||||
| * | | rename invalidateExchangeContract to invalidateContractInstance | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into dontReinstantiateContractInstances | Fabio Berger | 2017-05-30 | 1 | -0/+3 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into tokenRegistry | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/0x.js.ts | ||||
| * | | | | Add setProvider method to 0x.js that updates the web3 provider and ↵ | Fabio Berger | 2017-05-30 | 1 | -0/+8 |
| | |/ / | |/| | | | | | | | | | | invalidates any contractInstances instantiated with the old provider | ||||
| * | | | make web3Wrapper a private instance variable | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Move isValidOrderHash to utils and implement assert.isValidOrderHash | Fabio Berger | 2017-06-01 | 1 | -4/+4 |
| |_|/ |/| | | |||||
* | | | use token instead of erc20 | Fabio Berger | 2017-05-30 | 1 | -3/+3 |
| | | | |||||
* | | | rename erc20Wrapper to tokenWrapper to be more generic in case we end up ↵ | Fabio Berger | 2017-05-30 | 1 | -4/+13 |
| | | | | | | | | | | | | supporting another spec | ||||
* | | | Implement ERC20Wrapper and it's first method getBalanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+3 |
| |/ |/| | |||||
* | | Add TokenRegistryWrapper and getTokensAsync method | Fabio Berger | 2017-05-30 | 1 | -0/+3 |
|/ | |||||
* | Lowercase schema names | Fabio Berger | 2017-05-30 | 1 | -2/+2 |
| | |||||
* | improve comment | Fabio Berger | 2017-05-29 | 1 | -1/+1 |
| | |||||
* | Port over signOrderHashAsync | Fabio Berger | 2017-05-29 | 1 | -1/+63 |
| | |||||
* | Standardize all comments | Fabio Berger | 2017-05-29 | 1 | -4/+4 |
| | |||||
* | Move files up and remove ts folder | Leonid Logvinov | 2017-05-29 | 1 | -0/+134 |
| | |||||
* | Create ts folder | Fabio Berger | 2017-05-24 | 1 | -5/+0 |
| | |||||
* | Add empty zeroEx class | Leonid Logvinov | 2017-05-24 | 1 | -0/+5 |