| Commit message (Expand) | Author | Age | Files | Lines |
* | Remove .only | Greg Hysen | 2018-06-21 | 1 | -1/+1 |
* | Fixed two mislabelled revert reasons + Signature Validator revert tests worki... | Greg Hysen | 2018-06-21 | 3 | -8/+17 |
* | Minor style tweaks | Greg Hysen | 2018-06-21 | 3 | -8/+8 |
* | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported t... | Greg Hysen | 2018-06-21 | 9 | -27/+530 |
* | Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-20 | 7 | -45/+166 |
|\ |
|
| * | Fix closing parens in liborder | Jacob Evans | 2018-06-20 | 1 | -16/+15 |
| * | Assembler orderHash function | Remco Bloemen | 2018-06-19 | 1 | -18/+22 |
| * | Optimize and remove redundant encodePacked | Jacob Evans | 2018-06-19 | 4 | -13/+23 |
| * | Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-18 | 70 | -929/+2461 |
| |\ |
|
| * | | Rebase and update feedback | Jacob Evans | 2018-06-18 | 4 | -81/+85 |
| * | | Basic EIP712 encoder | Jacob Evans | 2018-06-08 | 1 | -10/+11 |
| * | | Update Order utils to use eip712 | Jacob Evans | 2018-06-06 | 9 | -178/+50 |
| * | | Add missing EIP191 prefix for EIP712 | Jacob Evans | 2018-06-05 | 10 | -50/+279 |
* | | | Update after rebase | Jacob Evans | 2018-06-20 | 1 | -7/+1 |
* | | | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 1 | -2/+6 |
* | | | Rename makerEpoch => orderEpoch | Amir Bandeali | 2018-06-20 | 7 | -46/+49 |
* | | | Make cancelOrdersUpTo compatible with sender abstraction | Amir Bandeali | 2018-06-20 | 8 | -8/+225 |
* | | | Merge pull request #683 from 0xProject/fix/contracts/memcpy | Remco Bloemen | 2018-06-19 | 1 | -10/+12 |
|\ \ \ |
|
| * | | | Simplified handling of source < 32 edge case | Remco Bloemen | 2018-06-11 | 1 | -10/+12 |
* | | | | Merge pull request #728 from 0xProject/fix/post-dev-publish | Fabio Berger | 2018-06-19 | 1 | -12/+12 |
|\ \ \ \ |
|
| * | | | | Fix additional versions and update yarn.lock | Fabio Berger | 2018-06-19 | 1 | -1/+1 |
| * | | | | Update all package versions to match latest published to NPM | Fabio Berger | 2018-06-19 | 1 | -11/+11 |
* | | | | | Merge pull request #659 from 0xProject/feature/contracts/split-proxy-internal... | Jacob Evans | 2018-06-19 | 6 | -129/+206 |
|\ \ \ \ \
| |/ / / /
|/| | | | |
|
| * | | | | Rebase with latest removing PROXY_ID from transfer | Jacob Evans | 2018-06-18 | 5 | -95/+111 |
| * | | | | Split transfer impl and AssetProxyMixin | Jacob Evans | 2018-06-18 | 4 | -95/+156 |
| | |_|/
| |/| | |
|
* | | | | Make isValidSignature public | Amir Bandeali | 2018-06-19 | 3 | -15/+15 |
* | | | | Make batchFill methods return FIllResults struct | Amir Bandeali | 2018-06-19 | 2 | -10/+28 |
|/ / / |
|
* | | | Merge pull request #700 from 0xProject/fix/contracts/tokenbugs | Remco Bloemen | 2018-06-16 | 1 | -1/+29 |
|\ \ \ |
|
| * | | | Handle tokens that do not return bool | Remco Bloemen | 2018-06-14 | 1 | -1/+29 |
* | | | | Change wording of error message when you try to use more than one subprovider | Alex Browne | 2018-06-15 | 1 | -1/+1 |
* | | | | Fix linter errors and remove coverage.json | Alex Browne | 2018-06-15 | 1 | -2/+1 |
* | | | | Remove unused variables and other small fixes | Alex Browne | 2018-06-15 | 2 | -6/+7 |
* | | | | Fix a bug in revert_trace.ts | Alex Browne | 2018-06-15 | 1 | -23/+23 |
* | | | | Introduce subprovider for printing revert stack traces | Alex Browne | 2018-06-15 | 3 | -22/+51 |
|/ / / |
|
* | | | Rename popByte and popAddress | Amir Bandeali | 2018-06-13 | 5 | -18/+18 |
* | | | Hard code test addresses/bytes32 instead of generating pseudorandom ones | Amir Bandeali | 2018-06-13 | 1 | -19/+16 |
* | | | Unpop byte rather than making deep copy | Amir Bandeali | 2018-06-13 | 4 | -90/+95 |
* | | | Pass gas in to marketBuyOrdersNoThrow | Amir Bandeali | 2018-06-13 | 1 | -1/+1 |
* | | | Looks up the memory location of makerAssetData/takerAssetData | Greg Hysen | 2018-06-13 | 1 | -0/+2 |
* | | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA | Amir Bandeali | 2018-06-13 | 5 | -23/+13 |
* | | | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 3 | -70/+201 |
* | | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 20 | -209/+268 |
* | | | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts t... | Alex Browne | 2018-06-12 | 1 | -1/+4 |
* | | | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 2 | -2/+2 |
* | | | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 6 | -1/+58 |
|/ / |
|
* | | Linter changes to contracts | Greg Hysen | 2018-06-09 | 4 | -21/+6 |
* | | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 3 | -28/+36 |
* | | Cleanup after last rebase | Greg Hysen | 2018-06-08 | 4 | -6/+5 |
* | | Updated tests to use new revert handler | Greg Hysen | 2018-06-08 | 2 | -13/+13 |
* | | Minor fixes after rebase | Greg Hysen | 2018-06-08 | 1 | -14/+6 |
* | | Camelcase in memCopy | Greg Hysen | 2018-06-08 | 4 | -23/+23 |
* | | Style updates to contracts | Greg Hysen | 2018-06-08 | 6 | -26/+20 |
* | | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
* | | Fixed a styling throughout contracts. Moved closing parenthesis for long list... | Greg Hysen | 2018-06-08 | 8 | -31/+62 |
* | | Removed setting makerAssetData/takerAssetData from tests where values are sam... | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
* | | 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 | 6 | -12/+21 |
* | | Fixed after rebase | Greg Hysen | 2018-06-08 | 3 | -5/+5 |
* | | Fixes after rebasing | Greg Hysen | 2018-06-08 | 3 | -8/+6 |
* | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 7 | -50/+30 |
* | | 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 "negative... | Greg Hysen | 2018-06-08 | 2 | -144/+154 |
* | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T... | Greg Hysen | 2018-06-08 | 9 | -95/+64 |
* | | Converged on naming scheme for asset data: renamed all instances of assetMeta... | Greg Hysen | 2018-06-08 | 22 | -290/+257 |
* | | 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 | 5 | -28/+197 |
* | | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 6 | -5/+126 |
* | | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 2 | -27/+31 |
* | | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 7 | -2/+128 |
* | | Tests for libMem | Greg Hysen | 2018-06-08 | 5 | -16/+80 |
* | | LibMem + TestLibMem + LibAssetProxyDecoder + DummyERC721Receiver | Greg Hysen | 2018-06-08 | 8 | -27/+581 |
* | | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 2 | -23/+53 |
* | | Merge pull request #678 from 0xProject/fix/order-utils/remaining-v2-changes | Fabio Berger | 2018-06-08 | 1 | -0/+1 |
|\ \ |
|
| * | | Fix tslint failure | Fabio Berger | 2018-06-08 | 3 | -2/+3 |
* | | | Merge pull request #670 from 0xProject/fix/generated-nesting | Fabio Berger | 2018-06-08 | 23 | -56/+56 |
|\ \ \ |
|
| * | | | Fix tslint issues | Fabio Berger | 2018-06-08 | 2 | -2/+2 |
| * | | | Fix missing paths | Fabio Berger | 2018-06-08 | 1 | -4/+4 |
| * | | | Fixed path | Fabio Berger | 2018-06-07 | 3 | -11/+11 |
| * | | | merge v2-prototype | Fabio Berger | 2018-06-07 | 32 | -335/+465 |
| |\| | |
|
| * | | | move generated contract wrappers from `contract_wrappers/generated/` to `gene... | Fabio Berger | 2018-06-06 | 24 | -60/+60 |
* | | | | Merge pull request #676 from 0xProject/feature/mocha-source-maps | Alex Browne | 2018-06-08 | 1 | -1/+1 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Use source-map-support package to include correct line numbers in mocha | Alex Browne | 2018-06-07 | 1 | -1/+1 |
* | | | | Merge pull request #673 from mohoff/patch-1 | Fabio Berger | 2018-06-07 | 1 | -1/+1 |
|\ \ \ \ |
|
| * | | | | typo | mohoff | 2018-06-07 | 1 | -1/+1 |
| |/ / / |
|
* | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 19 | -214/+416 |
|\| | | |
|
| * | | | 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 | 3 | -12/+55 |
| * | | | 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 |
| * | | | 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 more things to work with both Geth and Ganache | Alex Browne | 2018-06-07 | 3 | -38/+42 |
| * | | | Small fixes and cleanup | Alex Browne | 2018-06-07 | 3 | -8/+4 |
| * | | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 3 | -152/+55 |
| * | | | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 3 | -6/+17 |
| * | | | 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 | 1 | -3/+4 |
| * | | | 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 | 3 | -25/+34 |
| * | | | Add ability to quickly switch between Geth and Ganache by changing a const | Alex Browne | 2018-06-07 | 1 | -3/+16 |
| * | | | Update exchange/transactions tests for Geth error messages | Alex Browne | 2018-06-07 | 1 | -4/+4 |
| * | | | 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 | 6 | -20/+135 |
| * | | | Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans... | Alex Browne | 2018-06-07 | 12 | -170/+143 |
| * | | | Update code after rebase | Alex Browne | 2018-06-07 | 3 | -3/+8 |
| * | | | Use Geth for contract tests | Alex Browne | 2018-06-07 | 1 | -0/+20 |
* | | | | Get build and tests to pass | fragosti | 2018-06-07 | 1 | -1/+2 |
* | | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 1 | -2/+1 |
|\| | | |
|
| * | | | Stop running prettier on generated files | Leonid Logvinov | 2018-06-07 | 1 | -2/+1 |
| |/ / |
|
* | | | Use CLI for exclude | fragosti | 2018-06-07 | 2 | -4/+1 |
* | | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 1 | -3/+3 |
|\| | |
|
| * | | Merge v2-prototype | Fabio Berger | 2018-06-06 | 1 | -1/+1 |
| |\ \ |
|
| * | | | - 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 | 1 | -1/+2 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Replace `-` with `_` in yarn script name so that we are consistent across yar... | Fabio Berger | 2018-06-05 | 1 | -1/+1 |
| |/ / |
|
| * | | Merge pull request #658 from 0xProject/dont-automatically-rebuild-for-tests | Alex Browne | 2018-06-05 | 1 | -1/+2 |
| |\ \
| | |/
| |/| |
|
| | * | Don't automatically rebuild when running yarn test | Alex Browne | 2018-06-05 | 1 | -1/+2 |
* | | | Linter now passes | fragosti | 2018-06-06 | 27 | -104/+35 |
|/ / |
|
* | | 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 fa... | Amir Bandeali | 2018-06-05 | 30 | -702/+491 |
|/ |
|
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 3 | -55/+52 |
|\ |
|
| * | 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 |
* | | Improve comments and remove unused imports | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
* | | Fix tslint issues | Fabio Berger | 2018-06-02 | 3 | -5/+3 |
* | | Fix types version | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
* | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 19 | -42/+91 |
|\| |
|
| * | Fix linter errors | Leonid Logvinov | 2018-06-01 | 6 | -6/+6 |
| * | Add ethereum-types to extraFileIncludes | Leonid Logvinov | 2018-06-01 | 1 | -2/+9 |
| * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 15 | -20/+20 |
| * | Merge pull request #641 from 0xProject/feature/remove-types | Leonid Logvinov | 2018-06-01 | 1 | -0/+2 |
| |\ |
|
| | * | Remove some types | Leonid Logvinov | 2018-06-01 | 1 | -0/+2 |
| * | | Fix build | Amir Bandeali | 2018-06-01 | 1 | -1/+1 |
| |/ |
|
| * | Merge pull request #640 from 0xProject/await-transaction-success | Alex Browne | 2018-05-31 | 5 | -25/+64 |
| |\ |
|
| | * | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapper | Alex Browne | 2018-05-31 | 2 | -5/+7 |
| | * | Add awaitTransactionSuccess where needed | Alex Browne | 2018-05-31 | 4 | -22/+59 |
* | | | fix method rename | Fabio Berger | 2018-06-01 | 1 | -1/+1 |
* | | | Rename Ecrecover to EthSign | Fabio Berger | 2018-06-01 | 3 | -6/+3 |
* | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 42 | -188/+717 |
|\| | |
|
| * | | Check length before accessing indices, add awaitTransactionSuccess where need... | Amir Bandeali | 2018-05-31 | 5 | -25/+43 |
| * | | Add back before/after snapshots for each test | Amir Bandeali | 2018-05-31 | 16 | -0/+97 |
| * | | Rename Signer to Wallet, rename GAS_ESTIMATE to GAS_LIMIT | Amir Bandeali | 2018-05-31 | 3 | -4/+4 |
| * | | Make preSigned and allowedValidators mappings public | Amir Bandeali | 2018-05-31 | 1 | -2/+2 |
| * | | Change names of signature types | Amir Bandeali | 2018-05-31 | 2 | -6/+6 |
| * | | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 18 | -94/+16 |
| * | | Make AssetProxyId last byte of assetData | Amir Bandeali | 2018-05-31 | 18 | -37/+74 |
| * | | Add signer to txHash, allow approveValidator to be used with executeTransaction | Amir Bandeali | 2018-05-31 | 3 | -7/+10 |
| * | | Update Whitelist | Amir Bandeali | 2018-05-31 | 6 | -24/+55 |
| * | | Fix Exchange interface | Amir Bandeali | 2018-05-31 | 1 | -7/+5 |
| * | | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 8 | -106/+103 |
| * | | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 7 | -35/+35 |
| * | | Update Whitelist contract with comments, also require maker to be whitelisted | Amir Bandeali | 2018-05-31 | 5 | -16/+72 |
| * | | Fix build | Amir Bandeali | 2018-05-31 | 3 | -19/+24 |
| * | | Add example whitelist contract and minimum tests | Amir Bandeali | 2018-05-31 | 3 | -11/+121 |
| * | | Add sample whitelist contract | Amir Bandeali | 2018-05-31 | 3 | -1/+60 |
| * | | Add TxOrigin signature type and rearrange order of types | Amir Bandeali | 2018-05-31 | 3 | -63/+77 |
| * | | Add approveValidator function | Amir Bandeali | 2018-05-31 | 2 | -2/+17 |
| * | | Add Validator signature type | Amir Bandeali | 2018-05-31 | 4 | -3/+69 |
| * | | Add deepCopyBytes method to LibBytes | Amir Bandeali | 2018-05-31 | 3 | -0/+92 |
| * | | Change logDecoder back into class, remove awaitTransactionMined from multiSig... | Amir Bandeali | 2018-05-31 | 3 | -50/+62 |
| |/ |
|
* | | Introduce OrderWithoutExchangeAddress type since this is what get's sent to t... | Fabio Berger | 2018-05-31 | 4 | -32/+28 |
* | | Initial refactor of order-utils. Move many utils from contracts into this pac... | Fabio Berger | 2018-05-30 | 20 | -382/+64 |
* | | Freeze order-utils at 0.0.5 for all packages except contracts | Fabio Berger | 2018-05-30 | 1 | -1/+1 |
|/ |
|
* | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 5 | -103/+86 |
* | Fix imports in order_utils | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 20 | -387/+629 |
|\ |
|
| * | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 7 | -49/+48 |
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 4 | -6/+12 |
| * | Move readFirst4 to LibBytes | Amir Bandeali | 2018-05-25 | 5 | -39/+53 |
| * | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 7 | -16/+16 |
| * | Fix build | Amir Bandeali | 2018-05-25 | 4 | -4/+91 |
| * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 6 | -33/+37 |
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 4 | -253/+355 |
| * | Update MultiSigWalletWithTimeLockExceptRemoveAuthorizedAddress to use a mappi... | Amir Bandeali | 2018-05-25 | 1 | -18/+48 |
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 12 | -48/+26 |
|\ \ |
|
| * \ | Merge pull request #618 from 0xProject/feature/v2-migrations | Leonid Logvinov | 2018-05-25 | 12 | -49/+27 |
| |\ \
| | |/
| |/| |
|
| | * | Fix linter issues | Leonid Logvinov | 2018-05-25 | 3 | -3/+3 |
| | * | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 12 | -49/+27 |
* | | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 4 | -8/+41 |
* | | | publicGetOrderSchemaHash -> getOrderSchemaHash | Jacob Evans | 2018-05-25 | 2 | -2/+2 |
* | | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 4 | -34/+57 |
|/ / |
|
* / | Disable contracts coverage on CI | Leonid Logvinov | 2018-05-25 | 1 | -1/+1 |
|/ |
|
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 12 | -61/+85 |
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 5 | -19/+19 |
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 23 | -293/+280 |
|\ |
|
| * | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| * | fix contract-wrappers version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | merge v2-prototype | Fabio Berger | 2018-05-23 | 1 | -11/+11 |
| |\ |
|
| | * | Merge branch 'development' into v2-prototype | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
| | |\ |
|
| | | * | Publish | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
| * | | | Fix dep version | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | | | Fix import | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| * | | | Fix await calls | Fabio Berger | 2018-05-23 | 1 | -12/+3 |
| * | | | Refactor etherToken test to use contract-wrappers | Fabio Berger | 2018-05-23 | 1 | -22/+36 |
| * | | | Fix ExchangeWrapper | Fabio Berger | 2018-05-23 | 6 | -14/+10 |
| * | | | Fix imports | Fabio Berger | 2018-05-23 | 2 | -2/+1 |
| * | | | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 23 | -207/+478 |
| |\| | |
|
| * | | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 23 | -266/+235 |
* | | | | Parse compiler.json in SolCompilerArtifactsAdapter | Leonid Logvinov | 2018-05-23 | 1 | -3/+1 |
* | | | | Fix a bug in CALL-like opcode handling | Leonid Logvinov | 2018-05-23 | 2 | -4/+5 |
* | | | | Publish | Leonid Logvinov | 2018-05-23 | 1 | -11/+11 |
* | | | | Rename ZeroExArtifactAdapter to SolCompilerArtifactAdapter | Leonid Logvinov | 2018-05-23 | 1 | -2/+2 |
* | | | | Assign then return | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
* | | | | Introduce CONFIG_FILE | Leonid Logvinov | 2018-05-23 | 1 | -1/+2 |
* | | | | Remove web3Factory.create and remove dev-tools dependency on sol-cov | Leonid Logvinov | 2018-05-23 | 4 | -4/+35 |
| |/ /
|/| | |
|
* | | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto... | Fabio Berger | 2018-05-23 | 16 | -175/+419 |
|\ \ \ |
|
| * \ \ | Merge pull request #601 from 0xProject/contracts-test-fixes | Alex Browne | 2018-05-23 | 16 | -175/+419 |
| |\ \ \ |
|
| | * | | | Rename some variables in multi_sig_with_time_lock.ts | Alex Browne | 2018-05-23 | 1 | -10/+10 |
| | * | | | Remove extra awaitTransactionMinedAsync calls | Alex Browne | 2018-05-23 | 1 | -4/+2 |
| | * | | | Apply changes to test/exchange/match_orders.ts | Alex Browne | 2018-05-22 | 1 | -6/+18 |
| | * | | | Fix some unhandled promise rejections | Alex Browne | 2018-05-22 | 2 | -4/+8 |
| | * | | | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 10 | -155/+294 |
| | * | | | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 14 | -0/+91 |
* | | | | | Fix tslint issues | Fabio Berger | 2018-05-23 | 2 | -10/+13 |
|/ / / / |
|
* | | | | Merge pull request #605 from 0xProject/fix/multiple/build-errors | Fabio Berger | 2018-05-23 | 7 | -18/+30 |
|\ \ \ \
| |_|/ /
|/| | | |
|
| * | | | Add CancelOrder and MatchOrder types | Remco Bloemen | 2018-05-22 | 2 | -3/+15 |
| * | | | Add missing return types | Remco Bloemen | 2018-05-22 | 5 | -15/+15 |
| |/ / |
|
* | | | merge development | Fabio Berger | 2018-05-23 | 3 | -5/+8 |
|\ \ \
| |/ /
|/| /
| |/ |
|
| * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 4 | -9/+12 |
| |\ |
|
| | * | Merge branch 'development' into improvement/addCustomTslintRules | Fabio Berger | 2018-05-16 | 1 | -0/+3 |
| | |\ |
|
| | * | | Fix TSLint rules | Fabio Berger | 2018-05-16 | 4 | -9/+12 |
* | | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 62 | -243/+2500 |
|\ \ \ \ |
|
| * | | | | Added getNullFillResults | Greg Hysen | 2018-05-19 | 2 | -1/+16 |
| * | | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 7 | -41/+41 |
| * | | | | Style improvements to order matching | Greg Hysen | 2018-05-19 | 4 | -28/+17 |
| * | | | | Upgraded to Solidity 0.4.24 | Greg Hysen | 2018-05-19 | 53 | -57/+57 |
| * | | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 6 | -13/+16 |
| * | | | | Changed calculateFillResults to public visibility so that it can be used by t... | Greg Hysen | 2018-05-19 | 3 | -131/+131 |
| * | | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ... | Greg Hysen | 2018-05-19 | 2 | -138/+126 |
| * | | | | Wording of calculateMatchedFillResults | Greg Hysen | 2018-05-19 | 1 | -9/+11 |
| * | | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ... | Greg Hysen | 2018-05-19 | 3 | -17/+63 |
| * | | | | Style improvements to the match orders typescript test class | Greg Hysen | 2018-05-19 | 1 | -18/+14 |
| * | | | | Removed redundant log decode call | Greg Hysen | 2018-05-19 | 1 | -2/+0 |
| * | | | | The OrderInfo struct is now returned by the getOrderInfo function | Greg Hysen | 2018-05-19 | 8 | -141/+98 |
| * | | | | Updated order of settleMatchedOrders to align with settleOrder | Greg Hysen | 2018-05-19 | 3 | -8/+8 |