Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge v2-prototype | Fabio Berger | 2018-07-18 | 7 | -773/+133 |
|\ | |||||
| * | Fix a bad merge | Leonid Logvinov | 2018-07-18 | 7 | -7/+49 |
| | | |||||
| * | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 1 | -4/+4 |
| |\ | |||||
| * | | Merge | Leonid Logvinov | 2018-07-18 | 4 | -26/+109 |
| | | | |||||
| * | | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-18 | 2 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'v2-prototype' into feature/order-watcher-v2 | Leonid Logvinov | 2018-07-16 | 2 | -11/+4 |
| |\ \ \ | |||||
| * | | | | Upgrade tslint to use prefer-readonly | Leonid Logvinov | 2018-07-13 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update contract artifacts | Leonid Logvinov | 2018-07-13 | 10 | -804/+39 |
| | | | | | |||||
* | | | | | Update package versions | Fabio Berger | 2018-07-18 | 1 | -9/+9 |
| | | | | | |||||
* | | | | | Update changelogs | Fabio Berger | 2018-07-18 | 2 | -0/+13 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #884 from 0xProject/export-more-0x.js | Fabio Berger | 2018-07-18 | 1 | -4/+4 |
|\ \ \ \ | |_|_|/ |/| | | | Export missing V2 pieces from 0x.js | ||||
| * | | | merge v2-prototype | Fabio Berger | 2018-07-18 | 1 | -9/+9 |
| |\ \ \ | |||||
| | * | | | Fix bugs having to do with block timestamps and order expirationTimes | Alex Browne | 2018-07-17 | 1 | -9/+9 |
| | | |/ | | |/| | |||||
| * / | | Rename assetProxyUtils to assetDataUtils | Fabio Berger | 2018-07-17 | 1 | -4/+4 |
| |/ / | |||||
* | | | Fix tslint issues | Leonid Logvinov | 2018-07-17 | 2 | -11/+11 |
| | | | |||||
* | | | Upgrade tslint to the newest version | Leonid Logvinov | 2018-07-17 | 1 | -1/+1 |
|/ / | |||||
* | | Export Web3ProviderEngine from subproviders package | Fabio Berger | 2018-07-13 | 2 | -5/+3 |
| | | |||||
* | | -fetch'; | Fabio Berger | 2018-07-13 | 1 | -7/+2 |
|/ | |||||
* | Remove extra ERC20ProxyId from Forwarder constructor | Jacob Evans | 2018-07-11 | 2 | -8/+8 |
| | |||||
* | Add Migrations for Forwarder | Jacob Evans | 2018-07-11 | 2 | -1/+17 |
| | |||||
* | Update artifacts | Amir Bandeali | 2018-07-11 | 27 | -634/+101453 |
| | |||||
* | Update package versions | Fabio Berger | 2018-07-10 | 1 | -10/+10 |
| | |||||
* | Update changelogs | Fabio Berger | 2018-07-09 | 2 | -0/+13 |
| | |||||
* | Merge pull request #822 from 0xProject/v2-contract-wrappers-WIP | Leonid Logvinov | 2018-07-06 | 25 | -16/+5284 |
|\ | | | | | V2 contract wrappers | ||||
| * | Upgrade artifacts | Leonid Logvinov | 2018-07-05 | 2 | -8/+183 |
| | | |||||
| * | Make it possible to configure block polling interval in base contract wrapper | Leonid Logvinov | 2018-07-05 | 7 | -168/+155 |
| | | |||||
| * | Upgrade artifacts | Leonid Logvinov | 2018-07-05 | 16 | -1/+5071 |
| | | |||||
| * | Merge branch 'v2-prototype' into v2-contract-wrappers-WIP | Leonid Logvinov | 2018-07-05 | 21 | -185/+3758 |
| |\ | |||||
| * | | Set the interval to 0 in awaitTranscationSuccessAsync | Leonid Logvinov | 2018-06-29 | 6 | -12/+48 |
| | | | |||||
| * | | Fix the token supply in migrations | Leonid Logvinov | 2018-06-29 | 1 | -1/+1 |
| | | | |||||
| * | | Change import paths from z_r_x and e_r_c to zrx and erc in migrations | Leonid Logvinov | 2018-06-29 | 2 | -5/+5 |
| | | | |||||
* | | | Merge pull request #522 from 0xProject/feature/contracts/forwarder | Jacob Evans | 2018-07-06 | 4 | -88/+1008 |
|\ \ \ | |_|/ |/| | | Forwarding contract | ||||
| * | | Forwarding contract (squashed commits) | Jacob Evans | 2018-07-06 | 5 | -104/+1024 |
| | | | |||||
* | | | Merge pull request #812 from 0xProject/fix/revert-assertions-improvements | Alex Browne | 2018-07-04 | 1 | -16/+16 |
|\ \ \ | | | | | | | | | Improve robustness of revert reason assertions | ||||
| * | | | Improve robustness of revert reason assertions | Alex Browne | 2018-07-03 | 1 | -16/+16 |
| | | | | |||||
* | | | | Fix alignment | Fabio Berger | 2018-07-04 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update web3-provider-engine version w/o caret | Fabio Berger | 2018-07-03 | 1 | -1/+1 |
| | | | | |||||
* | | | | Update web3-provider-engine | Fabio Berger | 2018-07-03 | 1 | -1/+1 |
|/ / / | |||||
* / / | Update incorrect versions of deps | Fabio Berger | 2018-07-02 | 1 | -1/+1 |
|/ / | |||||
* | | Update 2.0.0 artifacts | Amir Bandeali | 2018-06-30 | 5 | -149/+99 |
| | | |||||
* | | Move ledgerhq module declarations to typescript-typings | Amir Bandeali | 2018-06-30 | 3 | -24/+2 |
| | | |||||
* | | Export LedgerEthereumClient type in subproviders | Amir Bandeali | 2018-06-30 | 3 | -49/+18 |
| | | |||||
* | | Update artifacts | Amir Bandeali | 2018-06-30 | 4 | -12/+26 |
| | | |||||
* | | Add logging and updated artifacts | Amir Bandeali | 2018-06-30 | 5 | -32/+45 |
| | | |||||
* | | Fix migrations | Amir Bandeali | 2018-06-30 | 7 | -3451/+3402 |
| | | |||||
* | | Run prettier | Amir Bandeali | 2018-06-30 | 4 | -3369/+3442 |
| | | |||||
* | | Add Kovan artifacts | Amir Bandeali | 2018-06-30 | 4 | -0/+3373 |
| | | |||||
* | | Use ledger subprovider | Amir Bandeali | 2018-06-30 | 13 | -46/+159 |
| | | |||||
* | | Add Kovan migrations | Amir Bandeali | 2018-06-30 | 10 | -13/+152 |
|/ | |||||
* | Register the asset proxies to exchange | Jacob Evans | 2018-06-29 | 1 | -5/+26 |
| | |||||
* | Remove network 50 details | Fabio Berger | 2018-06-28 | 6 | -48/+12 |
| | |||||
* | Re-generate and clean up artifacts for 2.0.0 | Fabio Berger | 2018-06-28 | 23 | -5076/+1144 |
| | |||||
* | Add missing `AssetProxyOwner` from `compile:v2` command | Fabio Berger | 2018-06-28 | 1 | -1/+1 |
| | |||||
* | Encode ZRX address as needed. | Fabio Berger | 2018-06-28 | 2 | -1/+3 |
| | |||||
* | Add optimizer settings to `migrations` `compiler.json` | Fabio Berger | 2018-06-28 | 1 | -0/+4 |
| | |||||
* | Fix build | Amir Bandeali | 2018-06-27 | 3 | -0/+386 |
| | |||||
* | Update artifacts | Amir Bandeali | 2018-06-27 | 30 | -2689/+1363 |
| | |||||
* | Add missing artifacts | Fabio Berger | 2018-06-22 | 2 | -0/+194 |
| | |||||
* | Set settleOrder and settleMatchedOrders to private | Greg Hysen | 2018-06-21 | 1 | -60/+102 |
| | |||||
* | Removed MixinSettlement. Moved `settleOrder` into `MixinExchangeCore` and ↵ | Greg Hysen | 2018-06-21 | 1 | -59/+27 |
| | | | | `settleMatchedOrders` into `MixinMatchOrders` | ||||
* | Migrations after rebasing | Greg Hysen | 2018-06-21 | 13 | -188/+320 |
| | |||||
* | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 1 | -8/+8 |
| | |||||
* | Rename makerEpoch => orderEpoch | Amir Bandeali | 2018-06-20 | 5 | -64/+64 |
| | |||||
* | Make cancelOrdersUpTo compatible with sender abstraction | Amir Bandeali | 2018-06-20 | 3 | -39/+323 |
| | |||||
* | Update all package versions to match latest published to NPM | Fabio Berger | 2018-06-19 | 1 | -11/+11 |
| | |||||
* | Update CHANGELOG's with publishes performed on development branch | Fabio Berger | 2018-06-19 | 2 | -1/+18 |
| | |||||
* | Make isValidSignature public | Amir Bandeali | 2018-06-19 | 6 | -38/+316 |
| | |||||
* | Merge pull request #682 from 0xProject/feature/contracts/popProxyId | Amir Bandeali | 2018-06-13 | 9 | -188/+182 |
|\ | | | | | Remove proxyId checks in AssetProxies | ||||
| * | Update artifacts | Amir Bandeali | 2018-06-13 | 9 | -188/+182 |
| | | |||||
* | | Refactor sol-cov to avoid keeping traceInfo in memory | Alex Browne | 2018-06-13 | 1 | -119/+0 |
|/ | |||||
* | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵ | Alex Browne | 2018-06-12 | 16 | -148/+849 |
| | | | | tests | ||||
* | Await transactions in migrations | Leonid Logvinov | 2018-06-09 | 1 | -35/+46 |
| | |||||
* | Fix typos | Leonid Logvinov | 2018-06-09 | 1 | -1/+1 |
| | |||||
* | Await transactions in migrations | Leonid Logvinov | 2018-06-09 | 1 | -4/+12 |
| | |||||
* | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 14 | -143/+79 |
| | |||||
* | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 1 | -735/+1 |
| | |||||
* | updated migrations artifacts | Greg Hysen | 2018-06-08 | 1 | -1/+735 |
| | |||||
* | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 1 | -8/+39 |
| | |||||
* | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 1 | -0/+88 |
| | |||||
* | Fix tslint failure | Fabio Berger | 2018-06-08 | 1 | -7/+7 |
| | |||||
* | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 1 | -13/+17 |
|\ | | | | | | | feature/improve-linting | ||||
| * | Remove extra logs and other small fixes | Alex Browne | 2018-06-07 | 1 | -11/+11 |
| | | |||||
| * | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 3 | -614/+611 |
| | | |||||
* | | Get build and tests to pass | fragosti | 2018-06-07 | 23 | -1497/+1402 |
| | | |||||
* | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 1 | -2/+2 |
|\| | | | | | | | feature/improve-linting | ||||
| * | Stop running prettier on generated files | Leonid Logvinov | 2018-06-07 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 1 | -3/+3 |
|\| | | | | | | | feature/improve-linting | ||||
| * | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ↵ | Fabio Berger | 2018-06-05 | 1 | -3/+3 |
| | | | | | | | | | | | | | | 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 v2-prototype | Fabio Berger | 2018-06-06 | 3 | -2/+603 |
|\| | |||||
| * | Merge pull request #656 from 0xProject/refactor/fill-scenarios/for-v2 | Fabio Berger | 2018-06-05 | 3 | -2/+603 |
| |\ | | | | | | | Refactor fill-scenarios for v2 | ||||
| | * | revert multisig change | Fabio Berger | 2018-06-05 | 1 | -1/+1 |
| | | | |||||
| | * | reset multisign | Fabio Berger | 2018-06-05 | 1 | -1/+1 |
| | | | |||||
| | * | 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 | 1 | -2/+2 |
| | | | |||||
* | | | Exclude generate contract wrappers from tslint | Fabio Berger | 2018-06-06 | 1 | -1/+1 |
| | | | |||||
* | | | Try enabling no-unused-variable... | fragosti | 2018-06-05 | 3 | -6/+3 |
|/ / | |||||
* / | Update artifacts in migrations | Alex Browne | 2018-06-05 | 8 | -51/+79 |
|/ | |||||
* | remove artifactsDir and contracts from compiler.json | Fabio Berger | 2018-06-02 | 1 | -13/+0 |
| | |||||
* | 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 | ||||
| * | 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 | 4 | -3/+4 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | Fix linter errors | Leonid Logvinov | 2018-06-01 | 4 | -3/+4 |
| | | |||||
| * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 3 | -3/+3 |
| | | |||||
* | | Update all artifacts | Fabio Berger | 2018-06-01 | 8 | -2233/+2148 |
| | | |||||
* | | List V2 contracts in compile.json now | Fabio Berger | 2018-06-01 | 1 | -6/+5 |
| | | |||||
* | | Rename ISigner to IWallet and implement SignatureType.Validator | Fabio Berger | 2018-06-01 | 4 | -2/+151 |
| | | |||||
* | | Update artifacts | Fabio Berger | 2018-06-01 | 10 | -2286/+2457 |
| | | |||||
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 1 | -0/+280 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: (45 commits) Check length before accessing indices, add awaitTransactionSuccess where needed, and rename function Add back before/after snapshots for each test Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT Make preSigned and allowedValidators mappings public Change names of signature types Fix formatting and tests Make AssetProxyId last byte of assetData Add signer to txHash, allow approveValidator to be used with executeTransaction Update Whitelist Fix Exchange interface Increase block gas limit Use last byte of signature as signature type Remove TxOrigin signature type, modify whitelist to use Validator signature type Update Whitelist contract with comments, also require maker to be whitelisted Fix build Add example whitelist contract and minimum tests Add sample whitelist contract Add TxOrigin signature type and rearrange order of types Add approveValidator function Add Validator signature type ... # Conflicts: # packages/contracts/src/contracts/current/protocol/Exchange/MixinSignatureValidator.sol # packages/contracts/src/utils/types.ts # packages/contracts/test/exchange/transactions.ts # packages/order-utils/src/asset_proxy_utils.ts | ||||
| * | Update Whitelist | Amir Bandeali | 2018-05-31 | 1 | -0/+280 |
| | | |||||
* | | Add ISigner artifacts | Fabio Berger | 2018-05-31 | 1 | -0/+76 |
| | | |||||
* | | Initial refactor of order-utils. Move many utils from contracts into this ↵ | Fabio Berger | 2018-05-30 | 2 | -3/+4 |
|/ | | | | package. | ||||
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 2 | -9/+791 |
|\ | | | | | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress | ||||
| * | Fix build | Amir Bandeali | 2018-05-25 | 2 | -9/+791 |
| | | |||||
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 9 | -45/+208 |
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Temporarily disable installation tests Pin connect in sra-report Fix a typo Pin types in sra-report Fix linter issues Unpin types version in @0xproject/connect Pin types version in website Do a fake version bump on types so that yarn doesn't try to install updated version for not yet migrated packages Migrate migrations to v2 # Conflicts: # packages/contracts/src/utils/order_utils.ts | ||||
| * | | Fix a typo | Leonid Logvinov | 2018-05-25 | 1 | -2/+2 |
| | | | |||||
| * | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 9 | -45/+208 |
| |/ | |||||
* / | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 2 | -2292/+2273 |
|/ | |||||
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 1 | -1/+1 |
|\ | |||||
| * | Fix TokenTransferProxy artifact name since it's now suffixed with _v1 | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'development' into v2-prototype | Leonid Logvinov | 2018-05-23 | 3 | -11/+24 |
| |\ | |||||
| | * | Publish | Leonid Logvinov | 2018-05-23 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.38.0 - @0xproject/abi-gen@0.3.0 - @0xproject/assert@0.2.10 - @0xproject/base-contract@0.3.2 - @0xproject/connect@0.6.13 - @0xproject/contract-wrappers@0.0.2 - contracts@2.1.29 - @0xproject/dev-utils@0.4.2 - @0xproject/fill-scenarios@0.0.2 - @0xproject/json-schemas@0.7.24 - @0xproject/metacoin@0.0.7 - @0xproject/migrations@0.0.6 - @0xproject/monorepo-scripts@0.1.20 - @0xproject/order-utils@0.0.5 - @0xproject/order-watcher@0.0.2 - @0xproject/react-docs-example@0.0.12 - @0xproject/react-docs@0.0.12 - @0xproject/react-shared@0.1.7 - @0xproject/sol-compiler@0.5.0 - @0xproject/sol-cov@0.0.11 - @0xproject/sol-resolver@0.0.5 - @0xproject/sra-report@0.1.0 - @0xproject/subproviders@0.10.2 - @0xproject/testnet-faucets@1.0.30 - @0xproject/tslint-config@0.4.18 - @0xproject/types@0.7.0 - @0xproject/typescript-typings@0.3.2 - @0xproject/utils@0.6.2 - @0xproject/web3-wrapper@0.6.4 - @0xproject/website@0.0.33 | ||||
| | * | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 2 | -1/+14 |
| | | | |||||
* | | | Publish | Leonid Logvinov | 2018-05-23 | 1 | -10/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.38.0 - @0xproject/abi-gen@0.3.0 - @0xproject/assert@0.2.10 - @0xproject/base-contract@0.3.2 - @0xproject/connect@0.6.13 - @0xproject/contract-wrappers@0.0.2 - contracts@2.1.29 - @0xproject/dev-utils@0.4.2 - @0xproject/fill-scenarios@0.0.2 - @0xproject/json-schemas@0.7.24 - @0xproject/metacoin@0.0.7 - @0xproject/migrations@0.0.6 - @0xproject/monorepo-scripts@0.1.20 - @0xproject/order-utils@0.0.5 - @0xproject/order-watcher@0.0.2 - @0xproject/react-docs-example@0.0.12 - @0xproject/react-docs@0.0.12 - @0xproject/react-shared@0.1.7 - @0xproject/sol-compiler@0.5.0 - @0xproject/sol-cov@0.0.11 - @0xproject/sol-resolver@0.0.5 - @0xproject/sra-report@0.1.0 - @0xproject/subproviders@0.10.2 - @0xproject/testnet-faucets@1.0.30 - @0xproject/tslint-config@0.4.18 - @0xproject/types@0.7.0 - @0xproject/typescript-typings@0.3.2 - @0xproject/utils@0.6.2 - @0xproject/web3-wrapper@0.6.4 - @0xproject/website@0.0.33 | ||||
* | | | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 2 | -1/+14 |
| | | | |||||
* | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 2 | -3/+2 |
|/ / | |||||
* | | Merge pull request #605 from 0xProject/fix/multiple/build-errors | Fabio Berger | 2018-05-23 | 1 | -14/+14 |
|\ \ | | | | | | | Fix build/lint errors and warnings | ||||
| * | | Update artifacts | Remco Bloemen | 2018-05-22 | 1 | -14/+14 |
| | | | |||||
* | | | merge development | Fabio Berger | 2018-05-23 | 2 | -3/+4 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | remove generated contract_wrappers during clean | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 1 | -2/+3 |
| |\ | | | | | | | Add more tslint rules | ||||
| | * | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-17 | 7 | -43/+7 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Remove "Order utils" from menu for now Fix top tokens key Improve about page descriptions Do not remove artifacts when running `clean` | ||||
| | * \ | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 1 | -0/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json | ||||
| | * | | | Fix TSLint rules | Fabio Berger | 2018-05-16 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 16 | -289/+637 |
|\ \ \ \ \ | | | | | | | | | | | | | Atomic Order Matching | ||||
| * | | | | | Ran prettier | Greg Hysen | 2018-05-22 | 16 | -7692/+7892 |
| | | | | | | |||||
| * | | | | | Added getNullFillResults | Greg Hysen | 2018-05-19 | 2 | -14/+14 |
| | | | | | | |||||
| * | | | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 2 | -20/+20 |
| | | | | | | |||||
| * | | | | | Style improvements to order matching | Greg Hysen | 2018-05-19 | 1 | -10/+10 |
| | | | | | | |||||
| * | | | | | Upgraded to Solidity 0.4.24 | Greg Hysen | 2018-05-19 | 10 | -149/+149 |
| | | | | | | |||||
| * | | | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 16 | -7544/+7692 |
| | | | | | | |||||
* | | | | | | merge development | Fabio Berger | 2018-05-22 | 1 | -5/+5 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | / | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 1 | -5/+5 |
| | |_|/ | |/| | | |||||
| * | | | Improve about page descriptions | fragosti | 2018-05-17 | 6 | -42/+6 |
| | | | | |||||
* | | | | Fix prettier | Brandon Millman | 2018-05-19 | 16 | -7343/+7544 |
| | | | | |||||
* | | | | Merge branch 'development' into v2-prototype | Fabio Berger | 2018-05-16 | 2 | -19/+10 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (29 commits) Do not remove artifacts when running `clean` fix style errors Fix circular dependency Add my profile image to images Add myself to about page Add dogfood configs to website Revert to lerna:run lint Do lint sequentially Exclude monorepo-scripts from tslint as test Fix prettier Add hover state to top tokens Change to weekly txn volume Change minimum Node version to 6.12 Document Node.js version requirement and add it to package.json Apply prettier to some files which were not formatted correctly Fix TSLint issues Fix TSLint issues Update ethereeumjs-testrpc to ganache-cli Fix infinite loop Add changelog entries for packages where executable binary exporting fixed ... # Conflicts: # packages/contracts/package.json # packages/contracts/util/formatters.ts # packages/contracts/util/signed_order_utils.ts # packages/migrations/package.json # yarn.lock | ||||
| * | | | Do not remove artifacts when running `clean` | Fabio Berger | 2018-05-16 | 1 | -1/+1 |
| | |/ | |/| | |||||
| * | | Merge pull request #578 from 0xProject/document-node-version | Alex Browne | 2018-05-16 | 1 | -0/+3 |
| |\ \ | | |/ | |/| | Document Node.js version requirement and add it to package.json | ||||
| | * | Change minimum Node version to 6.12 | Alex Browne | 2018-05-15 | 1 | -1/+1 |
| | | | |||||
| | * | Document Node.js version requirement and add it to package.json | Alex Browne | 2018-05-15 | 1 | -0/+3 |
| | | | |||||
| * | | Fix abi-gen binary so it can be called directly from packages | Fabio Berger | 2018-05-15 | 1 | -2/+3 |
| | | | |||||
| * | | Move from using lerna multi-package commands to wsrun, update README's ↵ | Fabio Berger | 2018-05-15 | 2 | -16/+4 |
| |/ | | | | | | | accordingly | ||||
* | | Do not remove artifacts when running `clean` | Fabio Berger | 2018-05-16 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 35 | -48/+12001 |
|\| | |||||
| * | Add compilerSettings to compiler.json | Fabio Berger | 2018-05-11 | 1 | -1/+14 |
| | | |||||
| * | Add deployedBytecode to artifacts since it is needed by sol-cov | Fabio Berger | 2018-05-11 | 14 | -56/+140 |
| | | |||||
| * | Update artifacts | Fabio Berger | 2018-05-11 | 24 | -7657/+5961 |
| | | |||||
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 8 | -41/+167 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix ganache subprovider config Fix a bug in compiler config precedence Fix linter errors Fix templates Remove unused deployer docs configs Add a legacy endpoint for the deployer Add a check for compiler output Add a comment Put ARTIFACTS_VERSION in a config Improve a comment Remove _applyDefaultsToDeployTxDataAsync Add a HACK comment Fix linter issues Rename deployer to sol-compiler Remove deployer Remove deployer from 0x.js and migrations Configure migrations with a compiler.json Remove deployer from metacoin and contract tests Update wallet footer and add remove token functionality # Conflicts: # .gitignore # packages/0x.js/package.json # packages/0x.js/src/0x.ts # packages/contracts/package.json # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts # packages/deployer/test/deployer_test.ts # packages/migrations/package.json | ||||
| | * | Fix templates | Leonid Logvinov | 2018-05-10 | 2 | -2/+3 |
| | | | |||||
| | * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 5 | -33/+41 |
| | | | |||||
| | * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 3 | -12/+12 |
| | | | |||||
| | * | Rename deployer to sol-compiler | Leonid Logvinov | 2018-05-10 | 3 | -4/+6 |
| | | | |||||
| | * | Remove deployer | Leonid Logvinov | 2018-05-10 | 1 | -1/+0 |
| | | | |||||
| | * | Remove deployer from 0x.js and migrations | Leonid Logvinov | 2018-05-10 | 6 | -35/+134 |
| | | | |||||
| | * | Configure migrations with a compiler.json | Leonid Logvinov | 2018-05-10 | 3 | -6/+23 |
| | | | |||||
| * | | Add artifacts to clean command | Fabio Berger | 2018-05-11 | 1 | -1/+1 |
| | | | |||||
| * | | Commit v1 artifacts to migrations package and remove compile step from prebuild | Fabio Berger | 2018-05-11 | 25 | -0/+7685 |
| | | | |||||
| * | | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-10 | 1 | -0/+0 |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: (38 commits) Add fallback image support to relayer grid tile Clear relayer grid state when fetching Configure the compiler to generate artifacts with deployedBytecode Implement loading and error state for relayer grid Fallback image for relayer grid tile Change relayer grid tile to link on header Display top tokens from backend Remove overflowZ property from portal Suggestions and fix bad merge Fix typo Only show untracked tokens Make wallet scrollable Add token flow Update The Ocean logo Fix artifacts paths Create an artifacts folder Introduce a var Add removeHexPrefix util method CHeck if ABI exists Improve the readability of the check for should compile ... # Conflicts: # .gitignore # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts | ||||
| | * | Create an artifacts folder | Leonid Logvinov | 2018-05-07 | 1 | -0/+0 |
| | | | |||||
| * | | Add missing quote | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Remove uneeded tslint config | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| |/ | |||||
| * | Publishcontracts@2.1.28@0xproject/website@0.0.32@0xproject/testnet-faucets@1.0.29@0xproject/sra-report@0.0.14@0xproject/sol-resolver@0.0.4@0xproject/react-docs-example@0.0.11@0xproject/migrations@0.0.5@0xproject/metacoin@0.0.6@0xproject/dev-utils@0.4.1@0xproject/base-contract@0.3.1 | Leonid Logvinov | 2018-05-05 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.2 - @0xproject/abi-gen@0.2.13 - @0xproject/assert@0.2.9 - @0xproject/base-contract@0.3.1 - @0xproject/connect@0.6.12 - contracts@2.1.28 - @0xproject/deployer@0.4.3 - @0xproject/dev-utils@0.4.1 - @0xproject/json-schemas@0.7.23 - @0xproject/metacoin@0.0.6 - @0xproject/migrations@0.0.5 - @0xproject/order-utils@0.0.4 - @0xproject/react-docs-example@0.0.11 - @0xproject/react-docs@0.0.11 - @0xproject/react-shared@0.1.6 - @0xproject/sol-cov@0.0.10 - @0xproject/sol-resolver@0.0.4 - @0xproject/sra-report@0.0.14 - @0xproject/subproviders@0.10.1 - @0xproject/testnet-faucets@1.0.29 - @0xproject/types@0.6.3 - @0xproject/typescript-typings@0.3.1 - @0xproject/utils@0.6.1 - @0xproject/web3-wrapper@0.6.3 - @0xproject/website@0.0.32 | ||||
| * | Updated CHANGELOGS | Leonid Logvinov | 2018-05-05 | 2 | -0/+13 |
| | | |||||
| * | Publishcontracts@2.1.26@0xproject/website@0.0.29@0xproject/testnet-faucets@1.0.27@0xproject/sra-report@0.0.12@0xproject/sol-resolver@0.0.3@0xproject/react-docs-example@0.0.9@0xproject/monorepo-scripts@0.1.19@0xproject/migrations@0.0.4@0xproject/metacoin@0.0.5@0xproject/dev-utils@0.4.0@0xproject/base-contract@0.3.0 | Leonid Logvinov | 2018-05-04 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.37.0 - @0xproject/abi-gen@0.2.12 - @0xproject/assert@0.2.8 - @0xproject/base-contract@0.3.0 - @0xproject/connect@0.6.11 - contracts@2.1.26 - @0xproject/deployer@0.4.2 - @0xproject/dev-utils@0.4.0 - @0xproject/json-schemas@0.7.22 - @0xproject/metacoin@0.0.5 - @0xproject/migrations@0.0.4 - @0xproject/monorepo-scripts@0.1.19 - @0xproject/order-utils@0.0.2 - @0xproject/react-docs-example@0.0.9 - @0xproject/react-docs@0.0.9 - @0xproject/react-shared@0.1.4 - @0xproject/sol-cov@0.0.9 - @0xproject/sol-resolver@0.0.3 - @0xproject/sra-report@0.0.12 - @0xproject/subproviders@0.10.0 - @0xproject/testnet-faucets@1.0.27 - @0xproject/tslint-config@0.4.17 - @0xproject/types@0.6.2 - @0xproject/typescript-typings@0.3.0 - @0xproject/utils@0.6.0 - @0xproject/web3-wrapper@0.6.2 - @0xproject/website@0.0.29 | ||||
| * | Updated CHANGELOGS | Leonid Logvinov | 2018-05-04 | 2 | -0/+13 |
| | | |||||
* | | Remove remenants of MaliciousToken contract | Fabio Berger | 2018-04-26 | 2 | -2/+1 |
|/ | |||||
* | Merge branch 'development' into fix/expiration-watcher | Fabio Berger | 2018-04-19 | 3 | -2/+25 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Publish Updated CHANGELOGS Move @0xproject/migrations to devDependencies Publish Updated CHANGELOGS Make @0xproject/migrations public # Conflicts: # packages/0x.js/CHANGELOG.json # packages/0x.js/package.json | ||||
| * | Publishcontracts@2.1.24@0xproject/website@0.0.27@0xproject/testnet-faucets@1.0.25@0xproject/sra-report@0.0.10@0xproject/migrations@0.0.3 | Leonid Logvinov | 2018-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | - 0x.js@0.36.2 - contracts@2.1.24 - @0xproject/migrations@0.0.3 - @0xproject/sra-report@0.0.10 - @0xproject/testnet-faucets@1.0.25 - @0xproject/website@0.0.27 | ||||
| * | Updated CHANGELOGS | Leonid Logvinov | 2018-04-19 | 2 | -0/+21 |
| | | |||||
| * | Make @0xproject/migrations public | Leonid Logvinov | 2018-04-19 | 1 | -1/+3 |
| | | |||||
* | | Fix expiration watcher comparator | Leonid Logvinov | 2018-04-18 | 1 | -1/+1 |
|/ | |||||
* | Publishcontracts@2.1.23@0xproject/website@0.0.26@0xproject/testnet-faucets@1.0.24@0xproject/sra-report@0.0.9@0xproject/sol-resolver@0.0.2@0xproject/react-docs-example@0.0.8@0xproject/monorepo-scripts@0.1.18@0xproject/migrations@0.0.2@0xproject/metacoin@0.0.4@0xproject/dev-utils@0.3.6@0xproject/base-contract@0.2.1 | Fabio Berger | 2018-04-18 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 0x.js@0.36.1 - @0xproject/abi-gen@0.2.11 - @0xproject/assert@0.2.7 - @0xproject/base-contract@0.2.1 - @0xproject/connect@0.6.10 - contracts@2.1.23 - @0xproject/deployer@0.4.1 - @0xproject/dev-utils@0.3.6 - @0xproject/json-schemas@0.7.21 - @0xproject/metacoin@0.0.4 - @0xproject/migrations@0.0.2 - @0xproject/monorepo-scripts@0.1.18 - @0xproject/react-docs-example@0.0.8 - @0xproject/react-docs@0.0.8 - @0xproject/react-shared@0.1.3 - @0xproject/sol-cov@0.0.8 - @0xproject/sol-resolver@0.0.2 - @0xproject/sra-report@0.0.9 - @0xproject/subproviders@0.9.0 - @0xproject/testnet-faucets@1.0.24 - @0xproject/tslint-config@0.4.16 - @0xproject/types@0.6.1 - @0xproject/typescript-typings@0.2.0 - @0xproject/utils@0.5.2 - @0xproject/web3-wrapper@0.6.1 - @0xproject/website@0.0.26 | ||||
* | Fix web3-wrapper version | Fabio Berger | 2018-04-12 | 1 | -1/+1 |
| | |||||
* | Merge branch 'development' into removeMigrateStep | Fabio Berger | 2018-04-12 | 1 | -1/+1 |
| | | | | | | | | | | | * development: Publish Updated CHANGELOGS # Conflicts: # packages/0x.js/package.json # packages/deployer/package.json # packages/utils/CHANGELOG.json | ||||
* | Simply export | Fabio Berger | 2018-04-11 | 1 | -3/+1 |
| | |||||
* | Move NULL_BYTES to @0xproject/utils | Fabio Berger | 2018-04-11 | 3 | -22/+17 |
| | |||||
* | Move migrations into separate monorepo subpackage and hook it up to 0x.js ↵ | Fabio Berger | 2018-04-09 | 11 | -0/+321 |
and contracts |