| Commit message (Expand) | Author | Age | Files | Lines |
* | Rename to singular | Fabio Berger | 2018-06-26 | 1 | -9/+9 |
* | Fix merge issues | Fabio Berger | 2018-06-26 | 1 | -1/+4 |
* | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 7 | -75/+45 |
|\ |
|
| * | Don't use variables for revert reasons | Amir Bandeali | 2018-06-26 | 1 | -2/+4 |
| * | Run prettier and fix linting errors | Amir Bandeali | 2018-06-26 | 1 | -18/+6 |
| * | Fix tests | Amir Bandeali | 2018-06-26 | 4 | -5/+4 |
| * | Update tests | Remco Bloemen | 2018-06-26 | 1 | -2/+2 |
| * | Update tests | Remco Bloemen | 2018-06-26 | 2 | -33/+20 |
| * | WIP | Remco Bloemen | 2018-06-26 | 1 | -0/+1 |
| * | Remove proxyId argument from dispatchTransferFrom | Remco Bloemen | 2018-06-26 | 2 | -7/+4 |
* | | Fix inconsistency between contract and reference implementation of order vali... | Fabio Berger | 2018-06-26 | 1 | -0/+2 |
* | | Prettier fixes | Fabio Berger | 2018-06-26 | 1 | -4/+1 |
* | | Fix tslint issues | Fabio Berger | 2018-06-26 | 3 | -4/+1 |
* | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 10 | -22/+14 |
|\ \ |
|
| * | | Move RevertReasons to @0xproject/types package | Fabio Berger | 2018-06-25 | 10 | -22/+14 |
| * | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
* | | | Add missing import | Fabio Berger | 2018-06-25 | 1 | -1/+4 |
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 10 | -108/+172 |
|\| | |
|
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-25 | 5 | -366/+539 |
| |\| |
|
| * | | Fix tslint | Fabio Berger | 2018-06-23 | 4 | -4/+4 |
| * | | Fix prettier | Fabio Berger | 2018-06-23 | 5 | -15/+13 |
| * | | Rename ContractLibErrors to RevertReasons | Fabio Berger | 2018-06-23 | 10 | -95/+95 |
| * | | Remove revert reason 'Exchange' prefix | Fabio Berger | 2018-06-23 | 1 | -1/+1 |
| * | | Move constants over to ContractLibError enum and update all tests | Fabio Berger | 2018-06-23 | 3 | -29/+32 |
| * | | Fix test now that contract reverts with message | Fabio Berger | 2018-06-22 | 1 | -5/+3 |
| * | | Add revert reason checks to wrapper tests | Fabio Berger | 2018-06-22 | 1 | -10/+19 |
| * | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| * | | Change Whitelist error messages to conform to rest and added revert reason ch... | Fabio Berger | 2018-06-22 | 1 | -16/+24 |
| * | | Add revert reason checks to match_orders tests | Fabio Berger | 2018-06-22 | 1 | -7/+18 |
| * | | Fix tests | Fabio Berger | 2018-06-22 | 1 | -2/+2 |
| * | | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-22 | 11 | -27/+435 |
| |\ \ |
|
| * | | | Check revert reason in dispatcher tests | Fabio Berger | 2018-06-22 | 2 | -5/+13 |
| * | | | remove unused import | Fabio Berger | 2018-06-22 | 1 | -1/+0 |
| * | | | Test revert reasons in proxy tests | Fabio Berger | 2018-06-21 | 1 | -11/+23 |
| * | | | remove only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| * | | | Check revert reasons in Authorizable tests | Fabio Berger | 2018-06-21 | 1 | -6/+14 |
| * | | | remove .only | Fabio Berger | 2018-06-21 | 1 | -1/+1 |
| * | | | Update core tests to actually check revert message | Fabio Berger | 2018-06-21 | 1 | -34/+53 |
* | | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-25 | 14 | -393/+974 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Add modifier and tests for removeAuthorizedAddressAtIndex | Amir Bandeali | 2018-06-23 | 1 | -0/+69 |
| * | | | Update and add tests | Amir Bandeali | 2018-06-23 | 2 | -170/+269 |
| * | | | Move isFunctionRemoveAuthorizedAddress to test | Remco Bloemen | 2018-06-23 | 1 | -7/+18 |
| * | | | Refactor LibBytes.readBytes4 for consistency | Remco Bloemen | 2018-06-23 | 1 | -3/+7 |
| * | | | Add trailing garbage testcase for LibBytes.equals | Remco Bloemen | 2018-06-23 | 1 | -0/+10 |
| * | | | Rename bytes.equals | Remco Bloemen | 2018-06-23 | 1 | -13/+13 |
| * | | | Rename read/writeBytesWithLength | Remco Bloemen | 2018-06-23 | 1 | -29/+29 |
| * | | | Merge LibMem and LibBytes | Remco Bloemen | 2018-06-23 | 3 | -191/+171 |
| * | | | Use provided mem in refernce memcpy | Remco Bloemen | 2018-06-23 | 1 | -2/+2 |
| | |/
| |/| |
|
| * | | Use make-promises-safe as a preloader instead of manually importing | Alex Browne | 2018-06-22 | 10 | -10/+0 |
| * | | Add event to setSignatureValidatorApproval, rename signer => signerAddress ac... | Amir Bandeali | 2018-06-22 | 1 | -2/+50 |
| * | | Add senderAddress to Fill and Cancel logs, add comments to events and types | Amir Bandeali | 2018-06-22 | 1 | -0/+2 |
| * | | Linter | Greg Hysen | 2018-06-21 | 1 | -2/+1 |
| * | | Changed wording of two tests #nit | Greg Hysen | 2018-06-21 | 1 | -2/+2 |
| * | | Minor improvements to MixinSignatureValidator tests | Greg Hysen | 2018-06-21 | 1 | -14/+8 |
| * | | 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 | 1 | -6/+10 |
| * | | Twenty new tests for MixinSignatureValidator. Fixed handling of unsupported t... | Greg Hysen | 2018-06-21 | 1 | -15/+386 |
| |/ |
|
* | | Add support for approveAll in assetWrapper and fillOrderScenarios | Fabio Berger | 2018-06-21 | 1 | -1/+39 |
* | | Split balance and allowance amount types in prep of adding the "unlimited" al... | Fabio Berger | 2018-06-20 | 1 | -13/+14 |
* | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-20 | 4 | -20/+140 |
|\| |
|
| * | Merge pull request #637 from 0xProject/bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-20 | 1 | -3/+7 |
| |\ |
|
| | * | Merge branch 'v2-prototype' into bug/contracts/eip712-191-prefix | Jacob Evans | 2018-06-18 | 20 | -608/+1380 |
| | |\ |
|
| | * | | Update Order utils to use eip712 | Jacob Evans | 2018-06-06 | 2 | -8/+6 |
| | * | | Add missing EIP191 prefix for EIP712 | Jacob Evans | 2018-06-05 | 1 | -2/+7 |
| * | | | ERC721Proxy Always call safeTransferFrom | Jacob Evans | 2018-06-20 | 1 | -2/+6 |
| * | | | Rename makerEpoch => orderEpoch | Amir Bandeali | 2018-06-20 | 2 | -20/+20 |
| * | | | Make cancelOrdersUpTo compatible with sender abstraction | Amir Bandeali | 2018-06-20 | 1 | -0/+112 |
| | |/
| |/| |
|
* | | | Remove hack in ERC20Wrapper | Fabio Berger | 2018-06-19 | 6 | -6/+24 |
* | | | Add ability to tweak the relevant balances/allowances for the maker and taker... | Fabio Berger | 2018-06-15 | 2 | -43/+57 |
* | | | - Refactor assetWrapper to contain more of the normalizing logic instead of e... | Fabio Berger | 2018-06-15 | 2 | -2/+3 |
* | | | Rename OrderAmountScenario to OrderAssetAmountScenario and convert generateOr... | Fabio Berger | 2018-06-14 | 2 | -17/+11 |
* | | | Use a defaultFillScenario in fillOrder tests | Fabio Berger | 2018-06-14 | 1 | -36/+39 |
* | | | Replace initial set of legacy manually written fillOrder tests with declarati... | Fabio Berger | 2018-06-14 | 2 | -434/+186 |
* | | | Add ability to specify takerAssetFillAmount and taker scenarios as part of a ... | Fabio Berger | 2018-06-14 | 1 | -6/+12 |
* | | | Move orderFill combinatorialTests to exchange folder | Fabio Berger | 2018-06-13 | 1 | -4/+4 |
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-13 | 8 | -140/+332 |
|\| | |
|
| * | | Rename popByte and popAddress | Amir Bandeali | 2018-06-13 | 1 | -6/+6 |
| * | | 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 | 1 | -0/+4 |
| * | | Make ZRX_PROXY_ID constant rather than popping it from ZRX_ASSET_DATA | Amir Bandeali | 2018-06-13 | 4 | -4/+4 |
| * | | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 1 | -70/+185 |
| * | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 4 | -60/+136 |
* | | | Implement initial set of orderFill combinatorial tests | Fabio Berger | 2018-06-13 | 1 | -240/+22 |
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-12 | 13 | -244/+810 |
|\| | |
|
| * | | Fix no-unused-variable tslint rule to include parameters and fix issues | Fabio Berger | 2018-06-12 | 1 | -1/+1 |
| * | | Implement SolidityProfiler & adapt sol-cov to work with Geth | Leonid Logvinov | 2018-06-09 | 1 | -0/+5 |
| * | | Linter changes to contracts | Greg Hysen | 2018-06-09 | 4 | -21/+6 |
| * | | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 1 | -22/+30 |
| * | | 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 | 1 | -1/+1 |
| * | | Style updates to contracts | Greg Hysen | 2018-06-08 | 3 | -10/+4 |
| * | | Union types for generalized decodeAssetData | Greg Hysen | 2018-06-08 | 1 | -2/+2 |
| * | | Removed setting makerAssetData/takerAssetData from tests where values are sam... | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
| * | | Style updates to ERC721 onReceiver | Greg Hysen | 2018-06-08 | 2 | -3/+14 |
| * | | 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 | 5 | -34/+21 |
| * | | Style audit for proxies + libmem + libbytes | Greg Hysen | 2018-06-08 | 2 | -27/+32 |
| * | | Call safeTransferFrom only when there is receiver data present | Greg Hysen | 2018-06-08 | 2 | -12/+14 |
| * | | Resolved edge case in Memcpy where where send would eventually turn "negative... | Greg Hysen | 2018-06-08 | 1 | -133/+137 |
| * | | Removed the LibAssetProxyDecoder. Merged decode functions into the proxies. T... | Greg Hysen | 2018-06-08 | 1 | -5/+5 |
| * | | Converged on naming scheme for asset data: renamed all instances of assetMeta... | Greg Hysen | 2018-06-08 | 9 | -223/+190 |
| * | | proxyData -> assetData | Greg Hysen | 2018-06-08 | 1 | -1/+1 |
| * | | 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 | 1 | -29/+6 |
| * | | Generate tests from vectors | Remco Bloemen | 2018-06-08 | 1 | -2/+40 |
| * | | Tests for writing bytes to nested bytes | Greg Hysen | 2018-06-08 | 1 | -9/+91 |
| * | | Tons of tests around nested byte arrays and ERC721 receiver | Greg Hysen | 2018-06-08 | 3 | -18/+165 |
| * | | Test for onReceived erc721 callback | Greg Hysen | 2018-06-08 | 2 | -3/+121 |
| * | | LibAssetProxyDecoder tests | Greg Hysen | 2018-06-08 | 1 | -26/+30 |
| * | | Foundation for TestLibAssetProxyDecoder | Greg Hysen | 2018-06-08 | 2 | -1/+73 |
| * | | Tests for libMem | Greg Hysen | 2018-06-08 | 1 | -0/+68 |
| * | | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 2 | -23/+53 |
* | | | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-08 | 17 | -44/+44 |
|\| | |
|
| * | | 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 | 2 | -10/+10 |
| * | | merge v2-prototype | Fabio Berger | 2018-06-07 | 16 | -290/+303 |
| |\ \ |
|
| * | | | move generated contract wrappers from `contract_wrappers/generated/` to `gene... | Fabio Berger | 2018-06-06 | 17 | -45/+45 |
| | |/
| |/| |
|
* | | | Merge branch 'fix/order-utils/remaining-v2-changes' into feature/combinatoria... | Fabio Berger | 2018-06-08 | 2 | -2/+2 |
|\ \ \ |
|
| * | | | Fix tslint failure | Fabio Berger | 2018-06-08 | 2 | -2/+2 |
| | |/
| |/| |
|
* / | | POC: Generates an order from spec, get's the amount fillable | Fabio Berger | 2018-06-08 | 1 | -0/+266 |
|/ / |
|
* | | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 13 | -206/+263 |
|\ \ |
|
| * | | 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 | 2 | -11/+54 |
| * | | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 13 | -103/+103 |
| * | | Fix linter errors | Alex Browne | 2018-06-07 | 1 | -6/+2 |
| * | | Update more things to work with both Geth and Ganache | Alex Browne | 2018-06-07 | 2 | -16/+28 |
| * | | Small fixes and cleanup | Alex Browne | 2018-06-07 | 1 | -2/+2 |
| * | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 2 | -146/+49 |
| * | | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 1 | -6/+4 |
| * | | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 3 | -55/+58 |
| * | | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 2 | -21/+15 |
| * | | Get LibBytes tests working on both Ganache and Geth | Alex Browne | 2018-06-07 | 1 | -24/+28 |
| * | | 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 | 11 | -168/+141 |
| * | | Update code after rebase | Alex Browne | 2018-06-07 | 1 | -20/+0 |
| * | | Use Geth for contract tests | Alex Browne | 2018-06-07 | 1 | -0/+20 |
| |/ |
|
* / | Linter now passes | fragosti | 2018-06-06 | 16 | -70/+26 |
|/ |
|
* | 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 | 5 | -71/+70 |
* | Improve comments and remove unused imports | Fabio Berger | 2018-06-02 | 1 | -1/+1 |
* | Fix tslint issues | Fabio Berger | 2018-06-02 | 2 | -3/+2 |
* | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-02 | 9 | -27/+63 |
|\ |
|
| * | Fix linter errors | Leonid Logvinov | 2018-06-01 | 2 | -2/+2 |
| * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 6 | -6/+8 |
| * | Fix build | Amir Bandeali | 2018-06-01 | 1 | -1/+1 |
| * | Merge pull request #640 from 0xProject/await-transaction-success | Alex Browne | 2018-05-31 | 4 | -21/+54 |
| |\ |
|
| | * | Pass in a provider and instantiate a new web3Wrapper in token_registry_wrapper | Alex Browne | 2018-05-31 | 1 | -1/+1 |
| | * | Add awaitTransactionSuccess where needed | Alex Browne | 2018-05-31 | 3 | -20/+53 |
* | | | fix method rename | Fabio Berger | 2018-06-01 | 1 | -1/+1 |
* | | | Merge branch 'v2-prototype' into refactor/order-utils/for-v2 | Fabio Berger | 2018-06-01 | 8 | -13/+185 |
|\| | |
|
| * | | Check length before accessing indices, add awaitTransactionSuccess where need... | Amir Bandeali | 2018-05-31 | 1 | -13/+27 |
| * | | Add back before/after snapshots for each test | Amir Bandeali | 2018-05-31 | 16 | -0/+97 |
| * | | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 14 | -90/+6 |
| * | | Update Whitelist | Amir Bandeali | 2018-05-31 | 1 | -0/+1 |
| * | | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 3 | -32/+28 |
| * | | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 2 | -4/+7 |
| * | | Update Whitelist contract with comments, also require maker to be whitelisted | Amir Bandeali | 2018-05-31 | 1 | -4/+29 |
| * | | Add example whitelist contract and minimum tests | Amir Bandeali | 2018-05-31 | 1 | -2/+89 |
| * | | Add Validator signature type | Amir Bandeali | 2018-05-31 | 1 | -1/+1 |
| * | | Add deepCopyBytes method to LibBytes | Amir Bandeali | 2018-05-31 | 1 | -0/+34 |
| |/ |
|
* | | Introduce OrderWithoutExchangeAddress type since this is what get's sent to t... | Fabio Berger | 2018-05-31 | 1 | -6/+6 |
* | | Initial refactor of order-utils. Move many utils from contracts into this pac... | Fabio Berger | 2018-05-30 | 9 | -65/+38 |
|/ |
|
* | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 3 | -102/+85 |
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 5 | -319/+404 |
|\ |
|
| * | Use web3-wrapper instead of 0x.js, update logDecoder | Amir Bandeali | 2018-05-25 | 1 | -5/+4 |
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 3 | -5/+11 |
| * | Move readFirst4 to LibBytes | Amir Bandeali | 2018-05-25 | 2 | -19/+11 |
| * | Add old MultiSig to previous contracts, cleanup file structure | Amir Bandeali | 2018-05-25 | 2 | -7/+7 |
| * | Fix build | Amir Bandeali | 2018-05-25 | 1 | -2/+6 |
| * | Address feedback, rename contract to AssetProxyOwner | Amir Bandeali | 2018-05-25 | 1 | -17/+17 |
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 3 | -228/+312 |
* | | Merge branch 'v2-prototype' into feature/contracts/eip712-order-hash | Fabio Berger | 2018-05-25 | 6 | -10/+9 |
|\ \ |
|
| * | | Fix linter issues | Leonid Logvinov | 2018-05-25 | 2 | -2/+2 |
| * | | Migrate migrations to v2 | Leonid Logvinov | 2018-05-25 | 6 | -10/+9 |
| |/ |
|
* | | Use domain separator for exchange address | Jacob Evans | 2018-05-25 | 1 | -2/+8 |
* | | publicGetOrderSchemaHash -> getOrderSchemaHash | Jacob Evans | 2018-05-25 | 1 | -1/+1 |
* | | Update order hash to match latest eip712 | Jacob Evans | 2018-05-25 | 1 | -0/+6 |
|/ |
|
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 11 | -60/+84 |
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 4 | -379/+2 |
* | Merge branch 'v2-prototype' into feature/truffle-sol-cov | Leonid Logvinov | 2018-05-24 | 16 | -267/+251 |
|\ |
|
| * | Fix Tslint error caused by "PromiseLike" value | Fabio Berger | 2018-05-23 | 1 | -0/+6 |
| * | 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 | 5 | -11/+5 |
| * | Fix imports | Fabio Berger | 2018-05-23 | 1 | -1/+0 |
| * | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 16 | -189/+447 |
| |\ |
|
| * | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 16 | -240/+208 |
* | | | 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 | 1 | -3/+3 |
* | | | 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 | 2 | -1/+24 |
| |/
|/| |
|
* | | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto... | Fabio Berger | 2018-05-23 | 15 | -175/+418 |
|\ \ |
|
| * \ | Merge pull request #601 from 0xProject/contracts-test-fixes | Alex Browne | 2018-05-23 | 15 | -175/+418 |
| |\ \ |
|
| | * | | 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 | 9 | -155/+293 |
| | * | | 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 | 1 | -1/+1 |
|\ \ \
| |_|/
|/| | |
|
| * | | Add missing return types | Remco Bloemen | 2018-05-22 | 1 | -1/+1 |
| |/ |
|
* | | merge development | Fabio Berger | 2018-05-23 | 2 | -4/+4 |
|\ \
| |/
|/| |
|
| * | Merge pull request #594 from 0xProject/improvement/addCustomTslintRules | Fabio Berger | 2018-05-23 | 3 | -8/+8 |
| |\ |
|
| | * | Fix TSLint rules | Fabio Berger | 2018-05-16 | 3 | -8/+8 |
* | | | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 4 | -16/+1200 |
|\ \ \ |
|
| * | | | orderFilledAmount -> orderTakerAssetFilledAmount | Greg Hysen | 2018-05-19 | 1 | -12/+12 |
| * | | | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 3 | -11/+13 |
| * | | | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ... | Greg Hysen | 2018-05-19 | 2 | -138/+126 |
| * | | | Cleaned up interface for decoding proxy data. Added a general decoder, which ... | Greg Hysen | 2018-05-19 | 1 | -12/+10 |
| * | | | Style improvements to the match orders typescript test class | Greg Hysen | 2018-05-19 | 1 | -18/+14 |
| * | | | The OrderInfo struct is now returned by the getOrderInfo function | Greg Hysen | 2018-05-19 | 1 | -64/+41 |
| * | | | Throw if the left or right orders do not compute the correct fill results. I ... | Greg Hysen | 2018-05-19 | 1 | -10/+8 |
| * | | | Style changes to atomic order matching | Greg Hysen | 2018-05-19 | 2 | -2/+1 |
| * | | | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 4 | -17/+1243 |
* | | | | merge development | Fabio Berger | 2018-05-22 | 10 | -1/+10 |
|\ \ \ \
| |/ / /
|/| / /
| |/ / |
|
| * / | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 12 | -0/+12 |
| |/ |
|
| * | Add missing type definitions | Leonid Logvinov | 2018-05-14 | 1 | -1/+1 |
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 19 | -267/+250 |
|\| |
|
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 14 | -159/+285 |
| |\ |
|
| | * | Fix linter errors | Leonid Logvinov | 2018-05-11 | 12 | -12/+12 |
| | * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 13 | -50/+50 |
| | * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 12 | -49/+53 |
| | * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 14 | -150/+271 |
| * | | Fix tslint errors | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| * | | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-10 | 2 | -4/+3 |
| |\| |
|
| | * | Implement new artifacts format | Leonid Logvinov | 2018-05-07 | 2 | -4/+3 |
| * | | Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a unifyin... | Fabio Berger | 2018-05-10 | 4 | -7/+8 |
| |/ |
|
* | | Move Authorizable to AssetProxy dir, rename to MixinAuthorizable | Amir Bandeali | 2018-05-08 | 1 | -3/+3 |
* | | Make LibBytes methods internal, add TestLibBytes | Amir Bandeali | 2018-05-05 | 1 | -22/+30 |
* | | Add tests for batchTransferFrom | Amir Bandeali | 2018-05-02 | 1 | -151/+296 |
* | | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 2 | -0/+22 |
* | | Make all lib functions internal, add contracts for testing | Amir Bandeali | 2018-04-27 | 3 | -178/+248 |
* | | Add tests and comments | Amir Bandeali | 2018-04-27 | 1 | -15/+25 |
* | | Add tests | Amir Bandeali | 2018-04-27 | 1 | -4/+38 |
* | | Update tests and utils | Amir Bandeali | 2018-04-27 | 1 | -0/+161 |
* | | Fix prettier | Fabio Berger | 2018-04-25 | 1 | -3/+9 |
* | | Fix merge conflict issues | Fabio Berger | 2018-04-24 | 2 | -2/+0 |