Greg Hysen
|
28678214d2
|
TS styles in core contract tests
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
f75d03c9ae
|
Added more comments to proxy tests
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
51508a732d
|
Cleaned up TS in dispatcher tests
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
326d8d3976
|
Proxy Metadata -> Data
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
f559a5510b
|
Cleaning up some wording
|
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
|
a0dfdefd16
|
ethereum-js for encoding/decoding asset proxy data
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
e7b0c24d9d
|
Added memory to bytes arrays, where possible
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
1707f1940d
|
Replaced read/write Uint256 with generic bytes32, plus casting
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
5dd708aae8
|
Updated public -> external
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
2477ea2fcf
|
Removed unused dependency
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
9b624a884b
|
snake case to camel case
|
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
|
564ddff4c7
|
IAssetProxyDispatcher to IAssetProxy in MixinSettlement layer + allowing 0-condition in ERC721 transfer
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
023ea94f07
|
Removed Log prefix from events
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
adad76eca6
|
Removed unnecessary assetProxyManagerAddress
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
772bb65237
|
removed unnecessary import
|
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
|
86f79949ea
|
ERC20 V1 proxy compiling
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
219d6c294d
|
Changed order of write parameters in LibBytes. Now ordered by most generalized to most specific
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
78d81f193f
|
Asset Proxy Dispatcher
|
2018-04-20 13:56:17 -07:00 |
|
Fabio Berger
|
f9d4966000
|
Fix merge
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
ad2289935d
|
Use addFillResults function and add comments to all marketFill functions
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
fd47b3fac5
|
Fix EtherDelta imports
|
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
|
8b5b371821
|
Return all amounts traded and fees paid
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
0c74a3bc66
|
Add tests for marketBuyOrders
|
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 |
|
Amir Bandeali
|
7a66da5a51
|
Fix build errors
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
3541f5e1da
|
Separate filled/cancelled errors
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
8f809e3a29
|
Remove partial cancels
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
3f76985435
|
updated test name to reflect smart contracts
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
751f9b9240
|
Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that orders with salt <= to maker epoch will be cancelled (previously, it was salt < maker epoch)
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
1efba5979f
|
Renamed all instances of timestamp to salt. Clarified test case wording.
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
bf3c4f4743
|
Fixed spacing
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
aeb0742434
|
Implementation and tests in the protocol for cancelling all orders up to a specific time
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
1729cfaea9
|
Update copyright headers
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
56ade9c44e
|
Add private keys for testrpc mnemonic
|
2018-04-20 13:56:17 -07:00 |
|
Amir Bandeali
|
6db0b2e398
|
Address feedback and lint
|
2018-04-20 13:56:16 -07:00 |
|
Amir Bandeali
|
2bd1ddd129
|
Add tests for fillOrderNoThrow based functions
|
2018-04-20 13:56:16 -07:00 |
|
Amir Bandeali
|
20a37bdd1d
|
Fix fillOrderNoThrow
|
2018-04-20 13:56:16 -07:00 |
|
Amir Bandeali
|
234447cb3d
|
Add logging to testrpc script
|
2018-04-20 13:56:16 -07:00 |
|
Amir Bandeali
|
97232145a4
|
Fix package.json
|
2018-04-20 13:56:16 -07:00 |
|
Amir Bandeali
|
056ec6d2b3
|
Bump Solidity version to 0.4.21
|
2018-04-20 13:56:16 -07:00 |
|