Commit Graph

15408 Commits

Author SHA1 Message Date
Fabio Berger
60d658a024 put external imports at the top 2017-06-01 17:03:49 +02:00
Fabio Berger
59bc13c188 remove comment 2017-06-01 17:03:39 +02:00
Leonid Logvinov
af61b5a908 Add shouldCheckTransfer 2017-06-01 17:03:15 +02:00
Leonid Logvinov
5ded2bd52b Refactor tests 2017-06-01 17:01:54 +02:00
Fabio Berger
8193d0f5b2 rename txData to txOpts 2017-06-01 16:55:34 +02:00
Fabio Berger
ea42715b9a remove superfluous param 2017-06-01 16:54:20 +02:00
Fabio Berger
fe025506c9 remove unused arg 2017-06-01 16:30:06 +02:00
Fabio Berger
f756e1d24e remove unneeded method 2017-06-01 16:25:37 +02:00
Fabio Berger
6c590354c7 improve comment 2017-06-01 16:25:28 +02:00
Fabio Berger
abd113f61f Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-01 16:21:09 +02:00
Fabio Berger
44f1144242 Add comment for fillOrderAsync method, rename fillAmount to fillTakerAmountInBaseUnits and remove default value for shouldCheckTransfer 2017-06-01 16:21:01 +02:00
Leonid Logvinov
52bdc0d343 Add timestamp parameter to order factory 2017-06-01 16:17:15 +02:00
Leonid Logvinov
78259dc2af Add expired check 2017-06-01 16:15:58 +02:00
Leonid Logvinov
7d64ce1220 Add EXPIRED error type 2017-06-01 16:15:30 +02:00
Leonid Logvinov
7fb18e512e Increase mocha timeout 2017-06-01 16:14:32 +02:00
Leonid Logvinov
771c88ec79 Revert "Add EXPIRED test"
This reverts commit d8e35c364e.
2017-06-01 16:12:40 +02:00
Fabio Berger
a1041348d5 Get getSenderAddressOrThrowAsync everywhere where we throw if the senderAddress doesn't exist 2017-06-01 16:07:43 +02:00
Fabio Berger
88a70afa70 Add ExchangeContractErrs string enum 2017-06-01 16:03:09 +02:00
Fabio Berger
a685d7604f fix formatting 2017-06-01 16:02:44 +02:00
Fabio Berger
73ad8378b0 Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
# Conflicts:
#	src/contract_wrappers/exchange_wrapper.ts
2017-06-01 15:52:11 +02:00
Fabio Berger
6a57c42e25 Rename ExchangeContractErrs to ExchangeContractErrCodes 2017-06-01 15:51:45 +02:00
Leonid Logvinov
d8e35c364e Add EXPIRED test 2017-06-01 15:46:27 +02:00
Leonid Logvinov
21d00f04d4 Fix tests 2017-06-01 15:21:24 +02:00
Leonid Logvinov
d5d20db439 Add NOT_A_TAKER check 2017-06-01 15:18:13 +02:00
Leonid Logvinov
07cdfa655b Add FILL_AMOUNT_IS_ZERO check 2017-06-01 15:13:32 +02:00
Fabio Berger
88316455b7 Make taker required on Order object and expect NULL_ADDRESS from 0x.js 2017-06-01 15:10:22 +02:00
Fabio Berger
085e4fb896 Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-01 14:59:26 +02:00
Fabio Berger
1668a08504 rename signed_order_schema to order_schemas 2017-06-01 14:59:03 +02:00
Leonid Logvinov
75d0b69db2 Add taker parameter to createSignedOrder 2017-06-01 14:57:34 +02:00
Leonid Logvinov
ef7ac6ac2d Rename order to order_factory 2017-06-01 14:53:26 +02:00
Leonid Logvinov
448be396cb Remove unnecessary checks 2017-06-01 14:52:25 +02:00
Fabio Berger
329d02053d Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync 2017-06-01 14:46:39 +02:00
Leonid Logvinov
84f8570e78 Fix types hell with, chai and chai-as-promised 2017-06-01 14:46:24 +02:00
Fabio Berger
c74b16eda9 Add convertToJSONSchemaCompatibleObject method 2017-06-01 14:46:09 +02:00
Fabio Berger
0991191a9b move external imports to top 2017-06-01 14:43:14 +02:00
Fabio Berger
1fe1675726 make bigNumberConfig a module 2017-06-01 14:11:25 +02:00
Leonid Logvinov
dbb30aa1dd Fix linter errors 2017-06-01 11:46:57 +02:00
Leonid Logvinov
de3a2ff672 Add dirty-chai 2017-06-01 11:40:08 +02:00
Leonid Logvinov
cc4b322a93 Type estimateGas 2017-06-01 11:34:32 +02:00
Leonid Logvinov
0a68a69d0c Allign parameters 2017-06-01 11:15:52 +02:00
Leonid Logvinov
81f0414c27 Remove TxData 2017-06-01 11:15:33 +02:00
Leonid Logvinov
b05e96699f Temporarily fix gas extimation 2017-06-01 11:08:14 +02:00
Leonid Logvinov
cc7592e931 Use const 2017-06-01 11:07:58 +02:00
Leonid Logvinov
f450f538a0 Add setDefaultAccount 2017-06-01 11:07:36 +02:00
Leonid Logvinov
28dee77db8 Temp push 2017-05-31 21:15:15 +02:00
Fabio Berger
ecf92a4ad7 Merge branch 'master' into unavailableFilledCancelled 2017-05-31 20:11:11 +02:00
Fabio Berger
52c3330487 Implement getUnavailableTakerAmountAsync, getFilledTakerAmountAsync and getCanceledTakerAmountAsync 2017-05-31 20:10:09 +02:00
Fabio Berger
595656d3fc Move isValidOrderHash to utils and implement assert.isValidOrderHash 2017-05-31 20:08:28 +02:00
Leonid Logvinov
886ed9180d Merge branch 'master' into fillOrderAsync 2017-05-31 19:26:18 +02:00
Leonid
1c765cd55f Merge pull request #28 from 0xProject/erc20transfer
Add transfer function and tests for it
2017-05-31 19:25:03 +02:00