Alex Browne
|
2c496a92ad
|
Add awaitTransactionMinedAsync after every sent transaction
|
2018-05-21 16:52:49 -07:00 |
|
Alex Browne
|
4ca8903a21
|
Add missing blockchainLifecycle calls to contracts tests
|
2018-05-21 16:52:49 -07:00 |
|
Greg Hysen
|
d460c0e8b9
|
Merge pull request #572 from 0xProject/feature/contracts/atomicMatching
Atomic Order Matching
|
2018-05-21 14:29:56 -07:00 |
|
Fabio Berger
|
0fdf32cf6f
|
merge development
|
2018-05-21 13:38:12 -07:00 |
|
Greg Hysen
|
8c1ae35088
|
Rebased against v2-prototype
|
2018-05-18 17:05:36 -07:00 |
|
Greg Hysen
|
9b1015bbce
|
Atomic Order Matching - Tests
|
2018-05-18 17:01:05 -07:00 |
|
Alex Browne
|
251218af8b
|
Use make-promises-safe to catch unhandled rejections in tests
|
2018-05-16 17:36:37 -07:00 |
|
Amir Bandeali
|
9e0471bfbb
|
Merge branch 'development' into v2-prototype
|
2018-05-15 15:52:49 -04:00 |
|
Leonid Logvinov
|
e972ed8456
|
Fix linter errors
|
2018-05-10 18:12:34 +02:00 |
|
Leonid Logvinov
|
f854f3ee2b
|
Remove unused deployer docs configs
|
2018-05-10 17:47:38 +02:00 |
|
Leonid Logvinov
|
75d24dea0e
|
Fix linter issues
|
2018-05-10 17:47:38 +02:00 |
|
Leonid Logvinov
|
3d58b38e4e
|
Remove deployer from metacoin and contract tests
|
2018-05-10 17:46:57 +02:00 |
|
Fabio Berger
|
0baaf1767b
|
Fix merge conflict issues
|
2018-04-24 20:01:04 +09:00 |
|
Fabio Berger
|
b24b98a365
|
merge v2-prototype
|
2018-04-24 16:51:32 +09:00 |
|
Amir Bandeali
|
27a44f0e77
|
Rename variables, create private validation methods in token wrappers
|
2018-04-23 23:23:01 -07:00 |
|
Amir Bandeali
|
432b064601
|
Fix tests
|
2018-04-23 10:50:09 -07:00 |
|
Amir Bandeali
|
afb02b8bd1
|
Fix and cleanup tests
|
2018-04-23 09:57:13 -07:00 |
|
Amir Bandeali
|
7d26b96d42
|
Rename proxyUtils => assetProxyUtils
|
2018-04-22 18:53:13 -07:00 |
|
Amir Bandeali
|
08208acf53
|
Rename missed variables
|
2018-04-22 14:44:56 -07:00 |
|
Amir Bandeali
|
fcef1819b1
|
Add missing async suffix
|
2018-04-21 17:31:17 -07:00 |
|
Amir Bandeali
|
3335fc7baf
|
Rename token => asset
|
2018-04-21 17:31:17 -07:00 |
|
Amir Bandeali
|
120ca5b1ec
|
Rename DummyToken => DummyERC20Token
|
2018-04-21 17:31:17 -07:00 |
|
Amir Bandeali
|
1c94ab7cc3
|
export proxyUtils instead of individual functions
|
2018-04-21 17:31:17 -07:00 |
|
Amir Bandeali
|
fe6c77cafb
|
Remove unused constructor arguments
|
2018-04-21 15:42:09 -07:00 |
|
Greg Hysen
|
ab13ce96cc
|
Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less confusion. Also updated the function description.
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
0e3544e1f9
|
Miscellaneous style changes to the contracts package; specifically tests
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
f4589b5bd4
|
Ran prettier
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
3b7068e8d0
|
renaming after tokenTransferProxy was removed
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
c19fb1dffc
|
Removed ERC20 V1 Proxy + TokenTransferProxy
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
84eddc3d94
|
switched to constants in default order params.
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
6be5fe928e
|
Removed takerTokenAddress and makerTokenAddress from Order struct.
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
cf8523da5f
|
Moved ERC721 FillOrderNoThrow tests into wrapper
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
10707ebc3a
|
Style improvements to the Asset Proxy tests
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
8374a51e6a
|
Replaced instances of accounts[0] with owner in contracts test cases
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
4e093369f6
|
Updated ERC20 v1 proxy names in tests
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
be8e8791b7
|
Ran prettier/linter on new contract tests
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
28678214d2
|
TS styles in core contract tests
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
bf8b123dfc
|
Removed some unused ERC721 tokens
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
32a7442845
|
Minor style improvements to asset proxy utils
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
bc7672652e
|
makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
cc77f8489e
|
nilAddress to ZeroEx.NULL_ADDRESS
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
adad76eca6
|
Removed unnecessary assetProxyManagerAddress
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
d72a731865
|
setAssetProxy to addAssetProxy
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
f35fe56d9b
|
Renamed TransferProxy to Proxy
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
1ab70f130d
|
Renaming TransferProxy to Proxy
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
78d81f193f
|
Asset Proxy Dispatcher
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
84d836f22b
|
Add back require statements and tests (will move to another PR)
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
5d05a2da74
|
Revert variable naming
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
2f639b77bb
|
Update Solidity syntax and comments
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
75f77f3e86
|
Add marketBuyOrders, rename variables, and fx old tests
|
2018-04-20 13:56:17 -07:00 |
|