Fabio Berger
|
9dc4ec6fb5
|
Fix prettier
|
2018-04-25 18:07:22 +09:00 |
|
Fabio Berger
|
0baaf1767b
|
Fix merge conflict issues
|
2018-04-24 20:01:04 +09:00 |
|
Fabio Berger
|
eab76c5819
|
Fix @types/react version to avoid accidental minor version bumps with breaking changes
|
2018-04-24 19:54:22 +09:00 |
|
Fabio Berger
|
ebd6f7ace0
|
Merge pull request #549 from 0xProject/feature/contracts/combineAssetProxyDispatcher
Merge Exchange and AssetProxyDispatcher (depends on #548)
|
2018-04-24 18:38:11 +09:00 |
|
Fabio Berger
|
a6d5cd4b39
|
Fix CI failures caused by Webkit css properties not being recognized by React types. This is a hack.
|
2018-04-24 17:38:25 +09:00 |
|
Fabio Berger
|
4c5a632095
|
Revert "Fix CI test failure"
This reverts commit 870693b968.
|
2018-04-24 17:28:18 +09:00 |
|
Fabio Berger
|
870693b968
|
Fix CI test failure
|
2018-04-24 16:54:08 +09:00 |
|
Fabio Berger
|
b24b98a365
|
merge v2-prototype
|
2018-04-24 16:51:32 +09:00 |
|
Fabio Berger
|
fd041e2997
|
Merge pull request #548 from 0xProject/refactor/contracts/test-cleanup
Cleanup tests
|
2018-04-24 16:46:40 +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
|
a8a0a5cbfb
|
Combine Exchange with AssetProxyDispatcher
|
2018-04-23 10:50:09 -07:00 |
|
Amir Bandeali
|
32e77753b5
|
Define numbers of dummy tokens to deploy in constants
|
2018-04-23 09:57:13 -07:00 |
|
Amir Bandeali
|
f427a736a3
|
Remove type assertions
|
2018-04-23 09:57:13 -07:00 |
|
Amir Bandeali
|
afb02b8bd1
|
Fix and cleanup tests
|
2018-04-23 09:57:13 -07:00 |
|
Amir Bandeali
|
48b44342ab
|
Add ERC721 wrapper
|
2018-04-23 09:57:13 -07:00 |
|
Amir Bandeali
|
1f968fa4fd
|
Add ERC20Wrapper
|
2018-04-23 09:57:13 -07:00 |
|
Amir Bandeali
|
ebf5077e1a
|
Merge pull request #547 from 0xProject/refactor/contracts/cleanup
Cleanup contracts
|
2018-04-23 09:56:20 -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
|
46653a0268
|
Reorder event args
|
2018-04-21 17:31:17 -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
|
63abf34664
|
Rename Token => IERC20Token
|
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
|
aa3be51980
|
Fix names and visibilities, use address type over contract type for function args and returns
|
2018-04-21 17:31:11 -07:00 |
|
Amir Bandeali
|
fe6c77cafb
|
Remove unused constructor arguments
|
2018-04-21 15:42:09 -07:00 |
|
Amir Bandeali
|
67117913dd
|
Add presigned signature type
|
2018-04-20 13:57:18 -07:00 |
|
Amir Bandeali
|
e532f2c165
|
Fix zeppelin imports, run prettier
|
2018-04-20 13:57:18 -07:00 |
|
Greg Hysen
|
a0c7da95c2
|
Added tests for (most functions in) LibBytes. The write methods are not currently compatible with our generated contract wrappers.
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
95dbc0f5bc
|
Added description for the DummyERC721Token constructor
|
2018-04-20 13:56:18 -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
|
ac0c35424b
|
Reverting earlier change: interfaces now inherit from other interfaces
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
41242a6660
|
Clarified that 0x0 could be passed into AssetProxyDispatcher
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
e80f203efc
|
Inlined decodeMetadata in the proxies and removed encodeMetadata (already exists in Typescript). This simplifies the code.
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
dbd65cdb04
|
Added @TODO for safeTransferFrom support in ERC721 proxy
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
e4dd33a675
|
Removed outdated TODO comment in MixinSettlementProxy
|
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
|
2a8fc705c7
|
Commented out 0x.js tests until migration package is ready.
|
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
|
436a6605fb
|
Updated commenting. Noted that transferFrom succeeds or throws on all transferFrom implementations.
|
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
|
dfe6b2844b
|
Reverted change that allowed ERC721 transfer proxy to be called with amount 0. This now throws.
|
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
|
167654c9a0
|
Added clarity to not-authorized test case in dispatcher
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
6d6179fb2c
|
toUnsigned -> toBuffer in assetProxyUtils
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
80d06d358a
|
Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves 900 gas
|
2018-04-20 13:56:18 -07:00 |
|