Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -3/+16 |
|\ | | | | | | | | | | | # Conflicts: # src/0x.js.ts # test/exchange_wrapper_test.ts | ||||
| * | Validate maker balance and allowance & tests | Leonid Logvinov | 2017-06-02 | 1 | -4/+14 |
| | | |||||
| * | Add test for insufficient balance and make all async tests async | Leonid Logvinov | 2017-06-02 | 1 | -0/+3 |
| | | |||||
* | | Always wrap BigNumbers returned by web3 with our own version and add comment | Fabio Berger | 2017-06-02 | 2 | -5/+11 |
| | | |||||
* | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -3/+4 |
|\| | |||||
| * | Create a FillsScenario utils module and use it in the fillOrder tests | Fabio Berger | 2017-06-02 | 1 | -4/+6 |
| | | |||||
* | | fix tslint error | Fabio Berger | 2017-06-02 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -3/+15 |
|\| | |||||
| * | Make validateFillOrder asyncronous | Leonid Logvinov | 2017-06-02 | 1 | -2/+2 |
| | | |||||
| * | Add not enough taker balance tests | Leonid Logvinov | 2017-06-02 | 1 | -2/+14 |
| | | |||||
* | | Merge branch 'fillOrderAsync' into unavailableFilledCancelled | Fabio Berger | 2017-06-02 | 1 | -7/+106 |
|\| | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts # src/types.ts # src/utils/assert.ts | ||||
| * | remove superfluous param | Fabio Berger | 2017-06-01 | 1 | -1/+1 |
| | | |||||
| * | remove unused arg | Fabio Berger | 2017-06-01 | 1 | -2/+1 |
| | | |||||
| * | remove unneeded method | Fabio Berger | 2017-06-01 | 1 | -5/+1 |
| | | |||||
| * | improve comment | Fabio Berger | 2017-06-01 | 1 | -2/+2 |
| | | |||||
| * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -0/+3 |
| |\ | |||||
| | * | Add expired check | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 |
| | | | |||||
| * | | Add comment for fillOrderAsync method, rename fillAmount to ↵ | Fabio Berger | 2017-06-01 | 1 | -6/+11 |
| |/ | | | | | | | fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer | ||||
| * | Revert "Add EXPIRED test" | Leonid Logvinov | 2017-06-01 | 1 | -3/+0 |
| | | | | | | | | This reverts commit d8e35c364ea94b606810b340fb02d8706e257c3c. | ||||
| * | Add ExchangeContractErrs string enum | Fabio Berger | 2017-06-01 | 1 | -8/+9 |
| | | |||||
| * | Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync | Fabio Berger | 2017-06-01 | 1 | -0/+15 |
| |\ | | | | | | | | | | | | | # Conflicts: # src/contract_wrappers/exchange_wrapper.ts | ||||
| | * | Add EXPIRED test | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 |
| | | | |||||
| | * | Add NOT_A_TAKER check | Leonid Logvinov | 2017-06-01 | 1 | -0/+3 |
| | | | |||||
| | * | Add FILL_AMOUNT_IS_ZERO check | Leonid Logvinov | 2017-06-01 | 1 | -0/+9 |
| | | | |||||
| * | | Rename ExchangeContractErrs to ExchangeContractErrCodes | Fabio Berger | 2017-06-01 | 1 | -9/+9 |
| |/ | |||||
| * | Make taker required on Order object and expect NULL_ADDRESS from 0x.js | Fabio Berger | 2017-06-01 | 1 | -3/+1 |
| | | |||||
| * | 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 |
| | | |||||
| * | Temporarily fix gas extimation | Leonid Logvinov | 2017-06-01 | 1 | -0/+13 |
| | | |||||
| * | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-06-01 | 1 | -8/+6 |
| |\ | |||||
| * | | Don't return contract response | Leonid Logvinov | 2017-05-31 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'erc20transfer' into fillOrderAsync | Leonid Logvinov | 2017-05-31 | 1 | -0/+110 |
| |\ \ | |||||
| * | | | Add isBigNumber argument assertion | Leonid Logvinov | 2017-05-30 | 1 | -0/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into fillOrderAsync | Leonid Logvinov | 2017-05-30 | 2 | -1/+57 |
| |\ \ \ | |||||
| * | | | | Add throwErrorLogsAsErrors | Leonid Logvinov | 2017-05-30 | 1 | -6/+10 |
| | | | | | |||||
| * | | | | Add fillAmount parameter | Leonid Logvinov | 2017-05-30 | 1 | -2/+3 |
| | | | | | |||||
| * | | | | Make fillOrderAsync accept signedOrder instead of a shit-ton of params | Leonid Logvinov | 2017-05-30 | 1 | -35/+21 |
| | | | | | |||||
| * | | | | Finish ecSignature renaming | Leonid Logvinov | 2017-05-30 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Add assertions for parameters | Leonid Logvinov | 2017-05-30 | 1 | -1/+15 |
| | | | | | |||||
| * | | | | Move field declaration to the begining of the class | Leonid Logvinov | 2017-05-30 | 1 | -8/+8 |
| | | | | | |||||
| * | | | | Add initial implementation of fillOrderAsync | Leonid Logvinov | 2017-05-30 | 1 | -1/+63 |
| | | | | | |||||
| * | | | | Add getExchangeInstanceOrThrowAsync && getSenderAddressOrThrowAsync | Leonid Logvinov | 2017-05-30 | 1 | -6/+7 |
| | | | | | |||||
* | | | | | Merge branch 'master' into unavailableFilledCancelled | Fabio Berger | 2017-06-01 | 1 | -1/+16 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' into erc20transfer | Leonid | 2017-05-31 | 1 | -8/+6 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Add transfer function and tests for it | Leonid Logvinov | 2017-05-31 | 1 | -1/+16 |
| | | | | | |||||
* | | | | | Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and ↵ | Fabio Berger | 2017-06-01 | 1 | -0/+33 |
| |/ / / |/| | | | | | | | | | | | getCanceledTakerAmountAsync | ||||
* | | | | remove InternalError type since this error could surface through the public ↵ | Fabio Berger | 2017-05-31 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | interface | ||||
* | | | | Remove superfluous undefined check | Fabio Berger | 2017-05-31 | 1 | -4/+2 |
| | | | | |||||
* | | | | Add full stop to comments | Fabio Berger | 2017-05-31 | 1 | -2/+2 |
|/ / / | |||||
* | | | Implement setProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -4/+32 |
| | | | |||||
* | | | Implement zeroEx.token.getProxyAllowanceAsync | Fabio Berger | 2017-05-30 | 1 | -1/+26 |
| | | | |||||
* | | | rename ERC20Contract to TokenContract | Fabio Berger | 2017-05-30 | 1 | -4/+4 |
| | | | |||||
* | | | rename erc20Wrapper to tokenWrapper to be more generic in case we end up ↵ | Fabio Berger | 2017-05-30 | 1 | -3/+17 |
| | | | | | | | | | | | | supporting another spec | ||||
* | | | Merge branch 'master' into erc20Wrapper | Fabio Berger | 2017-05-30 | 2 | -7/+29 |
|\ \ \ | | |/ | |/| | | | | | | | # Conflicts: # src/0x.js.ts | ||||
| * | | Refactor exchangeWrapper and tokenRegistryWrapper to use contract getter ↵ | Fabio Berger | 2017-05-30 | 2 | -13/+15 |
| | | | | | | | | | | | | that instantiates contract instance if not already instantiated | ||||
| * | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+0 |
| | | | |||||
| * | | Make tokenRegistry contract instantiation lazy and clear it on provider update | Fabio Berger | 2017-05-30 | 1 | -4/+14 |
| | | | |||||
| * | | rename invalidateExchangeContract to invalidateContractInstance | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into dontReinstantiateContractInstances | Fabio Berger | 2017-05-30 | 1 | -0/+33 |
| |\ \ | |||||
| | * | | Add TokenMetadata type | Fabio Berger | 2017-05-30 | 1 | -2/+2 |
| | | | | |||||
| | * | | remove unused import | Fabio Berger | 2017-05-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Lazily instantiate exchangeContract and store as instance variable instead ↵ | Fabio Berger | 2017-05-30 | 1 | -3/+14 |
| | |/ | |/| | | | | | | | of re-instantiating on every call | ||||
* | | | Implement ERC20Wrapper and it's first method getBalanceAsync | Fabio Berger | 2017-05-30 | 1 | -0/+28 |
| |/ |/| | |||||
* | | Add TokenRegistryWrapper and getTokensAsync method | Fabio Berger | 2017-05-30 | 1 | -0/+33 |
|/ | |||||
* | Lowercase schema names | Fabio Berger | 2017-05-30 | 1 | -2/+2 |
| | |||||
* | Fix imports | Leonid Logvinov | 2017-05-29 | 1 | -1/+1 |
| | |||||
* | Move files up and remove ts folder | Leonid Logvinov | 2017-05-29 | 2 | -0/+85 |