Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Revert "Publish"" | Fabio Berger | 2018-07-24 | 1 | -16/+16 |
| | | | | This reverts commit a66ccaa1da2af753038bf22a5e7e63bdc307bf2f. | ||||
* | Remove ERC721 callback functions | Amir Bandeali | 2018-07-23 | 4 | -49/+3 |
| | |||||
* | Use != instead of > in loops, add sanity checks to market fill functions | Amir Bandeali | 2018-07-23 | 3 | -19/+19 |
| | |||||
* | Add more tests and fixes | Amir Bandeali | 2018-07-23 | 7 | -411/+483 |
| | |||||
* | Remove MConstants and MixinConstants for LibConstants | Amir Bandeali | 2018-07-23 | 8 | -57/+23 |
| | |||||
* | Remove redundant external call by reimplementing fillOrderNoThrow | Amir Bandeali | 2018-07-23 | 6 | -166/+355 |
| | |||||
* | Remove orders length check | Amir Bandeali | 2018-07-23 | 2 | -11/+0 |
| | |||||
* | Add assertValidFillResults | Amir Bandeali | 2018-07-23 | 1 | -61/+88 |
| | |||||
* | Get actual gasPrice from transaction instead of setting default | Amir Bandeali | 2018-07-23 | 1 | -35/+34 |
| | |||||
* | Store orders length in varible before looping over orders | Amir Bandeali | 2018-07-23 | 2 | -14/+25 |
| | |||||
* | Use transferFrom instead of safeTransferFrom | Amir Bandeali | 2018-07-23 | 2 | -6/+2 |
| | |||||
* | Fix minimal tests | Amir Bandeali | 2018-07-23 | 3 | -729/+747 |
| | |||||
* | Fix rounding error issues, use different logic when makerAsset is ZRX | Amir Bandeali | 2018-07-23 | 6 | -52/+95 |
| | |||||
* | Rename marketSellEth => marketSellWeth | Amir Bandeali | 2018-07-23 | 2 | -3/+3 |
| | |||||
* | Update percentage constants | Amir Bandeali | 2018-07-23 | 3 | -17/+18 |
| | |||||
* | Update transferEthFeeAndRefund, add check to ERC721 transfer | Amir Bandeali | 2018-07-23 | 6 | -26/+54 |
| | |||||
* | Refactor forwarding contract architecture, remove batch functions | Amir Bandeali | 2018-07-23 | 20 | -1038/+572 |
| | |||||
* | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 5 | -1/+77 |
| | |||||
* | Add comments for deploying with constant ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 2 | -2/+15 |
| | |||||
* | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 10 | -24/+33 |
| | |||||
* | Merge pull request #877 from 0xProject/feature/contracts/removeERC721Callback | Amir Bandeali | 2018-07-23 | 5 | -188/+31 |
|\ | | | | | Removed receiverData and `onReceive` callback from ERC721 proxy. | ||||
| * | Fixed merge errors | Greg Hysen | 2018-07-18 | 1 | -2/+0 |
| | | |||||
| * | Fixed merge error | Greg Hysen | 2018-07-18 | 1 | -11/+11 |
| | | |||||
| * | Ran prettier | Greg Hysen | 2018-07-18 | 1 | -11/+11 |
| | | |||||
| * | Removed receiverData from ERC721 Proxy Id generation | Greg Hysen | 2018-07-18 | 4 | -8/+6 |
| | | |||||
| * | Removed receiverData and `onReceive` callback from ERC721 proxy. | Greg Hysen | 2018-07-18 | 3 | -178/+25 |
| | | |||||
* | | Fix version of ethereumjs-abi to 0.6.5 to fix decoding bug | Fabio Berger | 2018-07-22 | 1 | -1/+1 |
| | | |||||
* | | fix decodeAssetData for addresses starting in 0 | Luke Autry | 2018-07-22 | 1 | -2/+2 |
| | | |||||
* | | Hard code fillOrder selector into abiEncodeFillOrder | Amir Bandeali | 2018-07-20 | 1 | -7/+4 |
| | | |||||
* | | Returns byte array instead of memory range for encoding fillOrder calldata | Greg Hysen | 2018-07-20 | 2 | -24/+26 |
| | | |||||
* | | Created LibAbiEncoder with `fillOrderNoThrow` | Greg Hysen | 2018-07-20 | 2 | -170/+235 |
| | | |||||
* | | Change all package to depend on the new @0xproject/sol-cov@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/order-utils@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/sol-compiler@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/dev-utils@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/subproviders@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/base-contract@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/web3-wrapper@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/abi-gen@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/utils@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/types@1.0.0-rc.1 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/tslint-config@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new @0xproject/typescript-typings@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | Change all package to depend on the new ethereum-types@1.0.0 | Leonid Logvinov | 2018-07-20 | 1 | -1/+1 |
| | | |||||
* | | merge v2-prototype | Fabio Berger | 2018-07-18 | 2 | -1/+2 |
|\ \ | |||||
| * | | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 18 | -182/+201 |
| |\| | |||||
| * | | Merge | Leonid Logvinov | 2018-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 29 | -186/+534 |
| |\ \ | |||||
| * | | | Upgrade tslint to use prefer-readonly | Leonid Logvinov | 2018-07-13 | 1 | -1/+1 |
| | | | | |||||
| * | | | Update contract artifacts | Leonid Logvinov | 2018-07-13 | 1 | -0/+1 |
| | | | | |||||
* | | | | Update package versions | Fabio Berger | 2018-07-18 | 1 | -10/+10 |
| |_|/ |/| | | |||||
* | | | Merge pull request #884 from 0xProject/export-more-0x.js | Fabio Berger | 2018-07-18 | 18 | -182/+201 |
|\ \ \ | |_|/ |/| | | Export missing V2 pieces from 0x.js | ||||
| * | | Fix prettier | Fabio Berger | 2018-07-18 | 2 | -9/+3 |
| | | | |||||
| * | | Fix linter | Fabio Berger | 2018-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | merge v2-prototype | Fabio Berger | 2018-07-18 | 15 | -138/+484 |
| |\ \ | |||||
| * | | | Rename decodeAssetDataId to decodeAssetProxyId for consistency | Fabio Berger | 2018-07-18 | 4 | -11/+11 |
| | | | | |||||
| * | | | Move encodeUint256 & decodeUint256 out of assetDataUtils since we don't want ↵ | Fabio Berger | 2018-07-18 | 4 | -6/+31 |
| | | | | | | | | | | | | | | | | them exported | ||||
| * | | | Rename assetProxyUtils to assetDataUtils | Fabio Berger | 2018-07-17 | 16 | -176/+176 |
| | |/ | |/| | |||||
* | | | Merge pull request #883 from 0xProject/feature/tslint-improvements | Leonid Logvinov | 2018-07-18 | 16 | -48/+50 |
|\ \ \ | |_|/ |/| | | New tslint rules | ||||
| * | | Fix tslint issues | Leonid Logvinov | 2018-07-17 | 15 | -47/+49 |
| | | | |||||
| * | | Upgrade tslint to the newest version | Leonid Logvinov | 2018-07-17 | 1 | -1/+1 |
| |/ | |||||
* | | Add tests for getOrderInfo and getOrdersInfo | Amir Bandeali | 2018-07-18 | 3 | -5/+311 |
| | | |||||
* | | Reorder checks in getOrderInfo | Amir Bandeali | 2018-07-18 | 1 | -7/+9 |
| | | |||||
* | | Add getOrdersInfo function | Amir Bandeali | 2018-07-18 | 2 | -0/+24 |
| | | |||||
* | | Fix bugs having to do with block timestamps and order expirationTimes | Alex Browne | 2018-07-17 | 11 | -128/+142 |
|/ | |||||
* | Remove extra ERC20ProxyId from Forwarder constructor | Jacob Evans | 2018-07-11 | 2 | -3/+1 |
| | |||||
* | Add Migrations for Forwarder | Jacob Evans | 2018-07-11 | 1 | -2/+2 |
| | |||||
* | Add revert reasons and optimization to safeMath | Amir Bandeali | 2018-07-11 | 1 | -3/+15 |
| | |||||
* | Use 0.4.10 in AssetProxyOwner, add readBytes4 to contract and remove LibBytes | Amir Bandeali | 2018-07-11 | 7 | -17/+76 |
| | |||||
* | Update package versions | Fabio Berger | 2018-07-10 | 1 | -11/+11 |
| | |||||
* | Move functions out of Forwarder.sol | Amir Bandeali | 2018-07-08 | 12 | -42/+35 |
| | |||||
* | Add interfaces and mixins | Amir Bandeali | 2018-07-08 | 16 | -61/+573 |
| | |||||
* | Combine mixins | Amir Bandeali | 2018-07-08 | 6 | -284/+218 |
| | |||||
* | Use interfaces instead of full contracts | Amir Bandeali | 2018-07-08 | 4 | -7/+39 |
| | |||||
* | Add lint-contracts to default lint command | Amir Bandeali | 2018-07-07 | 1 | -1/+1 |
| | |||||
* | Remove TODOs that won't be addressed | Amir Bandeali | 2018-07-07 | 4 | -10/+3 |
| | |||||
* | Remove AbiV2 where unused | Amir Bandeali | 2018-07-07 | 23 | -38/+27 |
| | |||||
* | Only reset currentContextAddress if it was previously updated | Amir Bandeali | 2018-07-07 | 1 | -8/+11 |
| | |||||
* | Change uint => uint256 | Amir Bandeali | 2018-07-07 | 1 | -8/+7 |
| | |||||
* | Apply new linter rules | Amir Bandeali | 2018-07-07 | 74 | -299/+351 |
| | |||||
* | Update linter config | Amir Bandeali | 2018-07-07 | 2 | -11/+14 |
| | |||||
* | Fix imports | Leonid Logvinov | 2018-07-06 | 1 | -2/+2 |
| | |||||
* | Merge pull request #822 from 0xProject/v2-contract-wrappers-WIP | Leonid Logvinov | 2018-07-06 | 14 | -66/+68 |
|\ | | | | | V2 contract wrappers | ||||
| * | Make it possible to configure block polling interval in base contract wrapper | Leonid Logvinov | 2018-07-05 | 14 | -66/+68 |
| | | |||||
* | | Types: Move Forwarder Revert Reason into types package | Jacob Evans | 2018-07-06 | 1 | -13/+6 |
| | | |||||
* | | Forwarder specify the revert reasons | Jacob Evans | 2018-07-06 | 1 | -21/+31 |
| | | |||||
* | | Forwarder fix linter error | Jacob Evans | 2018-07-06 | 1 | -1/+1 |
| | | |||||
* | | Update to new assertions | Jacob Evans | 2018-07-06 | 1 | -18/+16 |
| | | |||||
* | | Merge pull request #522 from 0xProject/feature/contracts/forwarder | Jacob Evans | 2018-07-06 | 18 | -8/+2163 |
|\ \ | | | | | | | Forwarding contract | ||||
| * | | 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 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (75 commits) Update relayer grid tiles to use Text Fix build Update file structure Update 2.0.0 artifacts Move ledgerhq module declarations to typescript-typings Export LedgerEthereumClient type in subproviders Update artifacts Add logging and updated artifacts Fix migrations Run prettier Add Kovan artifacts Use ledger subprovider Add Kovan migrations Remove state variable from Link component in Portal Make registerAssetProxy append only Update staging api link Change getTransactionReceipt to awaitTransactionMined Move /docs route to the end Remove extra call to scrollIntoView for wallet in onboarding Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes ... | ||||
| * | 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 |
| |\ | | | | | | | Added some comments for ASM hashing | ||||
| | * | 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 ↵ | Fabio Berger | 2018-07-02 | 1 | -1/+9 |
| | | | | | | | | | | | | to it in tests | ||||
* | | | 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 |
| | | | | | | | | as well as only deploy the number of ERC20 tokens needed for each test suite | ||||
* | | 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 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Improve 'web3-provider-engine' typings Fix build Update artifacts Add more revert reasons to tests Make dispatchTransferFrom revert with reason from AssetProxy on failure Remove redundant files, hard code function selector in dispatchTransferFrom, and modify revert reason Updated offset of receiverData length to reflect new assetData encoding. ERC20 Custom storage layout Golf the authorization check ERC20 manual memory layout ERC20 inline return ERC721 inline return Golf ERC721 transferFrom Inline ERC20 tranferFrom selector constant Optimize ERC20 transferFrom Polish asset picker layout Update relayer grid fallback icon Change metamask install link based on browser Use ethereumjs-tx@1.3.5 instead of our fork # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts # packages/migrations/artifacts/2.0.0/DummyERC721Token.json | ||||
| * | | 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 |
| | | | | | | | | | | | | and modify revert reason | ||||
| * | | 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 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * refactor/check-revert-reasons: Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` Expect RevertReason be passed in, not string Rename RevertReasons to RevertReason since singular enum names are more common # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/core.ts | ||||
| * | | Temporarily switch revert reasons to `TransferFailed`. Should be ↵ | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| | | | | | | | | | | | | `InvalidAmount` but because of an oversight in the assembly implementation of `dispatchTransferFrom`, it always throws `TransferFailed` | ||||
| * | | 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 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts | ||||
* | | | | 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 |
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (21 commits) Don't use variables for revert reasons Add comments to dispatchTransferFrom Document IAssetData Compute bytes4 proxyid constants Return inplace bytes in LibBytes.readBytesWithLength Add Greg's documentation to MixinErc721Transfer Add Greg's documentation to MixinErc20Transfer Gas golf the transfer success logic Optimize like in PR #767 Run prettier and fix linting errors Fix tests Update tests Fix AssetProxyUtils Update tests Fix ERC721Proxy TokenId Update AssetProxyUtils Add IAssetData WIP ABI encoded asset data Remove proxyId argument from dispatchTransferFrom ... # Conflicts: # packages/contracts/test/asset_proxy/proxies.ts | ||||
| * | | | 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 ↵ | Fabio Berger | 2018-06-26 | 1 | -0/+2 |
| | | | | | | | | | | | | validation logic | ||||
* | | | 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 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (48 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/contracts/current/utils/Ownable/Ownable.sol # packages/contracts/test/libraries/lib_bytes.ts | ||||
| * | | 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 |
| |\ \ | | | | | | | | | | | | | | | | | * v2-prototype: Check that assetProxy exists before attempting transfer | ||||
| * | | | 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 ↵ | Fabio Berger | 2018-06-22 | 3 | -21/+31 |
| | | | | | | | | | | | | | | | | checks to transactions tests | ||||
| * | | | 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 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (40 commits) Use make-promises-safe as a preloader instead of manually importing Updated compiler runs to be 1,000,000 Add event to setSignatureValidatorApproval, rename signer => signerAddress accross all contracts Add senderAddress to Fill and Cancel logs, add comments to events and types Fix Island component Add missing image assets for Chris and Mel Fix some bugs in sol-cov Remove unreachable PreSigned check Fix linting Buttons look hella disabled now Remove border radius, fix width issue for unlock step Add Chris and Mel to about page fix linter issues only call getLocationByOffset if source if defined Set settleOrder and settleMatchedOrders to private Prevent prettier issue Support mobile friendly onboarding flows Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and `settleMatchedOrders` into `MixinMatchOrders` Migrations after rebasing Linter ... | ||||
| * | | | | 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 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (97 commits) Fix typos in comments Add modifier and tests for removeAuthorizedAddressAtIndex Update and add tests Change removeAuthorizedAddress => removeAuthorizedAddressAtIndex Move isFunctionRemoveAuthorizedAddress to test Fix usage of `popLastByte` Fix LibBytes is a library Remove `areBytesEqual` Fix usage of `contentAddress()` Clean low bits in bytes4 Clean high bits in address Refactor LibBytes.readBytes4 for consistency Fix LibBytes.equals Add trailing garbage testcase for LibBytes.equals Rename bytes.equals Add slice and sliceDestructive Rename bytes.rawAddress and add bytes.contentAddress Rename read/writeBytesWithLength Using LibBytes for bytes Make LibBytes a library ... # Conflicts: # packages/contracts/src/utils/constants.ts # packages/contracts/test/exchange/core.ts | ||||
| * | | | | 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 |
| |\ \ \ \ | | |_|_|/ | |/| | | | Converted `hashZeroExTransaction` to assembly. Saves 1k gas | ||||
| | * | | | 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 | ||||
| | * | | | 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 | ||||
| | * | | | | 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 | ||||
| | * | | | Updated compiler runs to be 1,000,000 | Greg Hysen | 2018-06-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ↵ | Amir Bandeali | 2018-06-22 | 15 | -70/+144 |
| | | | | | | | | | | | | | | | | | | | | accross all contracts | ||||
| * | | | | 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 |
| |/ / | | | | | | | | | | This code was unreachable, as it had the exact same condition as line 206. | ||||
| * | | Set settleOrder and settleMatchedOrders to private | Greg Hysen | 2018-06-21 | 4 | -25/+2 |
| | | | |||||
| * | | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and ↵ | Greg Hysen | 2018-06-21 | 8 | -238/+205 |
| | | | | | | | | | | | | `settleMatchedOrders` into `MixinMatchOrders` | ||||
| * | | 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 ↵ | Greg Hysen | 2018-06-21 | 3 | -8/+17 |
| | | | | | | | | | | | | working on Geth | ||||
| * | | Minor style tweaks | Greg Hysen | 2018-06-21 | 3 | -8/+8 |
| | | | |||||
| * | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported ↵ | Greg Hysen | 2018-06-21 | 9 | -27/+530 |
| |/ | | | | | | | types. Fixed trezor prefix. | ||||
* | | 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 |
| | |