Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add back order validation logic | Fabio Berger | 2018-09-05 | 1 | -7/+5 |
| | |||||
* | Fix imports | Fabio Berger | 2018-09-05 | 1 | -2/+1 |
| | |||||
* | remove console log | Fabio Berger | 2018-09-05 | 1 | -1/+0 |
| | |||||
* | merge development | Fabio Berger | 2018-09-05 | 103 | -766/+1440 |
|\ | |||||
| * | Merge pull request #1054 from 0xProject/addValidationMethods | Fabio Berger | 2018-09-05 | 9 | -39/+135 |
| |\ | | | | | | | Temporarily Add Back Validation Methods | ||||
| | * | Export abstract fetchers | Fabio Berger | 2018-09-05 | 1 | -0/+2 |
| | | | |||||
| | * | Export missing type | Fabio Berger | 2018-09-04 | 2 | -0/+2 |
| | | | |||||
| | * | Merge branch 'development' into addValidationMethods | Fabio Berger | 2018-09-04 | 2 | -6/+0 |
| | |\ | | | | | | | | | | | | | | | | | * development: Remove unused imports | ||||
| | | * | Merge branch 'development' of github.com:0xProject/0x-monorepo into development | Fabio Berger | 2018-09-04 | 2 | -6/+0 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x-monorepo: Remove unused imports | ||||
| | * | | | Add PR nr | Fabio Berger | 2018-09-04 | 1 | -2/+4 |
| | |/ / | |||||
| | * | | Update yarn.lock | Fabio Berger | 2018-09-04 | 1 | -33/+29 |
| | | | | |||||
| | * | | Add `validateFillOrderThrowIfInvalidAsync` and ↵ | Fabio Berger | 2018-09-04 | 3 | -2/+83 |
| | | | | | | | | | | | | | | | | `validateOrderFillableOrThrowAsync` to ExchangeWrapper | ||||
| | * | | Import fetchers from contract-wrappers | Fabio Berger | 2018-09-04 | 1 | -2/+2 |
| | | | | |||||
| | * | | Export fetchers from contract-wrappers | Fabio Berger | 2018-09-04 | 1 | -0/+3 |
| | | | | |||||
| | * | | Move fetchers to contract-wrappers | Fabio Berger | 2018-09-04 | 3 | -2/+12 |
| | | | | |||||
| * | | | Merge pull request #1050 from 0xProject/refactor/contracts/multisig | Amir Bandeali | 2018-09-05 | 11 | -112/+360 |
| |\ \ \ | | | | | | | | | | | Update MultiSig and add more tests | ||||
| | * | | | Remove TODOs that will not be addressed | Amir Bandeali | 2018-09-04 | 3 | -3/+2 |
| | | | | | |||||
| | * | | | Fix geth tests | Amir Bandeali | 2018-09-04 | 2 | -6/+12 |
| | | | | | |||||
| | * | | | Add test for external_call visibility | Amir Bandeali | 2018-09-04 | 1 | -0/+15 |
| | | | | | |||||
| | * | | | Add MultiSigWalletWithTimeLock revert reasons to tests | Amir Bandeali | 2018-09-04 | 4 | -15/+38 |
| | | | | | |||||
| | * | | | Update MultiSigWalletWithTimeLock to 0.4.24 | Amir Bandeali | 2018-09-04 | 2 | -24/+24 |
| | | | | | |||||
| | * | | | Add more tests for MultiSigWalletWithTimeLock | Amir Bandeali | 2018-09-04 | 2 | -1/+152 |
| | | | | | |||||
| | * | | | Add test for executeRemoveAuthorizedAddressAtIndex when called by non-owner | Amir Bandeali | 2018-09-04 | 1 | -4/+40 |
| | | | | | |||||
| | * | | | Update to most recent multisig | Amir Bandeali | 2018-09-04 | 3 | -71/+89 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1052 from 0xProject/feature/remove-types | Leonid Logvinov | 2018-09-04 | 17 | -165/+40 |
| |\ \ \ | | |/ / | |/| | | [typescript-typings] Remove types that were moved to DefinitelyTyped | ||||
| | * | | Fix the version | Leonid Logvinov | 2018-09-04 | 1 | -2/+1 |
| | | | | |||||
| | * | | Change doc gen configs | Leonid Logvinov | 2018-09-04 | 1 | -4/+2 |
| | | | | |||||
| | * | | Move types used in public interfaces to dependencies | Leonid Logvinov | 2018-09-04 | 1 | -2/+2 |
| | | | | |||||
| | * | | Add temporarily missing web3-provider-engine types in website | Leonid Logvinov | 2018-09-04 | 1 | -0/+1 |
| | | | | |||||
| | * | | Add CHANGELOG entry | Leonid Logvinov | 2018-09-04 | 1 | -0/+9 |
| | | | | |||||
| | * | | Add temporarily missing web3-provider-engine types in subproviders | Leonid Logvinov | 2018-09-04 | 1 | -0/+18 |
| | | | | |||||
| | * | | Remove types for web3-provider-engine from typescript-typings | Leonid Logvinov | 2018-09-04 | 5 | -62/+4 |
| | | | | |||||
| | * | | Remove types for eth-lightwallet from typescript-typings | Leonid Logvinov | 2018-09-04 | 3 | -55/+2 |
| | | | | |||||
| | * | | Remove types for detect-node from typescript-typings | Leonid Logvinov | 2018-09-04 | 2 | -3/+1 |
| | | | | |||||
| | * | | Remove types for ganache-core from typescript-typings | Leonid Logvinov | 2018-09-04 | 4 | -17/+3 |
| | | | | |||||
| | * | | Remove types for newman from typescript-typings | Leonid Logvinov | 2018-09-04 | 2 | -24/+1 |
| |/ / | |||||
| * | | Merge pull request #1053 from 0xProject/fix/linter_issues | Leonid Logvinov | 2018-09-04 | 2 | -6/+0 |
| |\ \ | | |/ | |/| | [website] Remove unused imports | ||||
| | * | Remove unused imports | Leonid Logvinov | 2018-09-04 | 2 | -6/+0 |
| |/ | |||||
| * | Merge pull request #1051 from 0xProject/fix/contracts/style | Amir Bandeali | 2018-09-04 | 44 | -76/+99 |
| |\ | | | | | | | Apply styling fixes to contracts | ||||
| | * | Apply styling fixes | Amir Bandeali | 2018-09-04 | 42 | -67/+64 |
| | | | |||||
| | * | Revert in Forwarder constructor if ERC20 proxy isn't registered | Amir Bandeali | 2018-09-04 | 2 | -9/+35 |
| |/ | |||||
| * | Merge pull request #1048 from 0xProject/feature/website/patch-v2-landing | Brandon Millman | 2018-08-31 | 3 | -10/+14 |
| |\ | | | | | | | [website] Final tweaks for landing page | ||||
| | * | Wording change for first benefit | Brandon Millman | 2018-08-31 | 1 | -1/+1 |
| | | | |||||
| | * | Tweaks to benefits and use cases | Brandon Millman | 2018-08-31 | 1 | -2/+6 |
| | | | |||||
| | * | Update yarn lock | Brandon Millman | 2018-08-31 | 1 | -30/+34 |
| | | | |||||
| | * | Final tweaks for landing page | fragosti | 2018-08-31 | 3 | -36/+32 |
| | | | |||||
| * | | Merge pull request #1047 from 0xProject/feature/re-add-no-unused-variables | Francesco Agosti | 2018-08-31 | 16 | -22/+11 |
| |\ \ | | | | | | | | | Re-add no-unused-variable tslint rule | ||||
| | * | | run prettier | fragosti | 2018-08-31 | 1 | -3/+1 |
| | | | | |||||
| | * | | Fix unused vars for react-shared and website | fragosti | 2018-08-31 | 16 | -19/+10 |
| | | | | |||||
| * | | | Merge pull request #1046 from ↵ | Greg Hysen | 2018-08-31 | 1 | -0/+94 |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | 0xProject/fix/contracts/roundingFeeTestsMatchOrders Test cases for rounding fees in matchOrders | ||||
| | * | | Test cases for rounding fees in matchOrders | Greg Hysen | 2018-08-31 | 1 | -0/+94 |
| | | | | |||||
| * | | | Merge pull request #1040 from 0xProject/feature/website/v2-tweaks | Brandon Millman | 2018-08-31 | 12 | -349/+699 |
| |\ \ \ | | | | | | | | | | | [website] Landing page tweaks for v2 launch | ||||
| | * | | | Revert whats new text | Brandon Millman | 2018-08-31 | 1 | -2/+1 |
| | | | | | |||||
| | * | | | Add new exchange everywhere graphic | Brandon Millman | 2018-08-31 | 2 | -4/+8 |
| | | | | | |||||
| | * | | | Remove unused render methods in landing page | Brandon Millman | 2018-08-31 | 1 | -110/+0 |
| | | | | | |||||
| | * | | | Update yarn lock | Brandon Millman | 2018-08-31 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Merge pull request #1042 from 0xProject/feature/website/v2-tweaks-fra | Francesco Agosti | 2018-08-31 | 8 | -26/+146 |
| | |\ \ \ | | | | | | | | | | | | | [website] Add rotating text to landing header and careers button to topbar | ||||
| | | * | | | Remove conflict strings | fragosti | 2018-08-31 | 1 | -3/+0 |
| | | | | | | |||||
| | | * | | | Add careers page to top bar | fragosti | 2018-08-31 | 1 | -1/+11 |
| | | | | | | |||||
| | | * | | | Final tweaks | fragosti | 2018-08-31 | 3 | -11/+17 |
| | | | | | | |||||
| | | * | | | Remove redundant import | fragosti | 2018-08-31 | 1 | -1/+0 |
| | | | | | | |||||
| | | * | | | Add TypedText component and use it on landing page | fragosti | 2018-08-31 | 7 | -1/+119 |
| | | | | | | |||||
| | | * | | | Add generic title changes | fragosti | 2018-08-31 | 1 | -17/+7 |
| | |/ / / | |||||
| | * | | | Added todo comments for missing items | Brandon Millman | 2018-08-31 | 1 | -1/+2 |
| | | | | | |||||
| | * | | | Add title header to use cases section | Brandon Millman | 2018-08-31 | 3 | -14/+13 |
| | | | | | |||||
| | * | | | Make hero image responsive | Brandon Millman | 2018-08-31 | 1 | -2/+3 |
| | | | | | |||||
| | * | | | Update what's new styling | Brandon Millman | 2018-08-31 | 1 | -4/+4 |
| | | | | | |||||
| | * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-08-30 | 32 | -426/+581 |
| | |\ \ \ | | | | |/ | | | |/| | | | | | | feature/website/v2-tweaks | ||||
| | * | | | Update use cases section | Brandon Millman | 2018-08-30 | 3 | -51/+98 |
| | | | | | |||||
| | * | | | Update tokenization section | Brandon Millman | 2018-08-30 | 3 | -45/+15 |
| | | | | | |||||
| | * | | | Update benefits | Brandon Millman | 2018-08-30 | 2 | -8/+6 |
| | | | | | |||||
| | * | | | Update whats new | Brandon Millman | 2018-08-30 | 1 | -13/+19 |
| | | | | | |||||
| | * | | | Add new header image | Brandon Millman | 2018-08-30 | 2 | -4/+391 |
| | | | | | |||||
| | * | | | Replace projects section with relayers | Brandon Millman | 2018-08-30 | 1 | -77/+5 |
| | | | | | |||||
* | | | | | Update exchange ABI for decoding logs | Brandon Millman | 2018-08-31 | 2 | -615/+1 |
| | | | | | |||||
* | | | | | Remove LogError legacy stuff | Brandon Millman | 2018-08-31 | 1 | -4/+0 |
| | | | | | |||||
* | | | | | Update comment for validation | Brandon Millman | 2018-08-31 | 1 | -1/+2 |
| | | | | | |||||
* | | | | | Remove commented out block | Brandon Millman | 2018-08-31 | 1 | -20/+0 |
| | | | | | |||||
* | | | | | Remove cancel check | Brandon Millman | 2018-08-31 | 2 | -12/+0 |
| | | | | | |||||
* | | | | | Update yarn lock | Brandon Millman | 2018-08-31 | 1 | -25/+4 |
| | | | | | |||||
* | | | | | Update generate and fill order flows | Brandon Millman | 2018-08-31 | 7 | -30/+41 |
| | | | | | |||||
* | | | | | Token registry from old 0x version | Brandon Millman | 2018-08-31 | 3 | -11/+73 |
| | | | | | |||||
* | | | | | Fix import | Brandon Millman | 2018-08-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Fix contract not deployed on network bug in ContractWrapper class | Brandon Millman | 2018-08-31 | 2 | -1/+8 |
| | | | | | |||||
* | | | | | Update typings version | Brandon Millman | 2018-08-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Initial changes for v2 portal | Brandon Millman | 2018-08-31 | 17 | -368/+329 |
|/ / / / | |||||
* | | | | Merge pull request #1045 from 0xProject/feature/contracts/cancelOrderInternal | Amir Bandeali | 2018-08-31 | 5 | -9/+31 |
|\ \ \ \ | | | | | | | | | | | Add cancelOrderInternal, use within batchCancelOrders | ||||
| * | | | | Add cancelOrderInternal, use within batchCancelOrders | Amir Bandeali | 2018-08-31 | 5 | -9/+31 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1043 from 0xProject/feature/contracts/edgeCaseTests | Amir Bandeali | 2018-08-31 | 8 | -15/+404 |
|\ \ \ \ | |/ / / |/| | | | Add edge case tests | ||||
| * | | | Add tests for token that returns >32 bytes | Amir Bandeali | 2018-08-31 | 5 | -4/+134 |
| | | | | |||||
| * | | | Add more proxy tests | Amir Bandeali | 2018-08-31 | 1 | -8/+176 |
| | | | | |||||
| * | | | Update used addresses for authorizable tests | Amir Bandeali | 2018-08-31 | 1 | -2/+2 |
| | | | | |||||
| * | | | Add test for fillOrder and dispatchTransferFrom where maker == taker | Amir Bandeali | 2018-08-31 | 2 | -1/+92 |
| | | | | |||||
* | | | | Merge pull request #1041 from ↵ | Amir Bandeali | 2018-08-30 | 12 | -122/+105 |
|\| | | | | | | | | | | | | | | | | | | | 0xProject/refactor/contracts/assetProxyOwnerVersion Update AssetProxyOwner to 0.4.24, remove redundant code | ||||
| * | | | Fix geth tests | Amir Bandeali | 2018-08-30 | 8 | -47/+83 |
| | | | | |||||
| * | | | Remove unused imports | Amir Bandeali | 2018-08-30 | 3 | -5/+1 |
| | | | | |||||
| * | | | Update AssetProxyOwner to 0.4.24 | Amir Bandeali | 2018-08-30 | 3 | -70/+21 |
|/ / / | |||||
* | | | Merge pull request #1023 from 0xProject/website/feature/react-16 | Francesco Agosti | 2018-08-30 | 19 | -294/+368 |
|\ \ \ | | | | | | | | | [website] Upgrade all the things to React 16 | ||||
| * | | | Apply prettier | fragosti | 2018-08-30 | 1 | -5/+6 |
| | | | | |||||
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-08-30 | 80 | -183/+276 |
| |\| | | | | | | | | | | | | | | website/feature/react-16 | ||||
| * | | | Change VersionDropDown to use material-ui 3 | fragosti | 2018-08-29 | 3 | -11/+216 |
| | | | | |||||
| * | | | Upgrade version of react-shared in website | fragosti | 2018-08-29 | 3 | -39/+3 |
| | | | | |||||
| * | | | Upgrade react-copy-to-clipboard | fragosti | 2018-08-29 | 2 | -17/+8 |
| | | | | |||||
| * | | | Remove react-tap-event-plugin from react-shared | fragosti | 2018-08-29 | 2 | -12/+5 |
| | | | | |||||
| * | | | Upgrade material ui in react-docs | fragosti | 2018-08-29 | 2 | -62/+9 |
| | | | | |||||
| * | | | Update lockfile | fragosti | 2018-08-29 | 1 | -3/+3 |
| | | | | |||||
| * | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-08-29 | 140 | -1085/+3940 |
| |\ \ \ | | | | | | | | | | | | | | | | website/feature/react-16 | ||||
| * | | | | Update material-ui in react-shared | fragosti | 2018-08-29 | 3 | -2/+39 |
| | | | | | |||||
| * | | | | Revert "Simplify dropdown component" | fragosti | 2018-08-29 | 1 | -15/+25 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 91a9014a50cca8e0d42634666fe409839aeae8cf. | ||||
| * | | | | Revert "Have new Popover component working in React 16" | fragosti | 2018-08-29 | 8 | -84/+39 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit 5785ec0713c39466b3a6a171f5f0a2d38207b44b. | ||||
| * | | | | Revert "Enable hovering state for dropdown" | fragosti | 2018-08-29 | 3 | -10/+7 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit ac1640140c9279ac9e8a92d84702a2f84d9165fb. | ||||
| * | | | | Upgrade material ui to 0.20.0 | fragosti | 2018-08-29 | 2 | -4/+64 |
| | | | | | |||||
| * | | | | Enable hovering state for dropdown | fragosti | 2018-08-29 | 3 | -7/+10 |
| | | | | | |||||
| * | | | | Have new Popover component working in React 16 | fragosti | 2018-08-28 | 8 | -39/+84 |
| | | | | | |||||
| * | | | | Simplify dropdown component | fragosti | 2018-08-25 | 1 | -25/+15 |
| | | | | | |||||
| * | | | | Change all onTouchTap to onClick | fragosti | 2018-08-25 | 13 | -18/+18 |
| | | | | | |||||
| * | | | | Upgrade typescript version used by sra-spec | fragosti | 2018-08-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add typescript dependency to typescript-typings (no idea how it was working) | fragosti | 2018-08-25 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Bump react-highlight in react-shared once more | fragosti | 2018-08-25 | 2 | -6/+6 |
| | | | | | |||||
| * | | | | Upgrade react-shared used by website to one that depends on react 16 | fragosti | 2018-08-25 | 2 | -155/+10 |
| | | | | | |||||
| * | | | | Upgrade react-highlight to version that depends on React 16 | fragosti | 2018-08-25 | 2 | -1/+10 |
| | | | | | |||||
| * | | | | Upgrade react in react-docs | fragosti | 2018-08-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Update react and remove tap event plugin [deprecated] | fragosti | 2018-08-25 | 4 | -38/+38 |
| | | | | | |||||
| * | | | | Merge branch 'development' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-08-25 | 138 | -3560/+4683 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | website/feature/react-16 | ||||
| * | | | | | Add new react and types | fragosti | 2018-08-25 | 2 | -3386/+3206 |
| | | | | | | |||||
* | | | | | | Merge pull request #1039 from 0xProject/fix/contracts/audit2Fixes | Greg Hysen | 2018-08-30 | 5 | -17/+115 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | Fixes as-per Audit for LibBytes + ERC20 Proxy Comments | ||||
| * | | | | Typos in LibBytes tests | Greg Hysen | 2018-08-30 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Reverted syntax used by readBytes4 in AssetProxyOwner to be compatible with ↵ | Greg Hysen | 2018-08-30 | 1 | -5/+1 |
| | | | | | | | | | | | | | | | | | | | | Solidity v0.4.10 | ||||
| * | | | | More tests for LibBytes | Greg Hysen | 2018-08-30 | 1 | -3/+16 |
| | | | | | |||||
| * | | | | Updated comments for ERC20 proxy to clarify how we load the token address ↵ | Greg Hysen | 2018-08-30 | 2 | -9/+60 |
| | | | | | | | | | | | | | | | | | | | | from calldata (3.18 from audit) | ||||
| * | | | | Updated readBytes4 to match spec + added unit tests. These are 3.5/3.6 from ↵ | Greg Hysen | 2018-08-30 | 3 | -4/+42 |
| | |_|/ | |/| | | | | | | | | | | audit | ||||
* / | | | feat: Add support for TypeScript project references (#991) | Alex Browne | 2018-08-30 | 80 | -182/+276 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Update all package.json and tsconfig.json * fix(contracts): Make test/utils/web3_wrapper.ts compatible with project refs * Fix webpack config for 0x.js * Fix linter errors by adding rootDir to tsconfig.json as needed * Add build:ts and watch:ts commands to package.json * Update sra-spec to work with project references * Update tsconfig.json with latest new/removed packages * Add TypeScript as devDependency at root * Add missing rootDir to forwarder-helper package * Use a separate tsconfig file for typedoc * Fix linter errors * Apply PR feedback (add comments) * Fix 0x.js tsconfig | ||||
* | | | Merge pull request #1022 from ↵ | Brandon Millman | 2018-08-29 | 13 | -66/+490 |
|\ \ \ | | | | | | | | | | | | | | | | | 0xProject/feature/contract-wrappers/order-validator [contract-wrappers] Write wrapper for OrderValidator contract | ||||
| * | | | Export missing types and add OrderValidatorWrapper to hidden constructors | Brandon Millman | 2018-08-29 | 3 | -0/+7 |
| | | | | |||||
| * | | | Add OrderValidatorWrapper to public interface | Brandon Millman | 2018-08-28 | 2 | -0/+2 |
| | | | | |||||
| * | | | Add contract-wrappers changelog entry for OrderValidatorWrapper | Brandon Millman | 2018-08-28 | 1 | -0/+8 |
| | | | | |||||
| * | | | Fix broken test | Brandon Millman | 2018-08-28 | 1 | -2/+3 |
| | | | | |||||
| * | | | Add getBalancesAndAllowances to wrapper | Brandon Millman | 2018-08-28 | 1 | -0/+25 |
| | | | | |||||
| * | | | Update OrderValidator artifact to include getBalancesAndAllowances function | Brandon Millman | 2018-08-28 | 1 | -62/+113 |
| | | | | |||||
| * | | | Add params to all function comments | Brandon Millman | 2018-08-28 | 1 | -0/+12 |
| | | | | |||||
| * | | | Add getERC721Owner to wrapper | Brandon Millman | 2018-08-28 | 1 | -1/+13 |
| | | | | |||||
| * | | | Update getOrdersAndTradersInfo to return an array instead | Brandon Millman | 2018-08-28 | 2 | -12/+12 |
| | | | | |||||
| * | | | Add getBalanceAndAllowance to wrapper | Brandon Millman | 2018-08-28 | 2 | -1/+25 |
| | | | | |||||
| * | | | Add getTraderInfo and getTradersInfo to wrapper | Brandon Millman | 2018-08-28 | 1 | -2/+27 |
| | | | | |||||
| * | | | Add getOrderAndTraderInfoAsync to wrapper | Brandon Millman | 2018-08-28 | 2 | -2/+24 |
| | | | | |||||
| * | | | Add test for order validator | Brandon Millman | 2018-08-28 | 2 | -0/+142 |
| | | | | |||||
| * | | | Remove some unused variables in forwarder wrapper test | Brandon Millman | 2018-08-28 | 1 | -3/+0 |
| | | | | |||||
| * | | | Initial OrderValidator wrapper | Brandon Millman | 2018-08-28 | 5 | -1/+97 |
| | | | | |||||
* | | | | Merge pull request #1036 from 0xProject/fix/contracts/calculateFillResults | Greg Hysen | 2018-08-29 | 2 | -9/+12 |
|\ \ \ \ | | | | | | | | | | | Making rounding consistent in calculateFillResults | ||||
| * | | | | Making rounding consistent in calculateFillResults | Amir Bandeali | 2018-08-29 | 2 | -9/+12 |
|/ / / / | |||||
* | | | | safeGetPartialAmount (#1035) | Amir Bandeali | 2018-08-29 | 7 | -110/+442 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added Test "Should transfer correct amounts when left order is fully filled and values pass isRoundingErrorCeil but fail isRoundingErrorFloor" * Added RoundingError exception to reference function for getPartialAmount * Added RoundingError exception to reference function for getPartialAmount * Added isRoundingErrorCeil to getPartialAmountCeil reference funtion * Computed new values for "Should give right maker a better buy price when correct price is not integral" that does not have a rounding error * Almost all tests for match orders are passing after adding isRoundingErrorCeil check * WIP commit: Added rounding error checks to getPartialAmount * WIP commit: Added rounding error checks to getPartialAmount * Use safe versions of getPartialAmount * Update Exchange internals tests * Run linter * Found new values for "Should transfer correct amounts when right order fill amount deviates from amount derived by `Exchange.fillOrder`" * Fixed merge conflicts * Run all tests * Cleaned up some comments on match Orders tests * Fix tests for geth | ||||
* | | | | fix(contracts): Catch cases where the actual error differs from the expected ↵ | Alex Browne | 2018-08-28 | 2 | -26/+109 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | error (#1032) * Catch cases where the actual error differs from the expected error * Add tests for testWithReferenceFuncAsync * Small style and comment fixes | ||||
* | | | | Merge pull request #1030 from 0xProject/fix/contracts/forwarderFillOrderNoThrow | Amir Bandeali | 2018-08-28 | 2 | -8/+3 |
|\ \ \ \ | |/ / / |/| | | | Remove redundant mstores from fillOrderNoThrow | ||||
| * | | | Add clarifying comments | Amir Bandeali | 2018-08-28 | 2 | -0/+2 |
| | | | | |||||
| * | | | Remove redundant mstores from fillOrderNoThrow | Amir Bandeali | 2018-08-28 | 1 | -8/+1 |
|/ / / | |||||
* | | | Merge pull request #1031 from ↵ | Alex Browne | 2018-08-28 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | 0xProject/fix/internal-tests-division-by-zero-assertion Use correct error message for division by zero | ||||
| * | | | fix(contracts): Use correct error message for division by zero | Alex Browne | 2018-08-28 | 1 | -3/+1 |
|/ / / | |||||
* | | | Exit with non-error code at end of publishRelease | Fabio Berger | 2018-08-27 | 1 | -0/+1 |
| | | | |||||
* | | | Publishcontracts@2.1.42@0xproject/website@0.0.46@0xproject/web3-wrapper@2.0.1@0xproject/utils@1.0.7@0xproject/types@1.0.1-rc.6@0xproject/testnet-faucets@1.0.43@0xproject/subproviders@2.0.1@0xproject/sra-spec@1.0.1-rc.6@0xproject/sra-report@1.0.7@0xproject/sol-resolver@1.0.7@0xproject/sol-cov@2.1.1@0xproject/sol-compiler@1.1.1@0xproject/react-shared@1.0.8@0xproject/react-docs@1.0.7@0xproject/order-watcher@1.0.1-rc.5@0xproject/order-utils@1.0.1-rc.6@0xproject/monorepo-scripts@1.0.7@0xproject/migrations@1.0.6@0xproject/metacoin@0.0.17@0xproject/json-schemas@1.0.1-rc.6@0xproject/forwarder-helper@1.0.1-rc.2@0xproject/fill-scenarios@1.0.1-rc.5@0xproject/dev-utils@1.0.6@0xproject/contract-wrappers@1.0.1-rc.5@0xproject/connect@2.0.0-rc.2@0xproject/base-contract@2.0.1@0xproject/assert@1.0.7@0xproject/abi-gen@1.0.70x.js@1.0.1-rc.6 | Fabio Berger | 2018-08-27 | 29 | -169/+165 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@1.0.1-rc.6 - @0xproject/abi-gen@1.0.7 - @0xproject/assert@1.0.7 - @0xproject/base-contract@2.0.1 - @0xproject/connect@2.0.0-rc.2 - @0xproject/contract-wrappers@1.0.1-rc.5 - contracts@2.1.42 - @0xproject/dev-utils@1.0.6 - @0xproject/fill-scenarios@1.0.1-rc.5 - @0xproject/forwarder-helper@1.0.1-rc.2 - @0xproject/json-schemas@1.0.1-rc.6 - @0xproject/metacoin@0.0.17 - @0xproject/migrations@1.0.6 - @0xproject/monorepo-scripts@1.0.7 - @0xproject/order-utils@1.0.1-rc.6 - @0xproject/order-watcher@1.0.1-rc.5 - @0xproject/react-docs@1.0.7 - @0xproject/react-shared@1.0.8 - @0xproject/sol-compiler@1.1.1 - @0xproject/sol-cov@2.1.1 - @0xproject/sol-resolver@1.0.7 - @0xproject/sra-report@1.0.7 - @0xproject/sra-spec@1.0.1-rc.6 - @0xproject/subproviders@2.0.1 - @0xproject/testnet-faucets@1.0.43 - @0xproject/types@1.0.1-rc.6 - @0xproject/utils@1.0.7 - @0xproject/web3-wrapper@2.0.1 - @0xproject/website@0.0.46 | ||||
* | | | Updated CHANGELOGS | Fabio Berger | 2018-08-27 | 48 | -10/+252 |
| | | | |||||
* | | | Fix prettier | Fabio Berger | 2018-08-27 | 8 | -16/+8 |
| | | | |||||
* | | | Update changelog files for RC packages | Fabio Berger | 2018-08-27 | 9 | -0/+84 |
| | | | |||||
* | | | Merge pull request #1028 from 0xProject/fix-ci | Fabio Berger | 2018-08-27 | 5 | -12/+16 |
|\ \ \ | | | | | | | | | Fix `test_publish` CI Test | ||||
| * | | | Skip doc generation for local publishes since we test this in a separate CI test | Fabio Berger | 2018-08-27 | 1 | -3/+5 |
| | | | | |||||
| * | | | Fix typo | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | Use absolute path | Fabio Berger | 2018-08-27 | 1 | -3/+1 |
| | | | | |||||
| * | | | Merge branch 'development' into fix-ci | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | * development: Run yarn a second time if the first fails | ||||
| | * \ \ | Merge branch 'development' of github.com:0xProject/0x-monorepo into development | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x-monorepo: Run yarn a second time if the first fails | ||||
* | | | | | Run yarn a second time if the first fails | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Try relative to root dir | Fabio Berger | 2018-08-27 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | merge development | Fabio Berger | 2018-08-27 | 1 | -3/+3 |
| |\| | | | |||||
| | * | | | Merge branch 'development' of github.com:0xProject/0x-monorepo into development | Fabio Berger | 2018-08-27 | 5 | -9/+13 |
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'development' of github.com:0xProject/0x-monorepo: Fix command Move md files to lib folder during build Change exit code to failure Fix sra-spec `main` and `types` in package.json Issue #1025 BlockParam unroll fix: Use yarn version 1.9.4 on CI | ||||
* | | | | | Merge pull request #1009 from 0xProject/fix/ci-yarn-1.9.4 | Fabio Berger | 2018-08-27 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | fix: Use yarn version 1.9.4 on CI | ||||
| * | | | | | fix: Use yarn version 1.9.4 on CI | Alex Browne | 2018-08-24 | 1 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Fix command | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Move md files to lib folder during build | Fabio Berger | 2018-08-27 | 2 | -2/+4 |
| | | | | | |||||
* | | | | | Change exit code to failure | Fabio Berger | 2018-08-27 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Fix sra-spec `main` and `types` in package.json | Fabio Berger | 2018-08-27 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Merge pull request #1026 from ↵ | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/fix/contract-wrappers/block-param-literal [contract_templates] Issue #1025 BlockParam unroll | ||||
| * | | | | | Issue #1025 BlockParam unroll | Jacob Evans | 2018-08-27 | 1 | -1/+1 |
|/ / / / / | | | | | | | | | | | | | | | | BlockParam unrolls into number | BlockParamLiteral, though BlockParamLiteral does not get imported. This results in type build errors in downstream projects where tslint checks libs | ||||
| | * | | | Actual relative path | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Try relative path | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fix command | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Move md files to lib folder during build | Fabio Berger | 2018-08-27 | 2 | -2/+4 |
| | | | | | |||||
| | * | | | Fix sra-spec `main` and `types` in package.json | Fabio Berger | 2018-08-27 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Add BlockParamLiteral to template | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Remove check since this method is now used in multiple places | Fabio Berger | 2018-08-27 | 1 | -5/+0 |
| | | | | | |||||
| | * | | | Also use failure exit code if unexpected error occurs | Fabio Berger | 2018-08-27 | 1 | -1/+3 |
| | | | | | |||||
| | * | | | Change exit code to failure | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | |/ / | |||||
| | * / | Combine imports | Fabio Berger | 2018-08-27 | 1 | -2/+9 |
| |/ / |/| | | |||||
* | | | Bumop 0x.js version0x.js@1.0.1-rc.5 | Fabio Berger | 2018-08-27 | 1 | -1/+1 |
| | | | |||||
* | | | Fix file path to main and types in package.json | Fabio Berger | 2018-08-27 | 2 | -2/+11 |
| | | | |||||
* | | | Merge pull request #986 from 0xProject/feature/contracts/assertions | Amir Bandeali | 2018-08-25 | 4 | -30/+117 |
|\ \ \ | | | | | | | | | Add more assertions to assertValidFill | ||||
| * \ \ | Merge branch 'fix/contracts/robustMatching' of github.com:0xProject/0x.js ↵ | Remco Bloemen | 2018-08-25 | 32 | -300/+1081 |
| |\ \ \ | | | | | | | | | | | | | | | | into fix/contracts/robustMatching | ||||
| * | | | | Revert maker not equal taker check | Remco Bloemen | 2018-08-25 | 1 | -6/+1 |
| | | | | | |||||
| * | | | | Fix mixin api | Remco Bloemen | 2018-08-25 | 3 | -21/+36 |
| | | | | | |||||
| * | | | | Fix double definition of error | Remco Bloemen | 2018-08-25 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Split into assertFillable and assertValidFill | Remco Bloemen | 2018-08-25 | 2 | -29/+43 |
| | | | | | |||||
| * | | | | Disallow self filling | Remco Bloemen | 2018-08-25 | 1 | -1/+7 |
| | | | | | |||||
| * | | | | Add revert reasons to types | Remco Bloemen | 2018-08-25 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Remove BUG_ from revert reasons | Remco Bloemen | 2018-08-25 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Document accetable price check | Remco Bloemen | 2018-08-25 | 1 | -2/+16 |
| | | | | | |||||
| * | | | | Fix taker overpay check | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Check fillable early | Remco Bloemen | 2018-08-25 | 1 | -0/+6 |
| | | | | | |||||
| * | | | | Update for new assertValidFill signature | Remco Bloemen | 2018-08-25 | 2 | -5/+8 |
| | | | | | |||||
| * | | | | Add overfill and price assertion to assertValidFill | Remco Bloemen | 2018-08-25 | 2 | -2/+32 |
| | | | | | |||||
* | | | | | Merge pull request #1008 from 0xProject/fix/contracts/robustMatching | Amir Bandeali | 2018-08-25 | 4 | -277/+848 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Robustness in Order Matching | ||||
| * | | | | Added comments to order matching | Greg Hysen | 2018-08-25 | 1 | -1/+13 |
| | | | | | |||||
| * | | | | Rephrased some of the math in MixinMatchOrders to improve readability | Greg Hysen | 2018-08-25 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Run all tests | Greg Hysen | 2018-08-25 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Give right maker better price when correct value is not integral | Greg Hysen | 2018-08-25 | 1 | -10/+14 |
| | | | | | |||||
| * | | | | Extract only `fill` event logs | Greg Hysen | 2018-08-25 | 1 | -4/+5 |
| | | | | | |||||
| * | | | | Added temporary @todo to MixinMatchOrders | Greg Hysen | 2018-08-25 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | Wording in MixinMatchOrders | Greg Hysen | 2018-08-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Addressed linter errors in match order tesster | Greg Hysen | 2018-08-25 | 1 | -9/+2 |
| | | | | | |||||
| * | | | | Removed a redundant comment from matchOrders | Greg Hysen | 2018-08-25 | 1 | -5/+1 |
| | | | | | |||||
| * | | | | Tests for matchOrders edge cases | Greg Hysen | 2018-08-25 | 1 | -13/+71 |
| | | | | | |||||
| * | | | | Swapped direction of `expect` values to match output in failure cases | Greg Hysen | 2018-08-25 | 1 | -37/+26 |
| | | | | | |||||
| * | | | | Renaming verify -> assert in order matching | Greg Hysen | 2018-08-25 | 2 | -53/+52 |
| | | | | | |||||
| * | | | | Fixed a function comment | Greg Hysen | 2018-08-25 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Added function signature comments | Greg Hysen | 2018-08-25 | 3 | -239/+233 |
| | | | | | |||||
| * | | | | Added `expect` messages for checking left/right order states | Greg Hysen | 2018-08-25 | 1 | -2/+6 |
| | | | | | |||||
| * | | | | Ran prettier and linter | Greg Hysen | 2018-08-25 | 3 | -224/+317 |
| | | | | | |||||
| * | | | | Updated all existing match order tests to use new format | Greg Hysen | 2018-08-25 | 2 | -128/+301 |
| | | | | | |||||
| * | | | | Passes comprehensive test | Greg Hysen | 2018-08-25 | 1 | -191/+141 |
| | | | | | |||||
| * | | | | Verify logs | Greg Hysen | 2018-08-25 | 1 | -72/+44 |
| | | | | | |||||
| * | | | | First balance test with intentional values | Greg Hysen | 2018-08-25 | 2 | -59/+95 |
| | | | | | |||||
| * | | | | Ironing out the new set of test cases for order matchubng | Greg Hysen | 2018-08-25 | 2 | -11/+102 |
| | | | | | |||||
| * | | | | Rounding for fees in match orders addressed, plus example | Greg Hysen | 2018-08-25 | 2 | -9/+83 |
| | | | | | |||||
| * | | | | All existing tests pass. | Greg Hysen | 2018-08-25 | 2 | -21/+137 |
| | | | | | |||||
| * | | | | Added fees to matchOrders (previously in calculateFillResults | Greg Hysen | 2018-08-25 | 1 | -0/+24 |
| | | | | | |||||
| * | | | | Removed calculateFillResults from matchOrders workflow. Eliminates ↵ | Greg Hysen | 2018-08-25 | 1 | -38/+29 |
|/ / / / | | | | | | | | | | | | | compounded rounding errors. | ||||
* | | | | Merge pull request #1002 from 0xProject/feature/contracts/mutex | Amir Bandeali | 2018-08-25 | 16 | -176/+680 |
|\ \ \ \ | | | | | | | | | | | [contracts] Add mutexes and reentrancy guards | ||||
| * | | | | Fix build | Amir Bandeali | 2018-08-25 | 1 | -4/+7 |
| | | | | | |||||
| * | | | | Only use one nonReentrant modifier, remove modifier from fillOrderNoThrow ↵ | Amir Bandeali | 2018-08-25 | 6 | -61/+11 |
| | | | | | | | | | | | | | | | | | | | | variations | ||||
| * | | | | Add tests for matchOrders | Amir Bandeali | 2018-08-25 | 2 | -122/+53 |
| | | | | | |||||
| * | | | | Add reentrancy tests for fillOrder and wrapper functions | Amir Bandeali | 2018-08-25 | 4 | -0/+239 |
| | | | | | |||||
| * | | | | Update ReentrantERC20Token with new functions and check that revert is ↵ | Amir Bandeali | 2018-08-25 | 1 | -35/+75 |
| | | | | | | | | | | | | | | | | | | | | occuring for correct reason | ||||
| * | | | | Add nonReentrant modifiers on functions that use getCurrentContextAddress ↵ | Amir Bandeali | 2018-08-25 | 4 | -15/+17 |
| | | | | | | | | | | | | | | | | | | | | only, add lockMutex modifier on functions that make external calls | ||||
| * | | | | Split modifiers into check only and check, lock, unlock | Amir Bandeali | 2018-08-25 | 1 | -0/+13 |
| | | | | | |||||
| * | | | | Add ReentrantToken | Amir Bandeali | 2018-08-25 | 3 | -1/+175 |
| | | | | | |||||
| * | | | | Add internal fill functions, add reentrancy guard to public functions that ↵ | Amir Bandeali | 2018-08-25 | 6 | -41/+148 |
| | | | | | | | | | | | | | | | | | | | | make external calls | ||||
| * | | | | Add ReentrancyGuard contract | Amir Bandeali | 2018-08-25 | 1 | -0/+44 |
| | | | | | |||||
| * | | | | Remove redundant sload from getCurrentContextAddress | Amir Bandeali | 2018-08-25 | 1 | -1/+2 |
|/ / / / | |||||
* | | | | Merge pull request #1003 from 0xProject/feature/contracts/roundup | Amir Bandeali | 2018-08-25 | 18 | -115/+392 |
|\ \ \ \ | | | | | | | | | | | [contracts] Add getPartialAmountCeil and isRoundingErrorCeil | ||||
| * | | | | Fix linting errors | Amir Bandeali | 2018-08-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Stylistic fixes | Remco Bloemen | 2018-08-25 | 1 | -5/+20 |
| | | | | | |||||
| * | | | | Append -Floor to getPartialAmount and isRoundingError | Remco Bloemen | 2018-08-25 | 17 | -59/+59 |
| | | | | | |||||
| * | | | | Disambiguate the operator precedence | Remco Bloemen | 2018-08-25 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Add tests | Remco Bloemen | 2018-08-25 | 4 | -23/+145 |
| | | | | |