| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | | Forwarding contract (squashed commits) | Jacob Evans | 2018-07-06 | 18 | -8/+2163 |
* | | | Contracts 2.0.0 were linted with solhint | Alex Shafranovich | 2018-07-06 | 60 | -1/+78 |
* | | | Added Solhint package and 'lint-contracts' npm script | Alex Shafranovich | 2018-07-06 | 2 | -1/+20 |
| |/
|/| |
|
* | | merge v2-prototype | Fabio Berger | 2018-07-04 | 17 | -186/+235 |
|\ \ |
|
| * | | Move NodeType caching out of web3-wrapper and into our internal code | Alex Browne | 2018-07-04 | 1 | -2/+8 |
| * | | Add TransactionReceiptStatus type to ethereum-types | Alex Browne | 2018-07-04 | 1 | -2/+2 |
| * | | Improve robustness of revert reason assertions | Alex Browne | 2018-07-03 | 17 | -185/+228 |
* | | | Remove unused imported Web3.js | Fabio Berger | 2018-07-04 | 1 | -2/+1 |
|/ / |
|
* | | Update incorrect versions of deps | Fabio Berger | 2018-07-02 | 1 | -1/+1 |
* | | Fix bug where 18 decimal tokens instead of 5 decimal tokens created | Fabio Berger | 2018-07-02 | 1 | -1/+1 |
* | | Disable custom-no-magic-number for block | Fabio Berger | 2018-07-02 | 1 | -0/+2 |
* | | Remove unused variable | Fabio Berger | 2018-07-02 | 1 | -1/+0 |
* | | Merge branch 'v2-prototype' into fix/five_decimal_scenario | Fabio Berger | 2018-07-02 | 130 | -936/+874 |
|\| |
|
| * | Fix build | Amir Bandeali | 2018-06-30 | 7 | -31/+31 |
| * | Update file structure | Amir Bandeali | 2018-06-30 | 125 | -199/+195 |
| * | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 11 | -201/+67 |
| * | Change getTransactionReceipt to awaitTransactionMined | Amir Bandeali | 2018-06-30 | 1 | -1/+1 |
| * | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 2 | -27/+38 |
| * | Fix deployment to geth | Amir Bandeali | 2018-06-30 | 2 | -7/+6 |
| * | Fix tests | Amir Bandeali | 2018-06-30 | 6 | -79/+146 |
| * | Remove transferFrom, implement in fallback function | Amir Bandeali | 2018-06-30 | 6 | -290/+267 |
| * | Merge pull request #774 from 0xProject/style/contracts/abiEncodeAsmComments | Amir Bandeali | 2018-06-30 | 2 | -0/+22 |
| |\ |
|
| | * | Updated hashing comments as-per PR | Greg Hysen | 2018-06-29 | 1 | -9/+4 |
| | * | Comments for ASM hashing | Greg Hysen | 2018-06-26 | 2 | -0/+27 |
* | | | Add commented out scenarios not run by default | Fabio Berger | 2018-07-02 | 1 | -16/+82 |
* | | | Fix comment | Fabio Berger | 2018-07-02 | 1 | -2/+1 |
* | | | Print out entire orderFill scenario | Fabio Berger | 2018-07-02 | 1 | -7/+1 |
* | | | Transfer ERC721 token instead of burning, so we can still set an allowance to... | Fabio Berger | 2018-07-02 | 1 | -1/+9 |
* | | | Fix bug where using nullAddress for order instead of actual taker address | Fabio Berger | 2018-07-02 | 1 | -11/+3 |
* | | | Add maker and taker balance/allowance scenarios to generateFillOrderCombination | Fabio Berger | 2018-07-02 | 1 | -8/+24 |
|/ / |
|
* | | Remove unused constants | Fabio Berger | 2018-06-28 | 1 | -2/+0 |
* | | Reduce the userAddresses to the individual addresses actually used by tests, ... | Fabio Berger | 2018-06-28 | 7 | -19/+32 |
* | | Add await time constant | Fabio Berger | 2018-06-28 | 1 | -0/+2 |
* | | Add missing awaitTransactionSuccessAsync calls | Fabio Berger | 2018-06-28 | 1 | -6/+10 |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 18 | -736/+363 |
|\ \ |
|
| * | | Fix build | Amir Bandeali | 2018-06-27 | 1 | -0/+3 |
| * | | Add more revert reasons to tests | Amir Bandeali | 2018-06-27 | 3 | -19/+43 |
| * | | Make dispatchTransferFrom revert with reason from AssetProxy on failure | Amir Bandeali | 2018-06-27 | 2 | -7/+6 |
| * | | Remove redundant files, hard code function selector in dispatchTransferFrom, ... | Amir Bandeali | 2018-06-27 | 17 | -896/+201 |
| * | | Updated offset of receiverData length to reflect new assetData encoding. | Greg Hysen | 2018-06-27 | 1 | -2/+2 |
| * | | ERC20 Custom storage layout | Remco Bloemen | 2018-06-27 | 2 | -3/+5 |
| * | | Golf the authorization check | Remco Bloemen | 2018-06-27 | 2 | -122/+132 |
| * | | ERC20 manual memory layout | Remco Bloemen | 2018-06-27 | 1 | -11/+6 |
| * | | ERC20 inline return | Remco Bloemen | 2018-06-27 | 1 | -6/+11 |
| * | | ERC721 inline return | Remco Bloemen | 2018-06-27 | 1 | -8/+9 |
| * | | Golf ERC721 transferFrom | Remco Bloemen | 2018-06-27 | 2 | -3/+166 |
| * | | Inline ERC20 tranferFrom selector constant | Remco Bloemen | 2018-06-27 | 1 | -4/+3 |
| * | | Optimize ERC20 transferFrom | Remco Bloemen | 2018-06-27 | 1 | -2/+126 |
* | | | Move combinatorial fillOrder tests into the `fill_ordere` test file | Fabio Berger | 2018-06-27 | 2 | -48/+21 |
* | | | Fix tests | Fabio Berger | 2018-06-27 | 1 | -3/+6 |
* | | | Fix type issue | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
* | | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 11 | -87/+91 |
|\| | |
|
| * | | Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmou... | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| * | | Expect RevertReason be passed in, not string | Fabio Berger | 2018-06-26 | 1 | -1/+5 |
| * | | Rename RevertReasons to RevertReason since singular enum names are more common | Fabio Berger | 2018-06-26 | 10 | -95/+95 |
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-26 | 33 | -266/+449 |
| |\ \ |
|
* | | | | Update AbstractAssetWrapper | Fabio Berger | 2018-06-26 | 1 | -1/+1 |
* | | | | Rename to singular | Fabio Berger | 2018-06-26 | 1 | -9/+9 |
* | | | | Fix merge issues | Fabio Berger | 2018-06-26 | 5 | -17/+21 |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 33 | -281/+460 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Don't use variables for revert reasons | Amir Bandeali | 2018-06-26 | 14 | -86/+86 |
| * | | | Add comments to dispatchTransferFrom | Amir Bandeali | 2018-06-26 | 1 | -30/+56 |
| * | | | Document IAssetData | Remco Bloemen | 2018-06-26 | 1 | -0/+3 |
| * | | | Compute bytes4 proxyid constants | Remco Bloemen | 2018-06-26 | 2 | -2/+2 |
| * | | | Return inplace bytes in LibBytes.readBytesWithLength | Remco Bloemen | 2018-06-26 | 1 | -9/+7 |
| * | | | Add Greg's documentation to MixinErc721Transfer | Remco Bloemen | 2018-06-26 | 1 | -33/+44 |
| * | | | Add Greg's documentation to MixinErc20Transfer | Remco Bloemen | 2018-06-26 | 1 | -13/+35 |
| * | | | Gas golf the transfer success logic | Remco Bloemen | 2018-06-26 | 1 | -11/+10 |
| * | | | Optimize like in PR #767 | Remco Bloemen | 2018-06-26 | 3 | -34/+157 |
| * | | | Run prettier and fix linting errors | Amir Bandeali | 2018-06-26 | 1 | -18/+6 |
| * | | | Fix tests | Amir Bandeali | 2018-06-26 | 5 | -21/+4 |
| * | | | Update tests | Remco Bloemen | 2018-06-26 | 1 | -2/+2 |
| * | | | Update tests | Remco Bloemen | 2018-06-26 | 2 | -33/+20 |
| * | | | Fix ERC721Proxy TokenId | Remco Bloemen | 2018-06-26 | 1 | -1/+1 |
| * | | | Add IAssetData | Remco Bloemen | 2018-06-26 | 2 | -1/+2 |
| * | | | WIP | Remco Bloemen | 2018-06-26 | 3 | -2/+3 |
| * | | | ABI encoded asset data | Remco Bloemen | 2018-06-26 | 9 | -29/+51 |
| * | | | Remove proxyId argument from dispatchTransferFrom | Remco Bloemen | 2018-06-26 | 8 | -41/+20 |
| * | | | Document all the contract test options in README | Fabio Berger | 2018-06-25 | 1 | -3/+43 |
| | |/
| |/| |
|
* | | | Fix inconsistency between contract and reference implementation of order vali... | Fabio Berger | 2018-06-26 | 1 | -0/+2 |
* | | | Prettier fixes | Fabio Berger | 2018-06-26 | 2 | -8/+2 |
* | | | Fix tslint issues | Fabio Berger | 2018-06-26 | 7 | -22/+4 |
* | | | Check revert reasons in declarative and combinatorial tests | Fabio Berger | 2018-06-25 | 1 | -7/+8 |
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 11 | -66/+14 |
|\ \ \
| | |/
| |/| |
|
| * | | Move RevertReasons to @0xproject/types package | Fabio Berger | 2018-06-25 | 11 | -66/+14 |
| * | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
* | | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 15 | -129/+235 |
|\| | |
|
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-25 | 26 | -708/+965 |
| |\| |
|
| * | | Fix tslint | Fabio Berger | 2018-06-23 | 4 | -4/+4 |
| * | | Fix prettier | Fabio Berger | 2018-06-23 | 5 | -15/+13 |
| * | | Rename ContractLibErrors to RevertReasons | Fabio Berger | 2018-06-23 | 11 | -96/+96 |
| * | | Remove revert reason 'Exchange' prefix | Fabio Berger | 2018-06-23 | 2 | -3/+3 |
| * | | Move constants over to ContractLibError enum and update all tests | Fabio Berger | 2018-06-23 | 5 | -44/+42 |
| * | | Standardize ERC20 error strings given convention | Fabio Berger | 2018-06-23 | 1 | -3/+2 |
| * | | Fix test now that contract reverts with message | Fabio Berger | 2018-06-22 | 2 | -5/+4 |
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 3 | -27/+48 |
| |\ \ |
|
| * | | | Add revert reason checks to wrapper tests | Fabio Berger | 2018-06-22 | 1 | -10/+19 |
| * | | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| * | | | Change Whitelist error messages to conform to rest and added revert reason ch... | Fabio Berger | 2018-06-22 | 3 | -21/+31 |
| * | | | Add revert reason checks to match_orders tests | Fabio Berger | 2018-06-22 | 1 | -7/+18 |
| * | | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| * | | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 39 | -382/+894 |
| |\ \ \ |
|
| * | | | | Check revert reason in dispatcher tests | Fabio Berger | 2018-06-22 | 2 | -5/+13 |
| * | | | | remove unused import | Fabio Berger | 2018-06-22 | 1 | -1/+0 |
| * | | | | Test revert reasons in proxy tests | Fabio Berger | 2018-06-21 | 1 | -11/+23 |
| * | | | | remove only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| * | | | | Check revert reasons in Authorizable tests | Fabio Berger | 2018-06-21 | 2 | -6/+15 |
| * | | | | Change revert reason in ownable to be similar to all other revert reasons | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| * | | | | remove .only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| * | | | | Update core tests to actually check revert message | Fabio Berger | 2018-06-21 | 3 | -34/+97 |
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 54 | -1100/+1890 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | Fix typos in comments | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| * | | | | Add modifier and tests for removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 3 | -2/+79 |
| * | | | | Update and add tests | Amir Bandeali | 2018-06-23 | 4 | -173/+274 |
| * | | | | Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 2 | -13/+22 |
| * | | | | Move isFunctionRemoveAuthorizedAddress to test | Remco Bloemen | 2018-06-23 | 6 | -22/+70 |
| * | | | | Fix usage of `popLastByte` | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| * | | | | Fix LibBytes is a library | Remco Bloemen | 2018-06-23 | 6 | -15/+12 |
| * | | | | Remove `areBytesEqual` | Remco Bloemen | 2018-06-23 | 1 | -35/+0 |
| * | | | | Fix usage of `contentAddress()` | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| * | | | | Clean low bits in bytes4 | Remco Bloemen | 2018-06-23 | 1 | -0/+3 |
| * | | | | Clean high bits in address | Remco Bloemen | 2018-06-23 | 1 | -0/+4 |
| * | | | | Refactor LibBytes.readBytes4 for consistency | Remco Bloemen | 2018-06-23 | 4 | -14/+25 |
| * | | | | Fix LibBytes.equals | Remco Bloemen | 2018-06-23 | 1 | -21/+4 |
| * | | | | Add trailing garbage testcase for LibBytes.equals | Remco Bloemen | 2018-06-23 | 2 | -0/+21 |
| * | | | | Rename bytes.equals | Remco Bloemen | 2018-06-23 | 3 | -15/+50 |
| * | | | | Add slice and sliceDestructive | Remco Bloemen | 2018-06-23 | 1 | -0/+46 |
| * | | | | Rename bytes.rawAddress and add bytes.contentAddress | Remco Bloemen | 2018-06-23 | 2 | -8/+25 |
| * | | | | Rename read/writeBytesWithLength | Remco Bloemen | 2018-06-23 | 4 | -36/+36 |
| * | | | | Using LibBytes for bytes | Remco Bloemen | 2018-06-23 | 6 | -26/+38 |
| * | | | | Make LibBytes a library | Remco Bloemen | 2018-06-23 | 6 | -35/+30 |
| * | | | | Merge LibMem and LibBytes | Remco Bloemen | 2018-06-23 | 11 | -399/+322 |
| * | | | | Use provided mem in refernce memcpy | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| * | | | | Merge pull request #749 from 0xProject/feature/contracts/transactionHashAsm | Amir Bandeali | 2018-06-23 | 1 | -8/+18 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Apply mask to address to zero-out unused bytes. | Greg Hysen | 2018-06-23 | 1 | -1/+1 |
| | * | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas | Greg Hysen | 2018-06-22 | 1 | -8/+18 |
| * | | | | Merge pull request #748 from 0xProject/fix/contracts/nullAssetProxy | Fabio Berger | 2018-06-22 | 3 | -27/+48 |
| |\ \ \ \
| | |_|_|/
| |/| | | |
|
| | * | | | Check that assetProxy exists before attempting transfer | Amir Bandeali | 2018-06-22 | 3 | -27/+48 |
| * | | | | Merge pull request #752 from 0xProject/make-promises-safe-preloader | Fabio Berger | 2018-06-22 | 11 | -11/+1 |
| |\ \ \ \ |
|
| | * | | | | Use make-promises-safe as a preloader instead of manually importing | Alex Browne | 2018-06-22 | 11 | -11/+1 |
| | | |/ /
| | |/| | |
|
| * | | | | Merge pull request #751 from 0xProject/feature/contracts/compilerRuns | Amir Bandeali | 2018-06-22 | 1 | -1/+1 |
| |\ \ \ \
| | |/ / /
| |/| | | |
|
| | * | | | Updated compiler runs to be 1,000,000 | Greg Hysen | 2018-06-22 | 1 | -1/+1 |
| * | | | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ac... | Amir Bandeali | 2018-06-22 | 15 | -70/+144 |
| * | | | | Add senderAddress to Fill and Cancel logs, add comments to events and types | Amir Bandeali | 2018-06-22 | 5 | -44/+47 |
| | |/ /
| |/| | |
|
| * | | | Remove unreachable PreSigned check | Austin Roberts | 2018-06-22 | 1 | -4/+0 |
| |/ / |
|
| * | | Set settleOrder and settleMatchedOrders to private | Greg Hysen | 2018-06-21 | 4 | -25/+2 |
| * | | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `se... | Greg Hysen | 2018-06-21 | 8 | -238/+205 |
| * | | Linter | Greg Hysen | 2018-06-21 | 1 | -2/+1 |
| * | | Renamed constants in test wallet/validator | Greg Hysen | 2018-06-21 | 2 | -11/+11 |
| * | | Few more minor #nit wording changes | Greg Hysen | 2018-06-21 | 2 | -5/+5 |
| * | | Changed wording of two tests #nit | Greg Hysen | 2018-06-21 | 1 | -2/+2 |
| * | | Minor improvements to MixinSignatureValidator tests | Greg Hysen | 2018-06-21 | 1 | -14/+8 |
| * | | Remove .only | Greg Hysen | 2018-06-21 | 1 | -1/+1 |
| * | | Fixed two mislabelled revert reasons + Signature Validator revert tests worki... | Greg Hysen | 2018-06-21 | 3 | -8/+17 |
| * | | Minor style tweaks | Greg Hysen | 2018-06-21 | 3 | -8/+8 |
| * | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported t... | Greg Hysen | 2018-06-21 | 9 | -27/+530 |
| |/ |
|
* | | Add support for approveAll in assetWrapper and fillOrderScenarios | Fabio Berger | 2018-06-21 | 4 | -5/+80 |
* | | Improve verbose logging | Fabio Berger | 2018-06-21 | 1 | -2/+5 |
* | | Fix merge variable name issue | Fabio Berger | 2018-06-20 | 1 | -1/+1 |
* | | Add support for setting allowance to unlimited | Fabio Berger | 2018-06-20 | 2 | -7/+35 |
* | | Add noop conditionals for clarity | Fabio Berger | 2018-06-20 | 1 | -0/+10 |
* | | Rename for clarity | Fabio Berger | 2018-06-20 | 1 | -8/+8 |
* | | Split balance and allowance amount types in prep of adding the "unlimited" al... | Fabio Berger | 2018-06-20 | 3 | -51/+59 |
* | | Remove unneeded explicit type def | Fabio Berger | 2018-06-20 | 1 | -1/+1 |
* | | Add TS 2.7 numeric separators to improve readability | Fabio Berger | 2018-06-20 | 1 | -6/+6 |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 21 | -103/+444 |
|\| |
|
| * | Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-20 | 7 | -45/+166 |
| |\ |
|
| | * | Fix closing parens in liborder | Jacob Evans | 2018-06-20 | 1 | -16/+15 |
| | * | Assembler orderHash function | Remco Bloemen | 2018-06-19 | 1 | -18/+22 |
| | * | Optimize and remove redundant encodePacked | Jacob Evans | 2018-06-19 | 4 | -13/+23 |
| | * | Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-18 | 70 | -929/+2461 |
| | |\ |
|
| | * | | Rebase and update feedback | Jacob Evans | 2018-06-18 | 4 | -81/+85 |
| | * | | Basic EIP712 encoder | Jacob Evans | 2018-06-08 | 1 | -10/+11 |
| | * | | Update Order utils to use eip712 | Jacob Evans | 2018-06-06 | 9 | -178/+50 |
| | * | | Add missing EIP191 prefix for EIP712 | Jacob Evans | 2018-06-05 | 10 | -50/+279 |
| * | | | Update after rebase | Jacob Evans | 2018-06-20 | 1 | -7/+1 |
| * | | | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 1 | -2/+6 |
| * | | | Rename makerEpoch => orderEpoch | Amir Bandeali | 2018-06-20 | 7 | -46/+49 |
| * | | | Make cancelOrdersUpTo compatible with sender abstraction | Amir Bandeali | 2018-06-20 | 8 | -8/+225 |
| * | | | Merge pull request #683 from 0xProject/fix/contracts/memcpy | Remco Bloemen | 2018-06-19 | 1 | -10/+12 |
| |\ \ \ |
|
| | * | | | Simplified handling of source < 32 edge case | Remco Bloemen | 2018-06-11 | 1 | -10/+12 |
* | | | | | Add ability for verbose logging | Fabio Berger | 2018-06-20 | 1 | -2/+10 |
* | | | | | Fix typo | Fabio Berger | 2018-06-19 | 1 | -2/+2 |
* | | | | | Rename NewOrderFactory to OrderFactoryFromScenario for clarity | Fabio Berger | 2018-06-19 | 2 | -5/+5 |
* | | | | | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 7 | -12/+30 |
* | | | | | Cleanup coreCombinatorialUtils | Fabio Berger | 2018-06-19 | 1 | -220/+226 |
* | | | | | Comments and cleanup | Fabio Berger | 2018-06-19 | 1 | -20/+8 |
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 7 | -141/+218 |
|\| | | | |
|
| * | | | | Merge pull request #728 from 0xProject/fix/post-dev-publish | Fabio Berger | 2018-06-19 | 1 | -12/+12 |
| |\ \ \ \ |
|
| | * | | | | Fix additional versions and update yarn.lock | Fabio Berger | 2018-06-19 | 1 | -1/+1 |
| | * | | | | Update all package versions to match latest published to NPM | Fabio Berger | 2018-06-19 | 1 | -11/+11 |
| * | | | | | Merge pull request #659 from 0xProject/feature/contracts/split-proxy-internal... | Jacob Evans | 2018-06-19 | 6 | -129/+206 |
| |\ \ \ \ \
| | |/ / / /
| |/| | | | |
|
| | * | | | | Rebase with latest removing PROXY_ID from transfer | Jacob Evans | 2018-06-18 | 5 | -95/+111 |
| | * | | | | Split transfer impl and AssetProxyMixin | Jacob Evans | 2018-06-18 | 4 | -95/+156 |
| | | |_|/
| | |/| | |
|
* | | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-19 | 9 | -30/+105 |
|\| | | | |
|
| * | | | | Make isValidSignature public | Amir Bandeali | 2018-06-19 | 3 | -15/+15 |
| * | | | | Make batchFill methods return FIllResults struct | Amir Bandeali | 2018-06-19 | 2 | -10/+28 |
| |/ / / |
|
| * | | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugs | Remco Bloemen | 2018-06-16 | 1 | -1/+29 |
| |\ \ \ |
|
| | * | | | Handle tokens that do not return bool | Remco Bloemen | 2018-06-14 | 1 | -1/+29 |
| * | | | | Change wording of error message when you try to use more than one subprovider | Alex Browne | 2018-06-15 | 1 | -1/+1 |
| * | | | | Fix linter errors and remove coverage.json | Alex Browne | 2018-06-15 | 1 | -2/+1 |
| * | | | | Remove unused variables and other small fixes | Alex Browne | 2018-06-15 | 2 | -6/+7 |
| * | | | | Fix a bug in revert_trace.ts | Alex Browne | 2018-06-15 | 1 | -23/+23 |
| * | | | | Introduce subprovider for printing revert stack traces | Alex Browne | 2018-06-15 | 3 | -22/+51 |
| |/ / / |
|
* | | | | Add ability to tweak the relevant balances/allowances for the maker and taker... | Fabio Berger | 2018-06-15 | 4 | -78/+380 |
* | | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e... | Fabio Berger | 2018-06-15 | 8 | -74/+314 |
* | | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr... | Fabio Berger | 2018-06-14 | 5 | -60/+59 |
* | | | | Use a defaultFillScenario in fillOrder tests | Fabio Berger | 2018-06-14 | 1 | -36/+39 |
* | | | | Fix incorrect string values in enum | Fabio Berger | 2018-06-14 | 1 | -2/+2 |
* | | | | Fix calculation of expFilledTakerAmount and expected values in events emitted | Fabio Berger | 2018-06-14 | 1 | -4/+7 |
* | | | | Replace initial set of legacy manually written fillOrder tests with declarati... | Fabio Berger | 2018-06-14 | 2 | -434/+186 |
* | | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ... | Fabio Berger | 2018-06-14 | 4 | -35/+153 |
* | | | | Move orderFill combinatorialTests to exchange folder | Fabio Berger | 2018-06-13 | 1 | -4/+4 |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 27 | -345/+532 |
|\| | | |
|
| * | | | Rename popByte and popAddress | Amir Bandeali | 2018-06-13 | 5 | -18/+18 |
| * | | | Hard code test addresses/bytes32 instead of generating pseudorandom ones | Amir Bandeali | 2018-06-13 | 1 | -19/+16 |
| * | | | Unpop byte rather than making deep copy | Amir Bandeali | 2018-06-13 | 4 | -90/+95 |
| * | | | Pass gas in to marketBuyOrdersNoThrow | Amir Bandeali | 2018-06-13 | 1 | -1/+1 |
| * | | | Looks up the memory location of makerAssetData/takerAssetData | Greg Hysen | 2018-06-13 | 1 | -0/+2 |
| * | | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA | Amir Bandeali | 2018-06-13 | 5 | -23/+13 |
| * | | | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 3 | -70/+201 |
| * | | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 20 | -209/+268 |
| * | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t... | Alex Browne | 2018-06-12 | 1 | -1/+4 |
* | | | | Implement initial set of orderFill combinatorial tests | Fabio Berger | 2018-06-13 | 11 | -427/+575 |
* | | | | Refactor ERC20 and ERC721 wrappers for V2 and introduce the assetWrapper supe... | Fabio Berger | 2018-06-13 | 4 | -9/+95 |
* | | | | Variable rename for clarity | Fabio Berger | 2018-06-13 | 1 | -2/+2 |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-12 | 46 | -387/+1541 |
|\| | | |
|
| * | | | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 2 | -2/+2 |
| * | | | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 6 | -1/+58 |
| |/ / |
|
| * | | Linter changes to contracts | Greg Hysen | 2018-06-09 | 4 | -21/+6 |
| * | | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 3 | -28/+36 |
| * | | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 4 | -6/+5 |
| * | | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 2 | -13/+13 |
| * | | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 1 | -14/+6 |
| * | | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 4 | -23/+23 |
| * | | Style updates to contracts | Greg Hysen | 2018-06-08 | 6 | -26/+20 |
| * | | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
| * | | Fixed a styling throughout contracts. Moved closing parenthesis for long list... | Greg Hysen | 2018-06-08 | 8 | -31/+62 |
| * | | Removed setting makerAssetData/takerAssetData from tests where values are sam... | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
| * | | Fixed merge error when rebasing wrt length variable in asset data decoders | Greg Hysen | 2018-06-08 | 2 | -4/+4 |
| * | | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 6 | -12/+21 |
| * | | Fixed after rebase | Greg Hysen | 2018-06-08 | 3 | -5/+5 |
| * | | Fixes after rebasing | Greg Hysen | 2018-06-08 | 3 | -8/+6 |
| * | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 7 | -50/+30 |
| * | | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 8 | -50/+72 |
| * | | Style audit proxies | Greg Hysen | 2018-06-08 | 3 | -20/+64 |
| * | | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 3 | -13/+20 |
| * | | Fixed formatting in memory layout | Greg Hysen | 2018-06-08 | 1 | -6/+6 |
| * | | Resolved edge case in Memcpy where where send would eventually turn "negative... | Greg Hysen | 2018-06-08 | 2 | -144/+154 |