Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 2 | -2/+69 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Add modifier and tests for removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 1 | -0/+69 |
| | | |||||
| * | Merge LibMem and LibBytes | Remco Bloemen | 2018-06-23 | 1 | -1/+0 |
| | | |||||
| * | Use make-promises-safe as a preloader instead of manually importing | Alex Browne | 2018-06-22 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 1 | -2/+6 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (22 commits) Fix closing parens in liborder Update after rebase ERC721Proxy Always call safeTransferFrom Rename makerEpoch => orderEpoch Make cancelOrdersUpTo compatible with sender abstraction Update PR template Use Image component instead of img tag Assembler orderHash function Optimize and remove redundant encodePacked Fix linting issue Fix bug where we do fetch balances on wallet login Check network state immediately instead of waiting for delay Fix onboarding persisting when changing routes Consolidate account state messaging logic Only elevate wallet zIndex when onboarding is in progress Rebase and update feedback Run linter Add Portal v2 logging Simplified handling of source < 32 edge case Basic EIP712 encoder ... | ||||
| * | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 1 | -2/+6 |
| | | |||||
* | | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 1 | -1/+4 |
| | | |||||
* | | - Refactor assetWrapper to contain more of the normalizing logic instead of ↵ | Fabio Berger | 2018-06-15 | 1 | -1/+2 |
|/ | | | | | | | | erc20Wrapper and erc721Wrapper - Add burn method to DummyERC721Token - Add additional methods to assetWrapper to set balance/allowances on ERC20 and ERC721 tokens - Use approve instead of approveAll for ERC721 tokens | ||||
* | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 2 | -40/+49 |
| | |||||
* | Linter changes to contracts | Greg Hysen | 2018-06-09 | 2 | -11/+3 |
| | |||||
* | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 2 | -3/+3 |
| | |||||
* | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
| | |||||
* | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 1 | -14/+6 |
| | |||||
* | Style updates to contracts | Greg Hysen | 2018-06-08 | 2 | -8/+3 |
| | |||||
* | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
| | |||||
* | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 2 | -3/+14 |
| | |||||
* | Fixes after rebasing | Greg Hysen | 2018-06-08 | 2 | -8/+5 |
| | |||||
* | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 2 | -28/+14 |
| | |||||
* | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 2 | -27/+32 |
| | |||||
* | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 1 | -11/+13 |
| | |||||
* | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵ | Greg Hysen | 2018-06-08 | 1 | -5/+5 |
| | | | | This way they can still be used by the forwarding contract. TestAssetDataDecoders inherits them in the same way the forwarding contract would | ||||
* | Converged on naming scheme for asset data: renamed all instances of ↵ | Greg Hysen | 2018-06-08 | 2 | -95/+62 |
| | | | | assetMetadata, proxyData, proxyMetadata to assetData | ||||
* | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 2 | -17/+45 |
| | |||||
* | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 2 | -3/+121 |
| | |||||
* | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 1 | -26/+30 |
| | |||||
* | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 1 | -0/+72 |
| | |||||
* | Fix missing paths | Fabio Berger | 2018-06-08 | 1 | -4/+4 |
| | |||||
* | merge v2-prototype | Fabio Berger | 2018-06-07 | 2 | -36/+31 |
|\ | |||||
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 2 | -24/+26 |
| |\ | | | | | | | | | | feature/improve-linting | ||||
| | * | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 2 | -14/+14 |
| | | | |||||
| | * | Replace constant.REVERT test assertions with ↵ | Alex Browne | 2018-06-07 | 2 | -24/+26 |
| | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction | ||||
| * | | Linter now passes | fragosti | 2018-06-06 | 2 | -8/+1 |
| |/ | |||||
* / | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 2 | -5/+5 |
|/ | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵ | Amir Bandeali | 2018-06-05 | 1 | -0/+1 |
| | | | | failures, and remove redundant logic in matchOrders | ||||
* | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 1 | -2/+2 |
| | | | | package. | ||||
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 2 | -16/+22 |
| | |||||
* | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 2 | -47/+101 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Add `are` to boolean naming conventions Fix tslint Fix the tsutils version, fixing ts typings issue Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/dispatcher.ts # packages/contracts/test/multi_sig_with_time_lock.ts | ||||
| * | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 1 | -2/+2 |
| | | |||||
| * | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 2 | -45/+87 |
| | | |||||
| * | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 2 | -0/+12 |
| | | |||||
* | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 1 | -9/+2 |
|/ | |||||
* | merge development | Fabio Berger | 2018-05-22 | 1 | -0/+1 |
| | |||||
* | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 2 | -12/+13 |
| | |||||
* | Move Authorizable to AssetProxy dir, rename to MixinAuthorizable | Amir Bandeali | 2018-05-08 | 1 | -3/+3 |
| | |||||
* | Add tests for batchTransferFrom | Amir Bandeali | 2018-05-02 | 1 | -151/+296 |
| | |||||
* | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 1 | -0/+10 |
| | |||||
* | merge v2-prototype | Fabio Berger | 2018-04-24 | 1 | -18/+18 |
| | |||||
* | Fix tests | Amir Bandeali | 2018-04-24 | 2 | -0/+344 |