Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Export ArtifactWriter from migrations package | Fabio Berger | 2018-06-12 | 2 | -0/+9 |
| | |||||
* | Remove unused artifact file | Fabio Berger | 2018-06-12 | 1 | -13/+0 |
| | |||||
* | Pass in generated contract wrapper to orderValidationUtils at instantiation | Fabio Berger | 2018-06-11 | 1 | -10/+25 |
| | |||||
* | Refactor orderValidationUtils to use the generated contract wrapper instead ↵ | Fabio Berger | 2018-06-11 | 1 | -7/+11 |
| | | | | of the higher-level one | ||||
* | Refactor ExchangeTransferSimulator public interface to accet an ↵ | Fabio Berger | 2018-06-11 | 6 | -19/+71 |
| | | | | AbstractBalanceAndProxyAllowanceLazyStore so that this module could be re-used in different contexts. | ||||
* | Merge pull request #627 from 0xProject/feature/contracts/erc721SafeTransferFrom | Greg Hysen | 2018-06-09 | 45 | -429/+1641 |
|\ | | | | | On-Chain AssetData Decoding Lib + safeTransferFrom for ERC721 + Memcpy | ||||
| * | Linter changes to contracts | Greg Hysen | 2018-06-09 | 4 | -21/+6 |
| | | |||||
| * | Fixed assetProxyUtils for linter | Greg Hysen | 2018-06-09 | 1 | -2/+2 |
| | | |||||
| * | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 3 | -28/+36 |
| | | |||||
| * | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 5 | -8/+7 |
| | | |||||
| * | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 2 | -13/+13 |
| | | |||||
| * | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 3 | -753/+11 |
| | | |||||
| * | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 5 | -25/+25 |
| | | |||||
| * | Moved some constants to global scope in assetProxyUtils | Greg Hysen | 2018-06-08 | 1 | -18/+26 |
| | | |||||
| * | Style updates to contracts | Greg Hysen | 2018-06-08 | 7 | -28/+23 |
| | | |||||
| * | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 3 | -21/+6 |
| | | |||||
| * | Fixed a styling throughout contracts. Moved closing parenthesis for long ↵ | Greg Hysen | 2018-06-08 | 8 | -31/+62 |
| | | | | | | | | list of function parameters to next line. | ||||
| * | Removed setting makerAssetData/takerAssetData from tests where values are ↵ | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
| | | | | | | | | same as defaultOrderParams. | ||||
| * | 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 | 7 | -16/+27 |
| | | |||||
| * | Fixed after rebase | Greg Hysen | 2018-06-08 | 3 | -5/+5 |
| | | |||||
| * | Fixes after rebasing | Greg Hysen | 2018-06-08 | 6 | -49/+54 |
| | | |||||
| * | updated migrations artifacts | Greg Hysen | 2018-06-08 | 1 | -1/+735 |
| | | |||||
| * | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 8 | -53/+34 |
| | | |||||
| * | 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 ↵ | Greg Hysen | 2018-06-08 | 2 | -144/+154 |
| | | | | | | | | "negative" and wrap around. | ||||
| * | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. ↵ | Greg Hysen | 2018-06-08 | 9 | -95/+64 |
| | | | | | | | | 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 | 23 | -323/+290 |
| | | | | | | | | assetMetadata, proxyData, proxyMetadata to assetData | ||||
| * | proxyData -> assetData | Greg Hysen | 2018-06-08 | 2 | -12/+12 |
| | | |||||
| * | Implement memcpy using masking and end-aligned words | Remco Bloemen | 2018-06-08 | 1 | -59/+85 |
| | | |||||
| * | Add tests for word loop iteration | Remco Bloemen | 2018-06-08 | 1 | -2/+6 |
| | | |||||
| * | Add test for zero-size overlap | Remco Bloemen | 2018-06-08 | 1 | -1/+3 |
| | | |||||
| * | Add test cases | Remco Bloemen | 2018-06-08 | 1 | -17/+133 |
| | | |||||
| * | Cleanup test script | Remco Bloemen | 2018-06-08 | 1 | -16/+1 |
| | | |||||
| * | Convert Solidity tests to vectors | Remco Bloemen | 2018-06-08 | 2 | -232/+6 |
| | | |||||
| * | Generate tests from vectors | Remco Bloemen | 2018-06-08 | 2 | -5/+64 |
| | | |||||
| * | Tests for writing bytes to nested bytes | Greg Hysen | 2018-06-08 | 1 | -9/+91 |
| | | |||||
| * | Fixed up wording in memcpy | Greg Hysen | 2018-06-08 | 1 | -3/+3 |
| | | |||||
| * | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 6 | -32/+223 |
| | | |||||
| * | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 6 | -5/+126 |
| | | |||||
| * | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 3 | -35/+70 |
| | | |||||
| * | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 8 | -2/+216 |
| | | |||||
| * | Tests for libMem | Greg Hysen | 2018-06-08 | 5 | -16/+80 |
| | | |||||
| * | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721Receiver | Greg Hysen | 2018-06-08 | 8 | -27/+581 |
| | | |||||
* | | Merge pull request #674 from 0xProject/feature/geth-test-ci | Alex Browne | 2018-06-09 | 2 | -19/+24 |
|\ \ | |/ |/| | Run contracts tests against Geth in CI | ||||
| * | Run contracts tests against Geth in CI | Alex Browne | 2018-06-08 | 2 | -19/+24 |
|/ | |||||
* | Merge pull request #679 from 0xProject/fix/await-transactions | Leonid Logvinov | 2018-06-08 | 2 | -23/+53 |
|\ | | | | | Add missing awaitTransactionSuccessAsync calls | ||||
| * | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 2 | -23/+53 |
|/ | |||||
* | Merge pull request #671 from 0xProject/refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-08 | 13 | -25/+24 |
|\ | | | | | Move spawnSwitchErr to @0xproject/utils | ||||
| * | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 |
| | | |||||
| * | Fix linter issue | Fabio Berger | 2018-06-08 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-08 | 49 | -290/+301 |
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Fix tslint failure Pass in fee and assetAmount rather then the whole signedOrder Fix missing paths Revert to returning orderState on invalid order - Refactor remainingFillableCalculator so it can be used for the maker and taker side - Moved the tests over from order-watcher - Did some token -> asset renaming Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary. Fixed path Use source-map-support package to include correct line numbers in mocha move generated contract wrappers from `contract_wrappers/generated/` to `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changes | Fabio Berger | 2018-06-08 | 7 | -206/+206 |
|\ \ | | | | | | | Remaining Order-utils V2 Changes | ||||
| * | | Fix tslint failure | Fabio Berger | 2018-06-08 | 5 | -10/+11 |
| | | | |||||
| * | | Pass in fee and assetAmount rather then the whole signedOrder | Fabio Berger | 2018-06-08 | 3 | -45/+26 |
| | | | |||||
| * | | Revert to returning orderState on invalid order | Fabio Berger | 2018-06-08 | 1 | -1/+6 |
| | | | |||||
| * | | - Refactor remainingFillableCalculator so it can be used for the maker and ↵ | Fabio Berger | 2018-06-08 | 2 | -141/+162 |
| | | | | | | | | | | | | | | | | | | | | | taker side - Moved the tests over from order-watcher - Did some token -> asset renaming | ||||
| * | | Update naming in orderStateUtils to use asset over token, also removed ↵ | Fabio Berger | 2018-06-08 | 3 | -48/+40 |
| | | | | | | | | | | | | cancelledAmount since in V2 it's binary. | ||||
* | | | Merge pull request #670 from 0xProject/fix/generated-nesting | Fabio Berger | 2018-06-08 | 27 | -66/+69 |
|\ \ \ | | | | | | | | | Remove unnecessary folder nesting | ||||
| * | | | Fix tslint issues | Fabio Berger | 2018-06-08 | 2 | -2/+2 |
| | | | | |||||
| * | | | Fix missing paths | Fabio Berger | 2018-06-08 | 3 | -7/+7 |
| | | | | |||||
| * | | | Fixed path | Fabio Berger | 2018-06-07 | 4 | -12/+12 |
| | | | | |||||
| * | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 292 | -2404/+2725 |
| |\| | | |||||
| * | | | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 27 | -67/+70 |
| | | | | | | | | | | | | | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | | | | Merge pull request #676 from 0xProject/feature/mocha-source-maps | Alex Browne | 2018-06-08 | 18 | -18/+26 |
|\ \ \ \ | |_|/ / |/| | | | Use source-map-support package to include correct line numbers in mocha | ||||
| * | | | Use source-map-support package to include correct line numbers in mocha | Alex Browne | 2018-06-07 | 18 | -18/+26 |
| | | | | |||||
| | | * | Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils | Fabio Berger | 2018-06-07 | 291 | -2388/+2711 |
| | | |\ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (66 commits) Run prettier Remove unused variable Fix linting issues Change shouldRenderHeader prop to shouldHideHeader Get build and tests to pass typo Apply prettier Update contracts tests after rebase Apply various fixes based on PR feedback Document debug_increaseTime method and fix typo in devnet README Use an enum for ProviderType in contracts/src/utils/web3_wrapper Update contracts package README Update relevant changelogs Remove global gas estimate buffer Add Async suffix to relevant assertions Fix linter errors Update package.json and yarn.lock Update more things to work with both Geth and Ganache Small fixes and cleanup Add additional gas to calls to fillOrderNoThrow ... # Conflicts: # packages/order-watcher/src/order_watcher/order_watcher.ts # packages/react-docs/src/components/type.tsx # packages/website/ts/components/ui/lifecycle_raised_button.tsx # packages/website/ts/components/wallet/wallet.tsx | ||||
* | | | | Merge pull request #673 from mohoff/patch-1 | Fabio Berger | 2018-06-07 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | typo | ||||
| * | | | | typo | mohoff | 2018-06-07 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #662 from 0xProject/feature/improve-linting | Francesco Agosti | 2018-06-07 | 244 | -1464/+989 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Tried enabling no-unused-variable... | ||||
| * | | | | Run prettier | fragosti | 2018-06-07 | 8 | -27/+13 |
| | | | | | |||||
| * | | | | Remove unused variable | fragosti | 2018-06-07 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 9 | -39/+102 |
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | feature/improve-linting | ||||
* | | | | | Merge pull request #672 from 0xProject/feature/website/account-management-polish | Brandon Millman | 2018-06-07 | 9 | -39/+102 |
|\ \ \ \ \ | |_|/ / / |/| | | | | Account management polish | ||||
| * | | | | Change shouldRenderHeader prop to shouldHideHeader | Brandon Millman | 2018-06-07 | 5 | -13/+13 |
| | | | | | |||||
| * | | | | Fix undefined ether balance | Brandon Millman | 2018-06-06 | 3 | -9/+13 |
| | | | | | |||||
| * | | | | Make scrollability a prop on TradeHistory | Brandon Millman | 2018-06-06 | 2 | -3/+10 |
| | | | | | |||||
| * | | | | Fix EthWrappers background color | Brandon Millman | 2018-06-06 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Update GenerateOrderForm and FillOrder components | Brandon Millman | 2018-06-06 | 4 | -6/+34 |
| | | | | | |||||
| * | | | | Update EthWrappers component | Brandon Millman | 2018-06-06 | 2 | -1/+7 |
| | | | | | |||||
| * | | | | Update TradeHistory component | Brandon Millman | 2018-06-06 | 2 | -3/+16 |
| | | | | | |||||
| * | | | | Hide action column on mainnet | Brandon Millman | 2018-06-06 | 1 | -13/+14 |
| | | | | | |||||
| * | | | | Fix TokenBalances background color | Brandon Millman | 2018-06-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add isFullWidth prop to TokenBalances component | Brandon Millman | 2018-06-06 | 2 | -1/+5 |
| | | | | | |||||
| | * | | | Fix linting issues | fragosti | 2018-06-07 | 4 | -6/+3 |
| | | | | | |||||
| | * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 61 | -293/+1024 |
| | |\ \ \ | |_|/ / / |/| | | | | | | | | | feature/improve-linting | ||||
* | | | | | Merge pull request #622 from 0xProject/geth-devnet-rebase-on-v2 | Alex Browne | 2018-06-07 | 46 | -872/+1402 |
|\ \ \ \ \ | | | | | | | | | | | | | Run contract tests against private Geth network | ||||
| * | | | | | Apply prettier | Alex Browne | 2018-06-07 | 2 | -3/+10 |
| | | | | | | |||||
| * | | | | | Update contracts tests after rebase | Alex Browne | 2018-06-07 | 2 | -14/+14 |
| | | | | | | |||||
| * | | | | | Apply various fixes based on PR feedback | Alex Browne | 2018-06-07 | 5 | -20/+79 |
| | | | | | | |||||
| * | | | | | Document debug_increaseTime method and fix typo in devnet README | Alex Browne | 2018-06-07 | 1 | -1/+36 |
| | | | | | | |||||
| * | | | | | Use an enum for ProviderType in contracts/src/utils/web3_wrapper | Alex Browne | 2018-06-07 | 1 | -4/+21 |
| | | | | | | |||||
| * | | | | | Update contracts package README | Alex Browne | 2018-06-07 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Update relevant changelogs | Alex Browne | 2018-06-07 | 2 | -0/+30 |
| | | | | | | |||||
| * | | | | | Remove global gas estimate buffer | Alex Browne | 2018-06-07 | 1 | -5/+1 |
| | | | | | | |||||
| * | | | | | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 14 | -112/+112 |
| | | | | | | |||||
| * | | | | | Fix linter errors | Alex Browne | 2018-06-07 | 3 | -8/+38 |
| | | | | | | |||||
| * | | | | | Update package.json and yarn.lock | Alex Browne | 2018-06-07 | 2 | -7/+77 |
| | | | | | | |||||
| * | | | | | Update more things to work with both Geth and Ganache | Alex Browne | 2018-06-07 | 6 | -50/+64 |
| | | | | | | |||||
| * | | | | | Small fixes and cleanup | Alex Browne | 2018-06-07 | 6 | -55/+5 |
| | | | | | | |||||
| * | | | | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 3 | -152/+55 |
| | | | | | | |||||
| * | | | | | Remove extra logs and other small fixes | Alex Browne | 2018-06-07 | 4 | -19/+14 |
| | | | | | | |||||
| * | | | | | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 4 | -6/+20 |
| | | | | | | |||||
| * | | | | | Remove outdated todo | Alex Browne | 2018-06-07 | 1 | -4/+0 |
| | | | | | | |||||
| * | | | | | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 4 | -55/+84 |
| | | | | | | |||||
| * | | | | | Add support for TEST_PROVIDER env var | Alex Browne | 2018-06-07 | 2 | -5/+6 |
| | | | | | | |||||
| * | | | | | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 4 | -21/+29 |
| | | | | | | |||||
| * | | | | | Get LibBytes tests working on both Ganache and Geth | Alex Browne | 2018-06-07 | 5 | -135/+43 |
| | | | | | | |||||
| * | | | | | Add ability to quickly switch between Geth and Ganache by changing a const | Alex Browne | 2018-06-07 | 2 | -4/+23 |
| | | | | | | |||||
| * | | | | | Update exchange/transactions tests for Geth error messages | Alex Browne | 2018-06-07 | 1 | -4/+4 |
| | | | | | | |||||
| * | | | | | Fix ethers.js version override (the package is just called 'ethers') | Alex Browne | 2018-06-07 | 2 | -17/+2 |
| | | | | | | |||||
| * | | | | | Use our fork of ethers.js | Alex Browne | 2018-06-07 | 2 | -1/+17 |
| | | | | | | |||||
| * | | | | | Update some tests after rebase | Alex Browne | 2018-06-07 | 3 | -20/+29 |
| | | | | | | |||||
| * | | | | | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 16 | -645/+771 |
| | | | | | | |||||
| * | | | | | Increase gas limit to account for bigger ExchangeContract | Alex Browne | 2018-06-07 | 2 | -2/+2 |
| | | | | | | |||||
| * | | | | | Replace constant.REVERT test assertions with ↵ | Alex Browne | 2018-06-07 | 12 | -170/+143 |
| | | | | | | | | | | | | | | | | | | | | | | | | expectRevertOrAlwaysFailingTransaction | ||||
| * | | | | | Update code after rebase | Alex Browne | 2018-06-07 | 3 | -3/+8 |
| | | | | | | |||||
| * | | | | | Use Geth for contract tests | Alex Browne | 2018-06-07 | 22 | -11/+337 |
|/ / / / / | |||||
* | | | | | Merge pull request #669 from 0xProject/bug/website/fix-balance-rendering | Brandon Millman | 2018-06-07 | 1 | -9/+14 |
|\ \ \ \ \ | | | | | | | | | | | | | Update balance amount rendering logic | ||||
| * | | | | | Update balance amount rendering logic | Brandon Millman | 2018-06-06 | 1 | -9/+14 |
| |/ / / / | |||||
* | | | | | Merge pull request #653 from 0xProject/feature/ethereum-types-docs | Leonid Logvinov | 2018-06-07 | 15 | -2/+190 |
|\ \ \ \ \ | | | | | | | | | | | | | Add a documentation page for ethereum-types package | ||||
| * | | | | | Add EthereumTypes to _renderDrawer | Leonid Logvinov | 2018-06-07 | 1 | -0/+11 |
| | | | | | | |||||
| * | | | | | Add a TODO comment on StructLog type in the docs | Leonid Logvinov | 2018-06-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add a documentation page for ethereum types | Leonid Logvinov | 2018-06-05 | 15 | -2/+179 |
| | | | | | | |||||
| | | * | | | Get build and tests to pass | fragosti | 2018-06-07 | 33 | -1524/+1440 |
| | | | | | | |||||
| | | * | | | Fix merge conflict | fragosti | 2018-06-07 | 1 | -14/+0 |
| | | | | | | |||||
| | | * | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 14 | -18/+28 |
| | | |\ \ \ | |_|_|/ / / |/| | | | | | | | | | | | feature/improve-linting | ||||
* | | | | | | Merge pull request #657 from 0xProject/feature/build-speed | Leonid Logvinov | 2018-06-07 | 14 | -19/+29 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | Speedup CI builds | ||||
| * | | | | | Don't build website if no changes were made to it | Leonid Logvinov | 2018-06-07 | 1 | -1/+6 |
| | | | | | | |||||
| * | | | | | Remove lerna bootstrap | Leonid Logvinov | 2018-06-07 | 1 | -1/+0 |
| | | | | | | |||||
| * | | | | | Fix linter issues in generated contract wrappers | Leonid Logvinov | 2018-06-07 | 3 | -4/+4 |
| | | | | | | |||||
| * | | | | | Add generated contract artifacts to prettierignore | Leonid Logvinov | 2018-06-07 | 1 | -0/+9 |
| | | | | | | |||||
| * | | | | | Stop running prettier on generated files | Leonid Logvinov | 2018-06-07 | 8 | -13/+9 |
| | | | | | | |||||
| * | | | | | Enable skipLibCheck flag in ts | Leonid Logvinov | 2018-06-07 | 1 | -0/+1 |
|/ / / / / | |||||
| | | * | | Use CLI for exclude | fragosti | 2018-06-07 | 6 | -14/+5 |
| | | | | | |||||
| | | * | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 32 | -53/+63 |
| | | |\ \ | |_|_|/ / |/| | | | | | | | | | feature/improve-linting | ||||
| | | * | | Add missing import | Fabio Berger | 2018-06-06 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Fix remaining tslint issues | Fabio Berger | 2018-06-06 | 5 | -26/+2 |
| | | | | | |||||
| | | * | | merge v2-prototype | Fabio Berger | 2018-06-06 | 71 | -3864/+1258 |
| | | |\ \ | |||||
| | | * | | | Exclude generate contract wrappers from tslint | Fabio Berger | 2018-06-06 | 6 | -6/+6 |
| | | | | | | |||||
| | | * | | | remove unused imports from 0x.js test | Fabio Berger | 2018-06-06 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Remove unused imports from contract handlebar template | Fabio Berger | 2018-06-06 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Some cleanup | fragosti | 2018-06-06 | 1 | -11/+3 |
| | | | | | | |||||
| | | * | | | Linter now passes | fragosti | 2018-06-06 | 37 | -110/+48 |
| | | | | | | |||||
| | | * | | | Try enabling no-unused-variable... | fragosti | 2018-06-05 | 180 | -420/+110 |
| | | | | | | |||||
| | | | | * | Move spawnSwitchErr to @0xproject/utils | Fabio Berger | 2018-06-06 | 15 | -25/+24 |
| |_|_|_|/ |/| | | | | |||||
* | | | | | Merge pull request #665 from 0xProject/fix/fix-build-watch | Fabio Berger | 2018-06-06 | 32 | -54/+63 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Improve Build/Watch Commands | ||||
| * | | | | Add missing `yarn` | Fabio Berger | 2018-06-06 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Add missing build:all command | Fabio Berger | 2018-06-06 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | Merge v2-prototype | Fabio Berger | 2018-06-06 | 49 | -129/+502 |
| |\ \ \ \ | |/ / / / |/| | | | | |||||
* | | | | | Merge pull request #664 from 0xProject/fixes/misc-small-fixes | Fabio Berger | 2018-06-06 | 19 | -18/+21 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Small miscellaneous fixes | ||||
| * | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixes | Fabio Berger | 2018-06-06 | 32 | -111/+481 |
| |\ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Remove TranslatedText Fix prettier Add back UMD bundles for 0x.js Move portal disclaimer to the account management section Move prices into portal Use stricter check for subscribe input text Make buttons stack on mobile Do not show subscribe form if language is not english Address PR feedback Lint and cleanup Implement subscription form Add styled-components and polished Have basic newsletter subscribe form working | ||||
* | | | | | Remove TranslatedText | fragosti | 2018-06-06 | 1 | -15/+0 |
| | | | | | |||||
* | | | | | Fix prettier | Brandon Millman | 2018-06-06 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #668 from 0xProject/feature/website/move-disclaimer | Brandon Millman | 2018-06-06 | 1 | -16/+18 |
|\ \ \ \ \ | | | | | | | | | | | | | Move portal disclaimer to the account management section | ||||
| * | | | | | Move portal disclaimer to the account management section | Brandon Millman | 2018-06-06 | 1 | -16/+18 |
| | | | | | | |||||
* | | | | | | Add back UMD bundles for 0x.js | Leonid Logvinov | 2018-06-06 | 1 | -1/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #666 from 0xProject/bug/website/fix-missing-prices | Brandon Millman | 2018-06-06 | 2 | -30/+32 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Move price fetching from wallet into portal | ||||
| * | | | | | Move prices into portal | Brandon Millman | 2018-06-06 | 2 | -30/+32 |
|/ / / / / | |||||
* | | | | | Merge pull request #652 from ↵ | Francesco Agosti | 2018-06-06 | 30 | -64/+443 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 0xProject/feature/website/landing-subscribe-button-2 Implement subscribe form on landing page | ||||
| * | | | | | Use stricter check for subscribe input text | fragosti | 2018-06-06 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Make buttons stack on mobile | fragosti | 2018-06-05 | 2 | -5/+6 |
| | | | | | | |||||
| * | | | | | Do not show subscribe form if language is not english | fragosti | 2018-06-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Address PR feedback | fragosti | 2018-06-05 | 8 | -40/+46 |
| | | | | | | |||||
| * | | | | | Lint and cleanup | fragosti | 2018-06-02 | 5 | -8/+8 |
| | | | | | | |||||
| * | | | | | Merge branch 'feature/website/landing-subscribe-button' into ↵ | fragosti | 2018-06-02 | 30 | -53/+424 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | feature/website/landing-subscribe-button-2 | ||||
| | * | | | | | Implement subscription form | fragosti | 2018-06-02 | 7 | -68/+288 |
| | | | | | | | |||||
| | * | | | | | Add styled-components and polished | fragosti | 2018-06-02 | 21 | -22/+82 |
| | | | | | | | |||||
| | * | | | | | Have basic newsletter subscribe form working | fragosti | 2018-06-02 | 6 | -2/+93 |
| | | | | | | | |||||
| | | * | | | | Mention the gasLimit until in the doc comment | Fabio Berger | 2018-06-05 | 1 | -1/+1 |
| | | | | | | | |||||
| | | * | | | | Merge branch 'v2-prototype' into fixes/misc-small-fixes | Fabio Berger | 2018-06-05 | 1 | -2/+2 |
| | | |\ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix broken link to `contract_templates` # Conflicts: # packages/abi-gen/README.md | ||||
| | | * | | | | Replace `-` with `_` in yarn script name so that we are consistent across ↵ | Fabio Berger | 2018-06-05 | 15 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | yarn script names | ||||
| | | * | | | | Add `switch-default` tslint rule and add missing default statement | Fabio Berger | 2018-06-05 | 2 | -0/+4 |
| | | | | | | | |||||
| | | * | | | | Remove outdated link in ABI-gen README | Fabio Berger | 2018-06-05 | 1 | -2/+1 |
| | | | | | | | |||||
| | | | * | | | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ↵ | Fabio Berger | 2018-06-05 | 32 | -54/+62 |
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | running watch from root dir, with sub-package dir - stop using special prebuild script name and run pre_build steps for `watch` and `build` commands - Remove `clean` step from `build`/`watch` | ||||
* | | | | | | Merge pull request #661 from feuGeneA/patch-1 | Fabio Berger | 2018-06-05 | 1 | -2/+2 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Fix broken link to `contract_templates` | ||||
| * | | | | | Fix broken link to `contract_templates` | F. Eugene Aumson | 2018-06-05 | 1 | -2/+2 |
| | |_|_|/ | |/| | | | | | | | | Note there is still a broken link here, the "wrapper files" one in the second paragraph. | ||||
* | | | | | Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2 | Fabio Berger | 2018-06-05 | 24 | -3766/+730 |
|\ \ \ \ \ | | | | | | | | | | | | | Refactor fill-scenarios for v2 | ||||
| * | | | | | Use _.omit for conciseness | Fabio Berger | 2018-06-05 | 1 | -15/+5 |
| | | | | | | |||||
| * | | | | | revert multisig change | Fabio Berger | 2018-06-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | reset multisign | Fabio Berger | 2018-06-05 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Add PR to changelog | Fabio Berger | 2018-06-05 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Update fill-scenarios for V2 and add CHANGELOG entry | Fabio Berger | 2018-06-05 | 2 | -64/+91 |
| | | | | | | |||||
| * | | | | | Remove unused compact artifacts from order-utils | Fabio Berger | 2018-06-05 | 7 | -1845/+0 |
| | | | | | | |||||
| * | | | | | Add missing exports to order-utils and add CHANGELOG entry | Fabio Berger | 2018-06-05 | 2 | -1/+18 |
| | | | | | | |||||
| * | | | | | Add new 2.0 artifacts to migrations | Fabio Berger | 2018-06-05 | 2 | -0/+601 |
| | | | | | | |||||
| * | | | | | Remove compact_artifacts and replace with updated artifacts | Fabio Berger | 2018-06-05 | 9 | -1852/+12 |
| | | | | | | |||||
| * | | | | | Update fill-scenarios to depend on v2 updated order-utils and types. Needed ↵ | Fabio Berger | 2018-06-05 | 3 | -4/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | to re-employ the symlink hack. | ||||
* | | | | | | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-tests | Alex Browne | 2018-06-05 | 15 | -19/+31 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Don't automatically rebuild when running yarn test | ||||
| * | | | | | Remove duplicate cleans in package.json when clean is called in prebuild | Alex Browne | 2018-06-05 | 4 | -4/+4 |
| | | | | | | |||||
| * | | | | | Remove common-js/umd differentiation from 0x.js/package.json | Alex Browne | 2018-06-05 | 1 | -6/+3 |
| | | | | | | |||||
| * | | | | | Don't automatically rebuild when running yarn test | Alex Browne | 2018-06-05 | 15 | -15/+30 |
| | | | | | | |||||
* | | | | | | Merge pull request #633 from 0xProject/feature/contracts/errors | Jacob Evans | 2018-06-05 | 30 | -737/+490 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Update error handling | ||||
| * | | | | | rename GT to GREATER_THAN | Jacob Evans | 2018-06-05 | 3 | -3/+3 |
| | | | | | | |||||
| * | | | | | Rebase from v2-prototype | Jacob Evans | 2018-06-05 | 2 | -38/+2 |
| | | | | | | |||||
| * | | | | | Update Exchange statuses, revert instead of emmitting event on fill/cancel ↵ | Amir Bandeali | 2018-06-05 | 30 | -702/+491 |
|/ / / / / | | | | | | | | | | | | | | | | failures, and remove redundant logic in matchOrders | ||||
* | | | | | Merge pull request #655 from 0xProject/update-migrations | Alex Browne | 2018-06-05 | 8 | -51/+79 |
|\ \ \ \ \ | |/ / / / |/| | | | | Update artifacts in migrations | ||||
| * | | | | Update artifacts in migrations | Alex Browne | 2018-06-05 | 8 | -51/+79 |
|/ / / / | |||||
* | | | | Merge pull request #644 from ↵ | Francesco Agosti | 2018-06-05 | 5 | -97/+127 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | 0xProject/feature/website/refactor-token-state-fetching Move TokenState fetching logic up into Portal.tsx so it can be used by Wallet and PortalOnboardingFlow | ||||
| * | | | Address feedback | fragosti | 2018-06-05 | 4 | -14/+20 |
| | | | | |||||
| * | | | Implement WETH step logic for continue | fragosti | 2018-06-05 | 3 | -7/+14 |
| | | | | |||||
| * | | | Move trackedTokenStateByAddress logic into portal | fragosti | 2018-06-05 | 2 | -83/+100 |
|/ / / | |||||
* | | | Merge pull request #636 from 0xProject/refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 53 | -518/+828 |
|\ \ \ | |/ / |/| | | Refactor order-utils for v2 | ||||
| * | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 16 | -177/+219 |
| |\ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Set contract expiration time to a constant 10 minutes Remove unused promises array Make erc20_wrapper and erc721_wrapper serial Rename changelogs to changelog Add CHANGELOG entry Check that git branch is up to date before publishing Move prepublish checks before building packages for publishing Refactor changelog utils to a separate module | ||||
* | | | Merge pull request #651 from 0xProject/serial-contract-wrappers | Alex Browne | 2018-06-02 | 3 | -55/+52 |
|\ \ \ | | | | | | | | | Make erc20_wrapper and erc721_wrapper serial and increase contract expiration time | ||||
| * | | | Set contract expiration time to a constant 10 minutes | Alex Browne | 2018-06-02 | 1 | -1/+2 |
| | | | | |||||
| * | | | Remove unused promises array | Alex Browne | 2018-06-02 | 2 | -6/+0 |
| | | | | |||||
| * | | | Make erc20_wrapper and erc721_wrapper serial | Alex Browne | 2018-06-02 | 2 | -48/+50 |
|/ / / | |||||
* | | | Merge pull request #650 from 0xProject/feature/publishing | Leonid Logvinov | 2018-06-02 | 13 | -122/+167 |
|\ \ \ | | | | | | | | | Improve publishing flow | ||||
| * | | | Rename changelogs to changelog | Leonid Logvinov | 2018-06-02 | 1 | -8/+8 |
| | | | | |||||
| * | | | Add CHANGELOG entry | Leonid Logvinov | 2018-06-02 | 1 | -0/+9 |
| | | | | |||||
| * | | | Check that git branch is up to date before publishing | Leonid Logvinov | 2018-06-02 | 1 | -1/+17 |
| | | | | |||||
| * | | | Move prepublish checks before building packages for publishing | Leonid Logvinov | 2018-06-02 | 4 | -55/+60 |
| | | | | |||||
| * | | | Refactor changelog utils to a separate module | Leonid Logvinov | 2018-06-02 | 9 | -63/+78 |
| | | | | |||||
| | * | | Improve comments and remove unused imports | Fabio Berger | 2018-06-02 | 4 | -4/+7 |
| | | | | |||||
| | * | | Fix tslint issues | Fabio Berger | 2018-06-02 | 3 | -5/+3 |
| | | | | |||||
| | * | | Add comment to exported method | Fabio Berger | 2018-06-02 | 1 | -0/+7 |
| | | | | |||||
| | * | | Add missing dep | Fabio Berger | 2018-06-02 | 1 | -0/+1 |
| | | | | |||||
| | * | | Fix types version | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Also manually symlink types package in contracts | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Remove usage of `prebuild` since it doesn't run on `watch` | Fabio Berger | 2018-06-02 | 1 | -2/+3 |
| | | | | |||||
| | * | | remove artifactsDir and contracts from compiler.json | Fabio Berger | 2018-06-02 | 1 | -13/+0 |
| | | | | |||||
| | * | | Add postinstall hack to get around `yarn` not setting up symlinks properly. ↵ | Fabio Berger | 2018-06-02 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | This is a temporary fix while we wait on: https://github.com/yarnpkg/yarn/issues/5907 | ||||
| | * | | Fix type imports | Fabio Berger | 2018-06-02 | 5 | -5/+8 |
| | | | | |||||
| | * | | Remove ISigner artifact | Fabio Berger | 2018-06-02 | 1 | -76/+0 |
| | | | | |||||
| | * | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 3 | -17/+18 |
| | |\ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Update v2 artifacts Add IWallet and IValidator to compiled contracts Split migrations compile command into one for V1 and another for V2 # Conflicts: # packages/migrations/artifacts/2.0.0/Exchange.json # packages/migrations/artifacts/2.0.0/TestSignatureValidator.json | ||||
* | | | | Merge pull request #649 from 0xProject/addArtifacts | Fabio Berger | 2018-06-02 | 18 | -4497/+4732 |
|\ \ \ \ | | | | | | | | | | | Add Updated V2 Artifacts | ||||
| * | | | | Update v2 artifacts | Fabio Berger | 2018-06-02 | 17 | -4493/+4727 |
| | | | | | |||||
| * | | | | Add IWallet and IValidator to compiled contracts | Fabio Berger | 2018-06-02 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Split migrations compile command into one for V1 and another for V2 | Fabio Berger | 2018-06-02 | 1 | -3/+4 |
|/ / / / | |||||
| | * | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 130 | -1126/+1223 |
| | |\ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (33 commits) Only show ProviderDisplay in portal Improve sol-cov docs Remove old parse code Refactor order parser and add shared order support to new portal Add generate and fill order routes Address feedback Override ethereumjs-tx version Fix missing key Update placeholder param ordering Change userEtherBalanceInWei to optional so we can know if its loading Add loading state to ProviderDisplay Tweaks Add Placeholder component Add StandardIconRow Split render into loading and loaaded Fix linter errors Fix linter errors Add ethereum-types to extraFileIncludes Introduce ethereum-types package Remove merge conflicts from yarn.lock ... # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/src/utils/match_order_tester.ts # packages/contracts/src/utils/types.ts # packages/contracts/test/exchange/core.ts # packages/contracts/test/exchange/match_orders.ts # packages/contracts/test/libraries/lib_bytes.ts # packages/sol-cov/package.json | ||||
* | | | | Merge pull request #648 from 0xProject/feature/website/fill-order | Brandon Millman | 2018-06-02 | 4 | -34/+75 |
|\ \ \ \ | | | | | | | | | | | Add shared order support | ||||
| * | | | | Remove old parse code | Brandon Millman | 2018-06-02 | 1 | -26/+0 |
| | | | | | |||||
| * | | | | Refactor order parser and add shared order support to new portal | Brandon Millman | 2018-06-02 | 3 | -3/+43 |
| | | | | | |||||
| * | | | | Add generate and fill order routes | Brandon Millman | 2018-06-02 | 2 | -7/+34 |
| | | | | | |||||
* | | | | | Only show ProviderDisplay in portal | Brandon Millman | 2018-06-02 | 1 | -12/+14 |
| |/ / / |/| | | | |||||
* | | | | Improve sol-cov docs | Leonid Logvinov | 2018-06-02 | 2 | -6/+78 |
|/ / / | |||||
* | | | Merge pull request #642 from 0xProject/feature/ethereum-types | Leonid Logvinov | 2018-06-01 | 90 | -366/+538 |
|\ \ \ | | | | | | | | | Introduce ethereum-types package | ||||
| * | | | Address feedback | Leonid Logvinov | 2018-06-01 | 2 | -2/+3 |
| | | | | |||||
| * | | | Fix linter errors | Leonid Logvinov | 2018-06-01 | 20 | -23/+20 |
| | | | | |||||
| * | | | Fix linter errors | Leonid Logvinov | 2018-06-01 | 5 | -3/+5 |
| | | | | |||||
| * | | | Add ethereum-types to extraFileIncludes | Leonid Logvinov | 2018-06-01 | 8 | -8/+22 |
| | | | | |||||
| * | | | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 81 | -361/+511 |
| | | | | |||||
* | | | | Merge pull request #643 from 0xProject/feature/website/wallet-loading | Brandon Millman | 2018-06-01 | 16 | -94/+195 |
|\ \ \ \ | |_|_|/ |/| | | | Add loading states to wallet and provider display | ||||
| * | | | Fix missing key | Brandon Millman | 2018-06-01 | 1 | -1/+2 |
| | | | | |||||
| * | | | Update placeholder param ordering | Brandon Millman | 2018-06-01 | 1 | -10/+21 |
| | | | | |||||
| * | | | Change userEtherBalanceInWei to optional so we can know if its loading | Brandon Millman | 2018-06-01 | 13 | -22/+26 |
| | | | |