Leonid Logvinov
5044fe4fe4
Merge branch 'v2-prototype' into feature/order-watcher-v2
2018-07-18 15:40:45 +02:00
Leonid Logvinov
8e49169e6b
Merge branch 'feature/order-watcher-v2' of github.com:0xProject/0x-monorepo into feature/order-watcher-v2
2018-07-18 15:39:11 +02:00
Leonid Logvinov
c71781d9ab
Merge
2018-07-18 15:38:10 +02:00
Leonid Logvinov
dad557164e
Merge branch 'v2-prototype' into feature/order-watcher-v2
2018-07-18 15:27:38 +02:00
Fabio Berger
e2fb49a8f8
Merge pull request #884 from 0xProject/export-more-0x.js
...
Export missing V2 pieces from 0x.js
2018-07-18 15:18:54 +02:00
Leonid Logvinov
f3241ff86a
Merge pull request #883 from 0xProject/feature/tslint-improvements
...
New tslint rules
2018-07-18 14:54:47 +02:00
Fabio Berger
b9e7973a0f
edit changelog message
2018-07-18 14:53:38 +02:00
Fabio Berger
004b1f5288
Fix prettier
2018-07-18 14:53:31 +02:00
Leonid Logvinov
857bd24c6d
Merge branch 'v2-prototype' into feature/order-watcher-v2
2018-07-18 14:51:24 +02:00
Leonid Logvinov
904968cf4a
Fix an inconsistency in abi-gen CHANGELOG.json
2018-07-18 14:31:03 +02:00
Fabio Berger
83747934ad
Fix linter
2018-07-18 12:11:11 +02:00
Fabio Berger
7f90f5ecd4
merge v2-prototype
2018-07-18 12:04:57 +02:00
Fabio Berger
12f02b9814
Rename decodeAssetDataId to decodeAssetProxyId for consistency
2018-07-18 11:49:30 +02:00
Fabio Berger
8931388309
Add java doc comments to assetDataUtils
2018-07-18 11:47:42 +02:00
Fabio Berger
25160d7344
Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want them exported
2018-07-18 11:32:01 +02:00
Leonid Logvinov
ab6bf6edc7
Merge pull request #879 from 0xProject/feature/order-watcher-erc721-tests
...
Add ERC721 tests for order watcher v2
2018-07-18 10:38:07 +02:00
Amir Bandeali
56a4a374cd
Merge pull request #857 from 0xProject/feature/contracts/batchGetOrderInfo
...
Add getOrdersInfo function
2018-07-17 14:13:33 -07:00
Amir Bandeali
caa5b4e342
Add tests for getOrderInfo and getOrdersInfo
2018-07-17 13:59:14 -07:00
Amir Bandeali
b6172c3965
Reorder checks in getOrderInfo
2018-07-17 12:18:16 -07:00
Amir Bandeali
02ddfa07a7
Add getOrdersInfo function
2018-07-17 12:18:16 -07:00
Alex Browne
5022878680
Merge pull request #886 from 0xProject/fix/time-offset-accidental-revert
...
Mine a dummy block in blockchain_lifecycle to re-apply any time offset
2018-07-17 12:12:12 -07:00
Alex Browne
2bfacbb8ba
Mine a dummy block in blockchain_lifecycle to re-apply any time offset
2018-07-17 11:48:39 -07:00
Alex Browne
b18d2b0274
Merge pull request #881 from 0xProject/fix/timestamp-conversions
...
Fix bugs having to do with block timestamps and order expirationTimes
2018-07-17 10:57:39 -07:00
Leonid Logvinov
f20b496dca
Add a test for ERC721 Allowance
2018-07-17 18:46:58 +02:00
Leonid Logvinov
cca17f70b8
Use allowance instead of approval for all in fill-scenarios
2018-07-17 18:45:35 +02:00
Leonid Logvinov
b8e69718a1
Upgrade sha3 to 1.2.2 to work with node v10
2018-07-17 16:54:25 +02:00
Fabio Berger
50ed7d2af2
Export missing types and add to doc ref whitelist
2018-07-17 16:41:55 +02:00
Fabio Berger
698de932ed
Remove unused dep
2018-07-17 16:27:59 +02:00
Fabio Berger
a3d8858bb1
Fix typing
2018-07-17 16:27:46 +02:00
Fabio Berger
83f3ba21b8
Move type decl. to typescript-typings
2018-07-17 16:01:01 +02:00
Leonid Logvinov
2aa729b212
Check if the token doesn't exist before minting in fill scenarios
2018-07-17 15:56:10 +02:00
Fabio Berger
1de70e4474
Add PR
2018-07-17 15:40:06 +02:00
Fabio Berger
f2393de59b
Make assetData a static property and add to CHANGELOG
2018-07-17 15:33:49 +02:00
Fabio Berger
94ea7cc451
Export assetDataUtils from 0x.js
2018-07-17 15:31:25 +02:00
Fabio Berger
f8dbf57582
Rename assetProxyUtils to assetDataUtils
2018-07-17 15:26:55 +02:00
Leonid Logvinov
c59cd36da6
Make downlevelIteration a global config
2018-07-17 15:25:20 +02:00
Fabio Berger
15e92958d6
Merge pull request #875 from 0xProject/fix-order-watcher
...
OrderWatcher Fixes
2018-07-17 13:47:23 +02:00
Leonid Logvinov
96c648c4b4
Fix tests descriptions
2018-07-17 13:29:59 +02:00
Fabio Berger
f56a7d0cb2
Fix linter
2018-07-17 13:29:36 +02:00
Leonid Logvinov
01e617bb83
DRY up the code in order-watcher collision-resistant abi decoder
2018-07-17 13:28:27 +02:00
Fabio Berger
59fd5c69c0
Remove no-longer needed tests
2018-07-17 13:27:41 +02:00
Leonid Logvinov
28a9a8c380
Await transactions in fillScenarios
2018-07-17 13:26:49 +02:00
Leonid Logvinov
6c2796b433
Rename decodeAssetData to decodeAssetDataOrThrow
2018-07-17 13:16:47 +02:00
Leonid Logvinov
82ad5f7897
Use normalizedAddress
2018-07-17 13:13:05 +02:00
Leonid Logvinov
bf8ac3b9e6
Fix tslint issues
2018-07-17 12:59:02 +02:00
Leonid Logvinov
edcdc9b1b9
Upgrade tslint to the newest version
2018-07-17 12:58:42 +02:00
Leonid Logvinov
4227aaa68a
Add new tslint rules
2018-07-17 12:58:04 +02:00
Fabio Berger
b750ce8be6
Stop subscriptions from unsubscribing on recoverable network issues
2018-07-17 12:33:43 +02:00
Fabio Berger
03a6a088c5
Merge branch 'v2-prototype' into fix-order-watcher
...
* v2-prototype: (39 commits)
Add chris to website
Fix ocean link
Move update onboarding step tracking to onboarding flow code
Bump npm-run-all from 4.1.2 to 4.1.3
Move format to helper function
Fix linter
Add assertion to make sure caller to fetchAsync isn't trying to set timeout in a context-specific way
Fix linter issues
Remove unused import
Switch conditional
Update yarn.lock and artifact
Fix abi-gen tests to not rely on sleep, since it causes intermittent failures
Add missing assertion
Move type defs to typescript-typingsd
Fix linter
Make createFinalPayload protected
Replace process.browser with detect-node library
Export Web3ProviderEngine and RPCSubprovider from 0x.js
Export Web3ProviderEngine from subproviders package
Update deps
...
2018-07-17 12:06:35 +02:00
Fabio Berger
1e787a7646
Remove stateLayer OrderWatcher config and instead temporarily hard-code until we get pending block to work with Blockstream
2018-07-17 12:04:29 +02:00
