Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Move TokenRegistry to 'previous' directory | Amir Bandeali | 2018-04-27 | 2 | -2/+2 |
| | |||||
* | Make all lib functions internal, add contracts for testing | Amir Bandeali | 2018-04-27 | 19 | -271/+448 |
| | |||||
* | Add LibFillResults | Amir Bandeali | 2018-04-27 | 11 | -78/+107 |
| | |||||
* | Add ERC721 contracts from zeppelin-solidity | Amir Bandeali | 2018-04-27 | 6 | -4/+574 |
| | |||||
* | Merge pull request #498 from 0xProject/feature/contracts/takerAbstraction | Amir Bandeali | 2018-04-27 | 12 | -48/+489 |
|\ | | | | | Sender abstraction | ||||
| * | Add tests and comments | Amir Bandeali | 2018-04-27 | 5 | -31/+50 |
| | | |||||
| * | Add tests | Amir Bandeali | 2018-04-27 | 1 | -4/+38 |
| | | |||||
| * | Update tests and utils | Amir Bandeali | 2018-04-27 | 7 | -1/+226 |
| | | |||||
| * | Implement sender abstraction | Amir Bandeali | 2018-04-27 | 6 | -47/+210 |
|/ | |||||
* | Remove remenants of MaliciousToken contract | Fabio Berger | 2018-04-26 | 3 | -3/+2 |
| | |||||
* | Fix prettier | Fabio Berger | 2018-04-25 | 1 | -3/+9 |
| | |||||
* | Fix merge conflict issues | Fabio Berger | 2018-04-24 | 2 | -2/+0 |
| | |||||
* | Fix @types/react version to avoid accidental minor version bumps with ↵ | Fabio Berger | 2018-04-24 | 5 | -13/+7 |
| | | | | breaking changes | ||||
* | Merge pull request #549 from ↵ | Fabio Berger | 2018-04-24 | 18 | -253/+186 |
|\ | | | | | | | | | 0xProject/feature/contracts/combineAssetProxyDispatcher Merge Exchange and AssetProxyDispatcher (depends on #548) | ||||
| * | Fix CI failures caused by Webkit css properties not being recognized by ↵ | Fabio Berger | 2018-04-24 | 1 | -7/+12 |
| | | | | | | | | React types. This is a hack. | ||||
| * | Revert "Fix CI test failure" | Fabio Berger | 2018-04-24 | 1 | -10/+7 |
| | | | | | | | | This reverts commit 870693b968de3f29b0ac97f6f92715613e1064e3. | ||||
| * | Fix CI test failure | Fabio Berger | 2018-04-24 | 1 | -7/+10 |
| | | |||||
| * | merge v2-prototype | Fabio Berger | 2018-04-24 | 8 | -285/+309 |
| |\ | |/ |/| | |||||
* | | Merge pull request #548 from 0xProject/refactor/contracts/test-cleanup | Fabio Berger | 2018-04-24 | 14 | -803/+971 |
|\ \ | | | | | | | Cleanup tests | ||||
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 8 | -286/+308 |
| | | | |||||
| | * | Fix tests | Amir Bandeali | 2018-04-24 | 10 | -181/+116 |
| | | | |||||
| | * | Combine Exchange with AssetProxyDispatcher | Amir Bandeali | 2018-04-24 | 7 | -67/+58 |
| |/ | |||||
| * | Define numbers of dummy tokens to deploy in constants | Amir Bandeali | 2018-04-24 | 3 | -2/+4 |
| | | |||||
| * | Remove type assertions | Amir Bandeali | 2018-04-24 | 1 | -18/+12 |
| | | |||||
| * | Fix and cleanup tests | Amir Bandeali | 2018-04-24 | 8 | -673/+587 |
| | | |||||
| * | Add ERC721 wrapper | Amir Bandeali | 2018-04-24 | 2 | -20/+161 |
| | | |||||
| * | Add ERC20Wrapper | Amir Bandeali | 2018-04-24 | 3 | -32/+127 |
|/ | |||||
* | Merge pull request #547 from 0xProject/refactor/contracts/cleanup | Amir Bandeali | 2018-04-24 | 36 | -1202/+1028 |
|\ | | | | | Cleanup contracts | ||||
| * | Rename proxyUtils => assetProxyUtils | Amir Bandeali | 2018-04-23 | 6 | -57/+57 |
| | | |||||
| * | Rename missed variables | Amir Bandeali | 2018-04-23 | 7 | -274/+274 |
| | | |||||
| * | Reorder event args | Amir Bandeali | 2018-04-22 | 1 | -10/+10 |
| | | |||||
| * | Add missing async suffix | Amir Bandeali | 2018-04-22 | 2 | -12/+12 |
| | | |||||
| * | Rename token => asset | Amir Bandeali | 2018-04-22 | 15 | -656/+656 |
| | | |||||
| * | Rename Token => IERC20Token | Amir Bandeali | 2018-04-22 | 8 | -156/+48 |
| | | |||||
| * | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 14 | -108/+61 |
| | | |||||
| * | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 6 | -85/+83 |
| | | |||||
| * | Fix names and visibilities, use address type over contract type for function ↵ | Amir Bandeali | 2018-04-22 | 5 | -22/+21 |
| | | | | | | | | args and returns | ||||
| * | Remove unused constructor arguments | Amir Bandeali | 2018-04-22 | 5 | -34/+18 |
|/ | |||||
* | Add presigned signature type | Amir Bandeali | 2018-04-21 | 1 | -1/+29 |
| | |||||
* | Fix zeppelin imports, run prettier | Amir Bandeali | 2018-04-21 | 6 | -265/+275 |
| | |||||
* | Added tests for (most functions in) LibBytes. The write methods are not ↵ | Greg Hysen | 2018-04-21 | 3 | -2/+241 |
| | | | | currently compatible with our generated contract wrappers. | ||||
* | Added description for the DummyERC721Token constructor | Greg Hysen | 2018-04-21 | 1 | -0/+6 |
| | |||||
* | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less ↵ | Greg Hysen | 2018-04-21 | 6 | -29/+33 |
| | | | | confusion. Also updated the function description. | ||||
* | Reverting earlier change: interfaces now inherit from other interfaces | Greg Hysen | 2018-04-21 | 2 | -2/+10 |
| | |||||
* | Clarified that 0x0 could be passed into AssetProxyDispatcher | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
| | |||||
* | Inlined decodeMetadata in the proxies and removed encodeMetadata (already ↵ | Greg Hysen | 2018-04-21 | 3 | -132/+5 |
| | | | | exists in Typescript). This simplifies the code. | ||||
* | Added @TODO for safeTransferFrom support in ERC721 proxy | Greg Hysen | 2018-04-21 | 1 | -0/+2 |
| | |||||
* | Removed outdated TODO comment in MixinSettlementProxy | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
| | |||||
* | Miscellaneous style changes to the contracts package; specifically tests | Greg Hysen | 2018-04-21 | 9 | -24/+40 |
| | |||||
* | Ran prettier | Greg Hysen | 2018-04-21 | 4 | -58/+15 |
| | |||||
* | renaming after tokenTransferProxy was removed | Greg Hysen | 2018-04-21 | 4 | -127/+127 |
| | |||||
* | Commented out 0x.js tests until migration package is ready. | Greg Hysen | 2018-04-21 | 1 | -1/+2 |
| | |||||
* | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 17 | -631/+82 |
| | |||||
* | Updated commenting. Noted that transferFrom succeeds or throws on all ↵ | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
| | | | | transferFrom implementations. | ||||
* | switched to constants in default order params. | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
| | |||||
* | Reverted change that allowed ERC721 transfer proxy to be called with amount ↵ | Greg Hysen | 2018-04-21 | 2 | -14/+10 |
| | | | | 0. This now throws. | ||||
* | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 10 | -239/+237 |
| | |||||
* | Added clarity to not-authorized test case in dispatcher | Greg Hysen | 2018-04-21 | 1 | -3/+4 |
| | |||||
* | toUnsigned -> toBuffer in assetProxyUtils | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves ↵ | Greg Hysen | 2018-04-21 | 1 | -5/+17 |
| | | | | 900 gas | ||||
* | address -> IAssetProxy where possible for clarity | Greg Hysen | 2018-04-21 | 2 | -13/+13 |
| | |||||
* | Reverted to calling read/write uint256 | Greg Hysen | 2018-04-21 | 2 | -2/+28 |
| | |||||
* | More testing of common functionality across proxies | Greg Hysen | 2018-04-21 | 1 | -19/+58 |
| | |||||
* | Updates to proxy tests. | Greg Hysen | 2018-04-21 | 1 | -13/+13 |
| | |||||
* | More authorized -> owner in test comments | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | |||||
* | Removed unnecessary deployments in test | Greg Hysen | 2018-04-21 | 1 | -17/+1 |
| | |||||
* | Moved ERC721 FillOrderNoThrow tests into wrapper | Greg Hysen | 2018-04-21 | 2 | -45/+60 |
| | |||||
* | Style improvements to the Asset Proxy tests | Greg Hysen | 2018-04-21 | 2 | -134/+140 |
| | |||||
* | Replaced instances of `accounts[0]` with `owner` in contracts test cases | Greg Hysen | 2018-04-21 | 5 | -23/+26 |
| | |||||
* | Minor changes to typescript tests | Greg Hysen | 2018-04-21 | 3 | -8/+6 |
| | |||||
* | Minor fixes to the contracts | Greg Hysen | 2018-04-21 | 3 | -2/+5 |
| | |||||
* | Rearranged preconditions in ERC721 proxy | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | |||||
* | Changed order of encode/decode functions in token proxies | Greg Hysen | 2018-04-21 | 3 | -36/+36 |
| | |||||
* | Updated name of AssetProxyChanged -> AssetProxySet | Greg Hysen | 2018-04-21 | 3 | -3/+4 |
| | |||||
* | Explicity declare `memory` for complex types, where possible | Greg Hysen | 2018-04-21 | 3 | -5/+5 |
| | |||||
* | Improved readability of FillOrderNoThrow II | Greg Hysen | 2018-04-21 | 1 | -15/+15 |
| | |||||
* | Improved readability of FillOrderNoThrow | Greg Hysen | 2018-04-21 | 1 | -4/+4 |
| | |||||
* | Updated ERC20 v1 proxy names in tests | Greg Hysen | 2018-04-21 | 5 | -10/+10 |
| | |||||
* | Ran prettier/linter on new contract tests | Greg Hysen | 2018-04-21 | 3 | -4/+0 |
| | |||||
* | Added comments around deploying contracts to helper/wrapper tests | Greg Hysen | 2018-04-21 | 2 | -65/+34 |
| | |||||
* | TS styles in core contract tests | Greg Hysen | 2018-04-21 | 1 | -91/+38 |
| | |||||
* | Added more comments to proxy tests | Greg Hysen | 2018-04-21 | 1 | -52/+25 |
| | |||||
* | Cleaned up TS in dispatcher tests | Greg Hysen | 2018-04-21 | 1 | -44/+36 |
| | |||||
* | Proxy Metadata -> Data | Greg Hysen | 2018-04-21 | 2 | -9/+9 |
| | |||||
* | Cleaning up some wording | Greg Hysen | 2018-04-21 | 5 | -28/+26 |
| | |||||
* | Removed some unused ERC721 tokens | Greg Hysen | 2018-04-21 | 1 | -62/+13 |
| | |||||
* | Minor style improvements to asset proxy utils | Greg Hysen | 2018-04-21 | 6 | -72/+65 |
| | |||||
* | ethereum-js for encoding/decoding asset proxy data | Greg Hysen | 2018-04-21 | 1 | -41/+32 |
| | |||||
* | Added memory to bytes arrays, where possible | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
| | |||||
* | Replaced read/write Uint256 with generic bytes32, plus casting | Greg Hysen | 2018-04-21 | 4 | -16/+16 |
| | |||||
* | Updated public -> external | Greg Hysen | 2018-04-21 | 6 | -9/+9 |
| | |||||
* | Removed unused dependency | Greg Hysen | 2018-04-21 | 1 | -1/+0 |
| | |||||
* | snake case to camel case | Greg Hysen | 2018-04-21 | 1 | -25/+25 |
| | |||||
* | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData | Greg Hysen | 2018-04-21 | 7 | -46/+46 |
| | |||||
* | nilAddress to ZeroEx.NULL_ADDRESS | Greg Hysen | 2018-04-21 | 5 | -27/+22 |
| | |||||
* | IAssetProxyDispatcher to IAssetProxy in MixinSettlement layer + allowing ↵ | Greg Hysen | 2018-04-21 | 3 | -7/+8 |
| | | | | 0-condition in ERC721 transfer | ||||
* | Removed Log prefix from events | Greg Hysen | 2018-04-21 | 2 | -5/+5 |
| | |||||
* | Removed unnecessary assetProxyManagerAddress | Greg Hysen | 2018-04-21 | 5 | -29/+17 |
| | |||||
* | removed unnecessary import | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
| | |||||
* | setAssetProxy to addAssetProxy | Greg Hysen | 2018-04-21 | 6 | -23/+23 |
| | |||||
* | Renamed TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 5 | -13/+14 |
| | |||||
* | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 10 | -56/+56 |
| | |||||
* | ERC20 V1 proxy compiling | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
| | |||||
* | Changed order of write parameters in LibBytes. Now ordered by most ↵ | Greg Hysen | 2018-04-21 | 4 | -10/+10 |
| | | | | generalized to most specific | ||||
* | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 30 | -164/+2473 |
| | |||||
* | Fix type issue | Fabio Berger | 2018-04-21 | 1 | -2/+2 |
| | |||||
* | Fix merge | Fabio Berger | 2018-04-21 | 1 | -2/+2 |
| | |||||
* | Use addFillResults function and add comments to all marketFill functions | Amir Bandeali | 2018-04-21 | 1 | -36/+84 |
| | |||||
* | Fix EtherDelta imports | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
| | |||||
* | Add back require statements and tests (will move to another PR) | Amir Bandeali | 2018-04-21 | 2 | -3/+50 |
| | |||||
* | Revert variable naming | Amir Bandeali | 2018-04-21 | 13 | -444/+454 |
| | |||||
* | Update Solidity syntax and comments | Amir Bandeali | 2018-04-21 | 5 | -70/+67 |
| | |||||
* | Return all amounts traded and fees paid | Amir Bandeali | 2018-04-21 | 7 | -106/+115 |
| | |||||
* | Add tests for marketBuyOrders | Amir Bandeali | 2018-04-21 | 2 | -4/+174 |
| | |||||
* | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 11 | -645/+681 |
| | |||||
* | Fix build errors | Amir Bandeali | 2018-04-21 | 5 | -29/+40 |
| | |||||
* | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 4 | -6/+8 |
| | |||||
* | Remove partial cancels | Amir Bandeali | 2018-04-21 | 8 | -141/+35 |
| | |||||
* | updated test name to reflect smart contracts | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that ↵ | Greg Hysen | 2018-04-21 | 5 | -35/+40 |
| | | | | orders with salt <= to maker epoch will be cancelled (previously, it was salt < maker epoch) | ||||
* | Renamed all instances of timestamp to salt. Clarified test case wording. | Greg Hysen | 2018-04-21 | 3 | -18/+18 |
| | |||||
* | Fixed spacing | Greg Hysen | 2018-04-21 | 4 | -56/+56 |
| | |||||
* | Implementation and tests in the protocol for cancelling all orders up to a ↵ | Greg Hysen | 2018-04-21 | 7 | -16/+134 |
| | | | | specific time | ||||
* | Fix build errors | Amir Bandeali | 2018-04-21 | 1 | -149/+190 |
| | |||||
* | Update copyright headers | Amir Bandeali | 2018-04-21 | 30 | -24/+150 |
| | |||||
* | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 5 | -70/+20 |
| | |||||
* | Address feedback and lint | Amir Bandeali | 2018-04-21 | 19 | -176/+92 |
| | |||||
* | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 3 | -130/+344 |
| | |||||
* | Fix fillOrderNoThrow | Amir Bandeali | 2018-04-21 | 1 | -29/+15 |
| | |||||
* | Add logging to testrpc script | Amir Bandeali | 2018-04-21 | 1 | -0/+1 |
| | |||||
* | Fix package.json | Amir Bandeali | 2018-04-21 | 3 | -23/+27 |
| | |||||
* | Bump Solidity version to 0.4.21 | Amir Bandeali | 2018-04-21 | 20 | -30/+29 |
| | |||||
* | Add fillOrderNoThrow to exchange wrapper and add test | Amir Bandeali | 2018-04-21 | 2 | -6/+69 |
| | |||||
* | Update formatting | Amir Bandeali | 2018-04-21 | 4 | -34/+40 |
| | |||||
* | Update fillOrderNoThrow | Amir Bandeali | 2018-04-21 | 1 | -111/+103 |
| | |||||
* | Update order utils | Amir Bandeali | 2018-04-21 | 1 | -5/+5 |
| | |||||
* | Modify tests to work with new utils | Amir Bandeali | 2018-04-21 | 4 | -584/+632 |
| | |||||
* | Add script for starting testrpc with preconfigured private keys | Amir Bandeali | 2018-04-21 | 3 | -0/+72 |
| | |||||
* | Add utils for hashing and signing orders, update wrappers | Amir Bandeali | 2018-04-21 | 6 | -53/+96 |
| | |||||
* | Modify utils to work with new signature format | Amir Bandeali | 2018-04-21 | 7 | -150/+189 |
| | |||||
* | Change order field names | Amir Bandeali | 2018-04-21 | 5 | -74/+73 |
| | |||||
* | Fix log decoding | Amir Bandeali | 2018-04-21 | 1 | -13/+13 |
| | |||||
* | Revert getOrderHash to old logic | Amir Bandeali | 2018-04-21 | 1 | -2/+16 |
| | |||||
* | Fix compile errors | Amir Bandeali | 2018-04-21 | 11 | -30/+54 |
| | |||||
* | Update fillOrderNoThrow | Remco Bloemen | 2018-04-21 | 1 | -39/+45 |
| | |||||
* | Use ABIv2 exchange core in wrapper functions | Remco Bloemen | 2018-04-21 | 1 | -55/+34 |
| | |||||
* | Implement ABIv2 in ExchangeCore | Remco Bloemen | 2018-04-21 | 2 | -60/+33 |
| | |||||
* | Implement EIP712 and ABIv2 in LibOrder | Remco Bloemen | 2018-04-21 | 1 | -20/+12 |
| | |||||
* | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -13/+14 |
| | |||||
* | Merge development | Amir Bandeali | 2018-04-21 | 1 | -105/+0 |
| | |||||
* | Run prettier | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Fix utils to work with new ABI | Amir Bandeali | 2018-04-21 | 1 | -0/+105 |
| | |||||
* | Add fillOrderNoThrow and wrapper functions | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Fix compile errors | Amir Bandeali | 2018-04-21 | 6 | -22/+22 |
| | |||||
* | Fix spelling of latter | Remco Bloemen | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Add offset to signature | Remco Bloemen | 2018-04-21 | 1 | -11/+13 |
| | |||||
* | Document noThrow wrapper and correct fixed array offset | Remco Bloemen | 2018-04-21 | 1 | -39/+81 |
| | |||||
* | Add Trezor signatures | Remco Bloemen | 2018-04-21 | 1 | -0/+23 |
| | |||||
* | Add Todos | Remco Bloemen | 2018-04-21 | 2 | -0/+3 |
| | |||||
* | Fix documentation | Remco Bloemen | 2018-04-21 | 1 | -3/+3 |
| | |||||
* | Verify length on EIP712 signatures | Remco Bloemen | 2018-04-21 | 1 | -1/+2 |
| | |||||
* | Remove unused return value | Remco Bloemen | 2018-04-21 | 1 | -3/+0 |
| | |||||
* | Spelling fixes | Remco Bloemen | 2018-04-21 | 1 | -7/+8 |
| | |||||
* | Add documentation | Remco Bloemen | 2018-04-21 | 1 | -2/+16 |
| | |||||
* | Make wrappers external again | Remco Bloemen | 2018-04-21 | 1 | -2/+2 |
| | |||||
* | Explicit returns | Remco Bloemen | 2018-04-21 | 1 | -5/+6 |
| | |||||
* | Revert cancel order signature abstraction | Remco Bloemen | 2018-04-21 | 1 | -7/+2 |
| | |||||
* | Fix hash argument name | Remco Bloemen | 2018-04-21 | 1 | -2/+2 |
| | |||||
* | Fix batchFillOrdersNoThrow name | Remco Bloemen | 2018-04-21 | 1 | -1/+1 |
| | |||||
* | Fix input length in fillOrderNoThrow | Remco Bloemen | 2018-04-21 | 1 | -6/+11 |
| | |||||
* | Add SignatureType.Invalid and documentation | Remco Bloemen | 2018-04-21 | 1 | -0/+21 |
| | |||||
* | Make first value illegal | Remco Bloemen | 2018-04-21 | 1 | -6/+4 |
| | |||||
* | Implement EIP712 at verify-signature call site | Remco Bloemen | 2018-04-21 | 3 | -25/+19 |
| | |||||
* | Cancel signature abstraction | Remco Bloemen | 2018-04-21 | 1 | -3/+10 |
| | |||||
* | Cache order maker signature (ZEIP-15) | Remco Bloemen | 2018-04-21 | 1 | -8/+10 |
| | |||||
* | Add EIP712 signatures (implements ZEIP-17) | Remco Bloemen | 2018-04-21 | 1 | -4/+40 |
| | |||||
* | Add external contract call signatures (relates to ZEIP 1 and 7) | Remco Bloemen | 2018-04-21 | 2 | -1/+36 |
| | |||||
* | Revert after cascade | Remco Bloemen | 2018-04-21 | 1 | -6/+7 |
| | |||||
* | Add 'caller' signature type | Remco Bloemen | 2018-04-21 | 1 | -17/+35 |
| | |||||
* | Abstract signature to opaque bytearray | Remco Bloemen | 2018-04-21 | 7 | -161/+148 |
| | |||||
* | Use interfaces for contract types | Remco Bloemen | 2018-04-21 | 3 | -36/+33 |
| | |||||
* | Use new logDecoder interface | Amir Bandeali | 2018-04-21 | 2 | -10/+13 |
| | |||||
* | Rename variables | Amir Bandeali | 2018-04-21 | 2 | -27/+27 |
| | |||||
* | Move log decoding logic to exchange wrapper | Amir Bandeali | 2018-04-21 | 2 | -21/+48 |
| | |||||
* | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 5 | -144/+158 |
| | |||||
* | Move utils dir into src | Amir Bandeali | 2018-04-21 | 22 | -59/+54 |
| | |||||
* | Merge development | Amir Bandeali | 2018-04-21 | 5 | -123/+15 |
| | |||||
* | Run prettier | Amir Bandeali | 2018-04-21 | 4 | -26/+9 |
| | |||||
* | Get tests to build | Amir Bandeali | 2018-04-21 | 2 | -173/+150 |
| | |||||
* | Fix utils to work with new ABI | Amir Bandeali | 2018-04-21 | 5 | -68/+148 |
| | |||||
* | Add fillOrderNoThrow and wrapper functions | Amir Bandeali | 2018-04-21 | 10 | -285/+386 |
| | |||||
* | Move order settlement to MSettlement | Remco Bloemen | 2018-04-21 | 4 | -59/+68 |
| | |||||
* | Exchange refactor using mixin pattern | Remco Bloemen | 2018-04-21 | 11 | -578/+873 |
| | |||||
* | Fix compiler warnings | Remco Bloemen | 2018-04-21 | 1 | -4/+6 |
| | |||||
* | Update exchange to use interfaces and current SafeMath | Remco Bloemen | 2018-04-21 | 1 | -7/+7 |
| | |||||
* | Copy Exchange and deps to previous as Exchange_v1 | Remco Bloemen | 2018-04-21 | 4 | -0/+995 |
| | |||||
* | Add interfaces for Exchange, TokenRegistery and TokenTransferProxy | Remco Bloemen | 2018-04-21 | 5 | -0/+563 |
| | |||||
* | Merge pull request #545 from 0xProject/feature/deployer/solidity-0.4.23 | Amir Bandeali | 2018-04-21 | 6 | -6/+16 |
|\ | | | | | Feature/deployer/solidity 0.4.23 | ||||
| * | Fix getABIEncodedTransactionData in contract templates | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
| | | |||||
| * | Add support for solidity 0.4.23 | Amir Bandeali | 2018-04-21 | 5 | -5/+15 |
|/ | |||||
* | Merge pull request #543 from 0xProject/feature/website/integrate-relayer-info | Brandon Millman | 2018-04-21 | 4 | -103/+125 |
|\ | | | | | Integrate relayer index with website backend | ||||
| * | Add specific render path for error and loading | Brandon Millman | 2018-04-21 | 1 | -5/+7 |
| | | |||||
| * | Integrate relayer index with website backend | Brandon Millman | 2018-04-20 | 4 | -103/+123 |
| | | |||||
* | | Merge pull request #540 from 0xProject/feature/abi-gen/tuple-return-types | Jacob Evans | 2018-04-20 | 15 | -23/+90 |
|\ \ | | | | | | | Support Tuples returned from functions | ||||
| * | | Remove ethers-contracts types | Jacob Evans | 2018-04-20 | 3 | -30/+2 |
| | | | |||||
| * | | Update CHANGELOGs | Jacob Evans | 2018-04-19 | 6 | -15/+31 |
| | | | |||||
| * | | Interface for EventDescription renamed topics | Jacob Evans | 2018-04-19 | 2 | -2/+2 |
| | | | |||||
| * | | Use ethers in abi_decoder utils | Jacob Evans | 2018-04-19 | 2 | -4/+4 |
| | | | |||||
| * | | Add ethers to web3-wrapper | Jacob Evans | 2018-04-19 | 1 | -0/+1 |
| | | | |||||
| * | | Update 0x.js package json for ethers | Jacob Evans | 2018-04-19 | 1 | -1/+1 |
| | | | |||||
| * | | Update ethers in metacoin project | Jacob Evans | 2018-04-19 | 1 | -1/+1 |
| | | | |||||
| * | | Support Tuples from function returns | Jacob Evans | 2018-04-19 | 7 | -15/+93 |
| | | | |||||
* | | | Add ImToken to landing page | Fabio Berger | 2018-04-19 | 3 | -7/+7 |
| | | | |||||
* | | | Merge pull request #526 from 0xProject/fix/expiration-watcher | Fabio Berger | 2018-04-19 | 7 | -11/+68 |
|\ \ \ | |_|/ |/| | | Fix expiration watcher comparator | ||||
| * | | Merge branch 'development' into fix/expiration-watcher | Fabio Berger | 2018-04-19 | 12 | -75/+148 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Publish Updated CHANGELOGS Move @0xproject/migrations to devDependencies Publish Updated CHANGELOGS Make @0xproject/migrations public # Conflicts: # packages/0x.js/CHANGELOG.json # packages/0x.js/package.json | ||||
| * | | Remove hack above migrations package | Fabio Berger | 2018-04-19 | 1 | -3/+0 |
| | | | |||||
| * | | Fix expiration watcher comparator | Leonid Logvinov | 2018-04-18 | 7 | -12/+72 |
| | | | |||||
* | | | Merge pull request #539 from 0xProject/feature/website/backend-client | Brandon Millman | 2018-04-19 | 7 | -52/+123 |
|\ \ \ | | | | | | | | | Implement backendClient object to unify calls to the portal api | ||||
| * | | | Implement backendClient object to unify calls to the portal api | Brandon Millman | 2018-04-19 | 7 | -52/+123 |
| | | | | |||||
* | | | | Merge pull request #534 from 0xProject/feature/website/integrate-prices | Brandon Millman | 2018-04-19 | 2 | -39/+80 |
|\| | | | |_|/ |/| | | Add price information to wallet | ||||
| * | | Add price information to wallet | Brandon Millman | 2018-04-18 | 2 | -39/+80 |
| | | | |||||
* | | | Publishcontracts@2.1.25@0xproject/website@0.0.28@0xproject/testnet-faucets@1.0.26@0xproject/sra-report@0.0.11 | Leonid Logvinov | 2018-04-19 | 5 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.36.3 - contracts@2.1.25 - @0xproject/sra-report@0.0.11 - @0xproject/testnet-faucets@1.0.26 - @0xproject/website@0.0.28 | ||||
* | | | Updated CHANGELOGS | Leonid Logvinov | 2018-04-19 | 4 | -1/+19 |
| | | | |||||
* | | | Move @0xproject/migrations to devDependencies | Leonid Logvinov | 2018-04-19 | 2 | -3/+9 |
| | | | |||||
* | | | Publishcontracts@2.1.24@0xproject/website@0.0.27@0xproject/testnet-faucets@1.0.25@0xproject/sra-report@0.0.10@0xproject/migrations@0.0.3 | Leonid Logvinov | 2018-04-19 | 6 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.36.2 - contracts@2.1.24 - @0xproject/migrations@0.0.3 - @0xproject/sra-report@0.0.10 - @0xproject/testnet-faucets@1.0.25 - @0xproject/website@0.0.27 | ||||
* | | | Updated CHANGELOGS | Leonid Logvinov | 2018-04-19 | 6 | -60/+107 |
| | | | |||||
* | | | Make @0xproject/migrations public | Leonid Logvinov | 2018-04-19 | 2 | -2/+4 |
| |/ |/| | |||||
* | | Publishcontracts@2.1.23@0xproject/website@0.0.26@0xproject/testnet-faucets@1.0.24@0xproject/sra-report@0.0.9@0xproject/sol-resolver@0.0.2@0xproject/react-docs-example@0.0.8@0xproject/monorepo-scripts@0.1.18@0xproject/migrations@0.0.2@0xproject/metacoin@0.0.4@0xproject/dev-utils@0.3.6@0xproject/base-contract@0.2.1 | Fabio Berger | 2018-04-18 | 26 | -167/+168 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.36.1 - @0xproject/abi-gen@0.2.11 - @0xproject/assert@0.2.7 - @0xproject/base-contract@0.2.1 - @0xproject/connect@0.6.10 - contracts@2.1.23 - @0xproject/deployer@0.4.1 - @0xproject/dev-utils@0.3.6 - @0xproject/json-schemas@0.7.21 - @0xproject/metacoin@0.0.4 - @0xproject/migrations@0.0.2 - @0xproject/monorepo-scripts@0.1.18 - @0xproject/react-docs-example@0.0.8 - @0xproject/react-docs@0.0.8 - @0xproject/react-shared@0.1.3 - @0xproject/sol-cov@0.0.8 - @0xproject/sol-resolver@0.0.2 - @0xproject/sra-report@0.0.9 - @0xproject/subproviders@0.9.0 - @0xproject/testnet-faucets@1.0.24 - @0xproject/tslint-config@0.4.16 - @0xproject/types@0.6.1 - @0xproject/typescript-typings@0.2.0 - @0xproject/utils@0.5.2 - @0xproject/web3-wrapper@0.6.1 - @0xproject/website@0.0.26 | ||||
* | | Print out stderr | Fabio Berger | 2018-04-18 | 1 | -0/+4 |
| | | |||||
* | | Updated CHANGELOGS | Fabio Berger | 2018-04-18 | 39 | -149/+366 |
| | | |||||
* | | Merge pull request #535 from 0xProject/fix/commentRendering | Fabio Berger | 2018-04-18 | 8 | -30/+75 |
|\ \ | | | | | | | Docs: Fix Type Comment Rendering | ||||
| * | | Bold property names | Fabio Berger | 2018-04-18 | 1 | -2/+5 |
| | | | |||||
| * | | Update PR template | Fabio Berger | 2018-04-18 | 1 | -2/+1 |
| | | | |||||
| * | | Improve rendering of type definition comments | Fabio Berger | 2018-04-18 | 2 | -1/+43 |
| | | | |||||
| * | | Fix comments | Fabio Berger | 2018-04-18 | 5 | -27/+28 |
| | | | |||||
* | | | Merge pull request #531 from 0xProject/feature/deployer/solidity-0.4.22 | Jacob Evans | 2018-04-18 | 7 | -7/+33 |
|\ \ \ | |_|/ |/| | | Solidity 0.4.22 | ||||
| * | | Update test fixtures | Jacob Evans | 2018-04-18 | 2 | -5/+11 |
| | | | | | | | | | | | | allow dependency compiler test to run everywhere | ||||
| * | | Remove prettier change on package.json | Jacob Evans | 2018-04-18 | 2 | -15/+10 |
| | | | |||||
| * | | Update changelog with PR | Jacob Evans | 2018-04-18 | 1 | -1/+2 |
| | | | |||||
| * | | Update deployer and contracts repo to use solidity 0.4.22 | Jacob Evans | 2018-04-18 | 5 | -12/+36 |
| | | | |||||
* | | | Merge pull request #532 from 0xProject/bug/0x.js/fix-formatting-and-linting | Jacob Evans | 2018-04-18 | 7 | -12/+26 |
|\ \ \ | | | | | | | | | Fix linter and prettier on development | ||||
| * | | | Fix linter and prettier | Jacob Evans | 2018-04-18 | 7 | -12/+26 |
|/ / / | |||||
* | | | Merge pull request #527 from avonian/redundant_order_removal_bug | Fabio Berger | 2018-04-18 | 2 | -0/+7 |
|\ \ \ | |/ / |/| | | Fix redundant expired order removal bug | ||||
| * | | Update CHANGELOG | Ara Kevonian | 2018-04-17 | 1 | -0/+4 |
| | | | |||||
| * | | Revert removeOrder flag in favor of noop | Ara Kevonian | 2018-04-17 | 2 | -5/+6 |
| | | | |||||
| * | | Fix redundant expired order removal bug | Ara Kevonian | 2018-04-17 | 1 | -3/+5 |
|/ / | |||||
* | | Merge pull request #510 from avonian/development | Fabio Berger | 2018-04-17 | 11 | -32/+165 |
|\ \ | |/ |/| | Implement `zeroEx.exchange.getOrderStateAsync` | ||||
| * | Use this.defaultBlock in OrderFilledCancelledLazyStore | Ara Kevonian | 2018-04-17 | 1 | -2/+2 |
| | | |||||
| * | Add stateLayer param to getOrderState and clean up variable names | Ara Kevonian | 2018-04-17 | 7 | -28/+39 |
| | | |||||
| * | Rename BalanceAndAllowanceFetchers to BalanceAndProxyAllowanceFetchers | Ara Kevonian | 2018-04-13 | 5 | -17/+17 |
| | |