Commit message (Expand) | 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 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | 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 |
|\ | |||||
| * | 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 (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 | 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 `se... | Greg Hysen | 2018-06-21 | 1 | -59/+27 |
* | 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 |
|\ | |||||
| * | 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 t... | Alex Browne | 2018-06-12 | 16 | -148/+849 |
* | 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 |
|\ | |||||
| * | 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 |
|\| | |||||
| * | 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 |
|\| | |||||
| * | - Rename watch to watch_without_deps in sub-packages, so dev's don't confuse ... | Fabio Berger | 2018-06-05 | 1 | -3/+3 |
* | | 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 |
| |\ | |||||
| | * | 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 |
|\ | |||||
| * | 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 |
|\| | |||||
| * | 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 |
|\| | |||||
| * | 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 pac... | Fabio Berger | 2018-05-30 | 2 | -3/+4 |
|/ | |||||
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 2 | -9/+791 |
|\ | |||||
| * | 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 |
|\ \ | |||||
| * | | 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 |
| | * | Updated CHANGELOGS | Leonid Logvinov | 2018-05-23 | 2 | -1/+14 |
* | | | Publish | Leonid Logvinov | 2018-05-23 | 1 | -10/+10 |
* | | | 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 |
|\ \ | |||||
| * | | 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 |
| |\ | |||||
| | * | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-17 | 7 | -43/+7 |
| | |\ | |||||
| | * \ | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 1 | -0/+3 |
| | |\ \ | |||||
| | * | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
|\| | | | |||||
| * | | | 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 |
| |\ \ | | |/ | |/| | |||||
| | * | 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 accord... | Fabio Berger | 2018-05-15 | 2 | -16/+4 |
| |/ | |||||
* | | 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 |
| |\ | |||||
| | * | 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 |
| |\| | |||||
| | * | 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 |
| |/ | |||||
| * | Publish | Leonid Logvinov | 2018-05-05 | 1 | -5/+5 |
| * | Updated CHANGELOGS | Leonid Logvinov | 2018-05-05 | 2 | -0/+13 |
| * | Publish | Leonid Logvinov | 2018-05-04 | 1 | -6/+6 |
| * | 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 |
|\ | |||||
| * | Publish | Leonid Logvinov | 2018-04-19 | 1 | -1/+1 |
| * | 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 |
|/ | |||||
* | Publish | Fabio Berger | 2018-04-18 | 1 | -6/+6 |
* | 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 |
* | 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 and... | Fabio Berger | 2018-04-09 | 11 | -0/+321 |