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
|
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
|
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
|
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 |
|
Greg Hysen
|
1cace49b74
|
address -> IAssetProxy where possible for clarity
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
7ab5442163
|
Reverted to calling read/write uint256
|
2018-04-20 13:56:18 -07:00 |
|
Greg Hysen
|
4e48de1116
|
Minor changes to typescript tests
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
b3b29f527e
|
Minor fixes to the contracts
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
37cfeed0f5
|
Rearranged preconditions in ERC721 proxy
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
cb27fe17cd
|
Changed order of encode/decode functions in token proxies
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
682ab76ba1
|
Updated name of AssetProxyChanged -> AssetProxySet
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
c811b710eb
|
Explicity declare memory for complex types, where possible
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
d0930b9048
|
Improved readability of FillOrderNoThrow II
|
2018-04-20 13:56:17 -07:00 |
|
Greg Hysen
|
591645758a
|
Improved readability of FillOrderNoThrow
|
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
|
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
|
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
|
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
|
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 |
|
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 |
|