| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #583 from 0xProject/bug/contracts/erc721-encoded-pad | Jacob Evans | 2018-05-18 | 1 | -1/+2 |
|\ |
|
| * | Pad to 32 if asset ids are small | Jacob Evans | 2018-05-10 | 1 | -1/+2 |
* | | Merge branch 'development' into v2-prototype | Fabio Berger | 2018-05-16 | 4 | -8/+8 |
|\ \ |
|
* | | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 9 | -77/+99 |
|\| |
| |/
|/| |
|
* | | Add revert variables, change lib => libs to get around gitignore | Amir Bandeali | 2018-05-09 | 21 | -52/+325 |
* | | Move Authorizable to AssetProxy dir, rename to MixinAuthorizable | Amir Bandeali | 2018-05-08 | 8 | -58/+92 |
* | | Split up mixins and interfaces | Amir Bandeali | 2018-05-05 | 29 | -745/+508 |
* | | Make LibBytes methods internal, add TestLibBytes | Amir Bandeali | 2018-05-05 | 3 | -9/+148 |
* | | Update contracts with revert reasons and constructor keyword | Amir Bandeali | 2018-05-03 | 41 | -180/+409 |
* | | Add MixinAssetProxy to reuse redundant code | Amir Bandeali | 2018-05-03 | 4 | -98/+117 |
* | | Add batchTransferFrom to asset proxies | Amir Bandeali | 2018-05-02 | 3 | -9/+111 |
* | | Remove outdated comment | Amir Bandeali | 2018-05-01 | 2 | -4/+2 |
* | | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 4 | -5/+54 |
* | | 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 | 15 | -91/+198 |
* | | Add LibFillResults | Amir Bandeali | 2018-04-27 | 11 | -78/+107 |
* | | Add ERC721 contracts from zeppelin-solidity | Amir Bandeali | 2018-04-27 | 5 | -2/+573 |
* | | Add tests and comments | Amir Bandeali | 2018-04-27 | 4 | -16/+25 |
* | | Update tests and utils | Amir Bandeali | 2018-04-27 | 6 | -1/+65 |
* | | Implement sender abstraction | Amir Bandeali | 2018-04-27 | 6 | -47/+210 |
* | | merge v2-prototype | Fabio Berger | 2018-04-24 | 3 | -97/+96 |
|\ \ |
|
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 3 | -97/+96 |
* | | | Fix tests | Amir Bandeali | 2018-04-24 | 3 | -3/+54 |
* | | | 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 | 2 | -1/+13 |
* | | Add ERC721 wrapper | Amir Bandeali | 2018-04-24 | 2 | -20/+161 |
* | | Add ERC20Wrapper | Amir Bandeali | 2018-04-24 | 3 | -32/+127 |
* | | Rename proxyUtils => assetProxyUtils | Amir Bandeali | 2018-04-23 | 1 | -6/+6 |
* | | Rename missed variables | Amir Bandeali | 2018-04-23 | 4 | -20/+20 |
* | | Reorder event args | Amir Bandeali | 2018-04-22 | 1 | -10/+10 |
* | | Add missing async suffix | Amir Bandeali | 2018-04-22 | 1 | -1/+1 |
* | | Rename token => asset | Amir Bandeali | 2018-04-22 | 11 | -203/+203 |
* | | Rename Token => IERC20Token | Amir Bandeali | 2018-04-22 | 7 | -155/+47 |
* | | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 6 | -66/+14 |
* | | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 1 | -34/+32 |
* | | Fix names and visibilities, use address type over contract type for function ... | Amir Bandeali | 2018-04-22 | 5 | -22/+21 |
* | | Remove unused constructor arguments | Amir Bandeali | 2018-04-22 | 2 | -28/+15 |
* | | Add presigned signature type | Amir Bandeali | 2018-04-21 | 1 | -1/+29 |
* | | Fix zeppelin imports, run prettier | Amir Bandeali | 2018-04-21 | 2 | -2/+2 |
* | | Added tests for (most functions in) LibBytes. The write methods are not curre... | Greg Hysen | 2018-04-21 | 1 | -0/+1 |
* | | Added description for the DummyERC721Token constructor | Greg Hysen | 2018-04-21 | 1 | -0/+6 |
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less c... | Greg Hysen | 2018-04-21 | 3 | -11/+15 |
* | | 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 exi... | Greg Hysen | 2018-04-21 | 2 | -72/+5 |
* | | 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 | 2 | -3/+3 |
* | | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 9 | -296/+0 |
* | | Updated commenting. Noted that transferFrom succeeds or throws on all transfe... | Greg Hysen | 2018-04-21 | 4 | -7/+7 |
* | | Reverted change that allowed ERC721 transfer proxy to be called with amount 0... | Greg Hysen | 2018-04-21 | 1 | -3/+0 |
* | | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 7 | -63/+78 |
* | | toUnsigned -> toBuffer in assetProxyUtils | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
* | | Unrolled the loop that copies the Order struct in FillOrderNoThrow. Saves 900... | Greg Hysen | 2018-04-21 | 1 | -5/+17 |
* | | 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 |
* | | Minor changes to typescript tests | Greg Hysen | 2018-04-21 | 2 | -4/+2 |
* | | 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 | 2 | -3/+3 |
* | | Proxy Metadata -> Data | Greg Hysen | 2018-04-21 | 2 | -9/+9 |
* | | Cleaning up some wording | Greg Hysen | 2018-04-21 | 5 | -28/+26 |
* | | Minor style improvements to asset proxy utils | Greg Hysen | 2018-04-21 | 1 | -10/+3 |
* | | 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 | 4 | -18/+18 |
* | | IAssetProxyDispatcher to IAssetProxy in MixinSettlement layer + allowing 0-co... | Greg Hysen | 2018-04-21 | 3 | -7/+8 |
* | | Removed Log prefix from events | Greg Hysen | 2018-04-21 | 2 | -5/+5 |
* | | removed unnecessary import | Greg Hysen | 2018-04-21 | 1 | -2/+0 |
* | | setAssetProxy to addAssetProxy | Greg Hysen | 2018-04-21 | 2 | -2/+2 |
* | | Renamed TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 1 | -2/+1 |
* | | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 4 | -6/+6 |
* | | ERC20 V1 proxy compiling | Greg Hysen | 2018-04-21 | 1 | -3/+3 |
* | | Changed order of write parameters in LibBytes. Now ordered by most generalize... | Greg Hysen | 2018-04-21 | 4 | -10/+10 |
* | | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 23 | -122/+1088 |
* | | 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 | 1 | -3/+8 |
* | | Revert variable naming | Amir Bandeali | 2018-04-21 | 10 | -141/+141 |
* | | Update Solidity syntax and comments | Amir Bandeali | 2018-04-21 | 3 | -50/+52 |
* | | Return all amounts traded and fees paid | Amir Bandeali | 2018-04-21 | 7 | -106/+115 |
* | | Add tests for marketBuyOrders | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
* | | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 8 | -226/+326 |
* | | Fix build errors | Amir Bandeali | 2018-04-21 | 3 | -13/+6 |
* | | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 3 | -4/+6 |
* | | Remove partial cancels | Amir Bandeali | 2018-04-21 | 6 | -72/+31 |
* | | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that orders... | Greg Hysen | 2018-04-21 | 4 | -12/+13 |
* | | Renamed all instances of timestamp to salt. Clarified test case wording. | Greg Hysen | 2018-04-21 | 2 | -3/+3 |
* | | Fixed spacing | Greg Hysen | 2018-04-21 | 3 | -5/+5 |
* | | Implementation and tests in the protocol for cancelling all orders up to a sp... | Greg Hysen | 2018-04-21 | 6 | -16/+67 |
* | | Update copyright headers | Amir Bandeali | 2018-04-21 | 30 | -24/+150 |
* | | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 1 | -20/+14 |
* | | Address feedback and lint | Amir Bandeali | 2018-04-21 | 17 | -170/+89 |
* | | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 1 | -0/+42 |
* | | Fix fillOrderNoThrow | Amir Bandeali | 2018-04-21 | 1 | -29/+15 |
* | | Fix package.json | Amir Bandeali | 2018-04-21 | 1 | -5/+5 |
* | | 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 | 1 | -0/+21 |
* | | 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 |
* | | Add script for starting testrpc with preconfigured private keys | Amir Bandeali | 2018-04-21 | 2 | -0/+29 |
* | | 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 |
* | | 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 |
* | | Run prettier | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
* | | Add fillOrderNoThrow and wrapper functions | Amir Bandeali | 2018-04-21 | 1 | -1/+1 |
* | | Fix compile errors | Amir Bandeali | 2018-04-21 | 4 | -12/+12 |
* | | 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 | 1 | -11/+39 |
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 4 | -16/+77 |
* | | Move utils dir into src | Amir Bandeali | 2018-04-21 | 10 | -0/+679 |
* | | Run prettier | Amir Bandeali | 2018-04-21 | 2 | -3/+3 |
* | | 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 |
|/ |
|
* | Remove nested .gitignore files since `yarn publish` gets confused by them and... | Fabio Berger | 2018-03-27 | 1 | -1/+0 |
* | Add sol-cover implementation | Leonid Logvinov | 2018-03-12 | 1 | -1/+0 |
* | Move tutorials to adhere to current dir structure | Leonid Logvinov | 2018-03-02 | 3 | -0/+0 |
* | Improve the comments | Leonid Logvinov | 2018-03-02 | 1 | -0/+4 |
* | Improve the comments | Leonid Logvinov | 2018-03-02 | 1 | -1/+4 |
* | Add comments to Arbitrage contract | Leonid Logvinov | 2018-03-02 | 1 | -21/+28 |
* | Don't pass tokenGet and tokenGive because we can get them from 0x order | Leonid Logvinov | 2018-03-02 | 1 | -11/+9 |
* | Pretty-print ED contracts | Leonid Logvinov | 2018-03-02 | 2 | -167/+167 |
* | Make external | Leonid Logvinov | 2018-03-02 | 1 | -1/+1 |
* | Change type to uint256 | Leonid Logvinov | 2018-03-02 | 1 | -1/+1 |
* | Make setAllowances external | Leonid Logvinov | 2018-03-02 | 1 | -1/+1 |
* | Put all ED contracts in one folder | Leonid Logvinov | 2018-03-02 | 2 | -1/+1 |
* | Move tutorials contracts to src folder | Leonid Logvinov | 2018-03-02 | 3 | -0/+281 |
* | Move BaseContract to web3Wrapper | Leonid Logvinov | 2018-02-28 | 2 | -78/+1 |
* | Use the same templates as 0x.js | Leonid Logvinov | 2018-02-28 | 1 | -8/+43 |
* | Apply prettier after generating contracts | Leonid Logvinov | 2018-02-28 | 1 | -2/+2 |
* | Delete artifacts directory | Amir Bandeali | 2018-02-21 | 11 | -4287/+0 |
* | Run prettier | Amir Bandeali | 2018-02-16 | 11 | -20/+553 |
* | Fix checks, add contract list to compile script in package.json | Amir Bandeali | 2018-02-16 | 21 | -1810/+30 |
* | Special-case ZRXToken snake case conversion | Leonid Logvinov | 2018-02-07 | 1 | -1/+1 |
* | Add base_contract.ts | Leonid Logvinov | 2018-02-07 | 1 | -0/+35 |
* | Remove generated files | Leonid Logvinov | 2018-02-07 | 5 | -2208/+0 |
* | .gitignore gemerated files | Leonid Logvinov | 2018-02-07 | 1 | -0/+8 |
* | Add CLI option for networkId, add abi-gen to contracts package | Amir Bandeali | 2018-02-07 | 47 | -0/+7742 |
* | Update contract versions, fix tests | Amir Bandeali | 2018-02-03 | 5 | -5/+5 |
* | Rename directories | Amir Bandeali | 2018-02-03 | 21 | -0/+2959 |