| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #1047 from 0xProject/feature/re-add-no-unused-variables | Francesco Agosti | 2018-08-31 | 2 | -5/+2 |
|\ |
|
| * | run prettier | fragosti | 2018-08-31 | 1 | -3/+1 |
| * | Fix unused vars for react-shared and website | fragosti | 2018-08-31 | 2 | -2/+1 |
* | | Merge pull request #1046 from 0xProject/fix/contracts/roundingFeeTestsMatchOr... | Greg Hysen | 2018-08-31 | 1 | -0/+94 |
|\ \ |
|
| * | | Test cases for rounding fees in matchOrders | Greg Hysen | 2018-08-31 | 1 | -0/+94 |
* | | | Add test for fillOrder and dispatchTransferFrom where maker == taker | Amir Bandeali | 2018-08-31 | 2 | -1/+92 |
| |/
|/| |
|
* | | Fix geth tests | Amir Bandeali | 2018-08-30 | 1 | -7/+7 |
|/ |
|
* | Making rounding consistent in calculateFillResults | Amir Bandeali | 2018-08-29 | 1 | -7/+10 |
* | safeGetPartialAmount (#1035) | Amir Bandeali | 2018-08-29 | 2 | -87/+314 |
* | fix(contracts): Use correct error message for division by zero | Alex Browne | 2018-08-28 | 1 | -3/+1 |
* | Run all tests | Greg Hysen | 2018-08-25 | 1 | -1/+1 |
* | Give right maker better price when correct value is not integral | Greg Hysen | 2018-08-25 | 1 | -10/+14 |
* | Tests for matchOrders edge cases | Greg Hysen | 2018-08-25 | 1 | -13/+71 |
* | Renaming verify -> assert in order matching | Greg Hysen | 2018-08-25 | 1 | -18/+18 |
* | Added function signature comments | Greg Hysen | 2018-08-25 | 1 | -27/+27 |
* | Ran prettier and linter | Greg Hysen | 2018-08-25 | 1 | -41/+3 |
* | Updated all existing match order tests to use new format | Greg Hysen | 2018-08-25 | 1 | -122/+287 |
* | First balance test with intentional values | Greg Hysen | 2018-08-25 | 1 | -11/+24 |
* | Ironing out the new set of test cases for order matchubng | Greg Hysen | 2018-08-25 | 1 | -1/+1 |
* | All existing tests pass. | Greg Hysen | 2018-08-25 | 1 | -1/+104 |
* | Add tests for matchOrders | Amir Bandeali | 2018-08-25 | 2 | -122/+53 |
* | Add reentrancy tests for fillOrder and wrapper functions | Amir Bandeali | 2018-08-25 | 2 | -0/+221 |
* | Merge pull request #1003 from 0xProject/feature/contracts/roundup | Amir Bandeali | 2018-08-25 | 2 | -58/+172 |
|\ |
|
| * | Fix linting errors | Amir Bandeali | 2018-08-25 | 1 | -2/+2 |
| * | Append -Floor to getPartialAmount and isRoundingError | Remco Bloemen | 2018-08-25 | 2 | -13/+13 |
| * | Add tests | Remco Bloemen | 2018-08-25 | 2 | -22/+93 |
| * | Add DIVISION_BY_ZERO to getPartialAmount for consistency | Remco Bloemen | 2018-08-25 | 1 | -16/+15 |
| * | Remove .only | Remco Bloemen | 2018-08-25 | 1 | -1/+1 |
| * | Add tests for getPartialAmountCeil | Remco Bloemen | 2018-08-25 | 1 | -0/+40 |
| * | Update tests | Remco Bloemen | 2018-08-25 | 2 | -13/+17 |
* | | SignatureType.Trezor -> SignatureType.EthSign in Signature Validator tests | Greg Hysen | 2018-08-25 | 1 | -1/+1 |
* | | Test case for Trezor Model T signature | Greg Hysen | 2018-08-25 | 1 | -0/+18 |
* | | Fixed trezor personal message in client+contracts; added a test using message... | Greg Hysen | 2018-08-25 | 1 | -0/+18 |
* | | Remove Trezor SignatureType | Amir Bandeali | 2018-08-25 | 1 | -47/+0 |
* | | Remove SignatureType.Caller | Amir Bandeali | 2018-08-25 | 1 | -26/+0 |
* | | Rethrow Wallet and Validator errors | Amir Bandeali | 2018-08-25 | 2 | -18/+14 |
* | | Rename TestStaticCall => TestStaticCallReceiver | Amir Bandeali | 2018-08-25 | 2 | -10/+10 |
* | | Remove pragma experimental v0.5.0 and use staticcall is assembly | Amir Bandeali | 2018-08-25 | 2 | -11/+70 |
* | | Add pragma experimental v0.5.0 to SignatureValidator and add tests | Amir Bandeali | 2018-08-25 | 1 | -1/+52 |
|/ |
|
* | Fix many linter errors that showed up upon upgrading tsutil | Fabio Berger | 2018-08-23 | 1 | -1/+1 |
* | Merge development branch | Fabio Berger | 2018-08-22 | 4 | -3/+136 |
|\ |
|
| * | Fix linting errors | Amir Bandeali | 2018-08-17 | 2 | -2/+2 |
| * | Add tests for ERC20 token with no return values | Amir Bandeali | 2018-08-17 | 2 | -1/+134 |
* | | Merge development | Fabio Berger | 2018-08-17 | 1 | -0/+11 |
|\| |
|
| * | [Order-utils] Order is valid when maker amount is very small | Jacob Evans | 2018-08-15 | 1 | -0/+11 |
* | | Merge development | Fabio Berger | 2018-08-15 | 2 | -19/+28 |
|\| |
|
| * | Rename from SignerProviderType.EthSign to SignerType.Default | Jacob Evans | 2018-08-11 | 1 | -5/+5 |
| * | Introduce SignerProviderType | Jacob Evans | 2018-08-09 | 1 | -6/+6 |
| * | Add strictArgumentEncodingCheck to BaseContract and use it in contract templates | Alex Browne | 2018-08-09 | 1 | -3/+3 |
| * | Update TypeScript to version 2.9.2 | Alex Browne | 2018-08-09 | 1 | -4/+19 |
* | | Rename EIP712Utils to eip712Utils since objectLiterals shouldn't start with caps | Fabio Berger | 2018-08-04 | 1 | -2/+2 |
* | | Make signature_util into an object literal so related functions are rendered ... | Fabio Berger | 2018-08-03 | 1 | -5/+17 |
|/ |
|
* | Add combinatorial tests for internal Exchange functions (#807) | Alex Browne | 2018-07-27 | 3 | -116/+361 |
* | Add tests to verify ZRX_ASSET_DATA | Amir Bandeali | 2018-07-23 | 1 | -0/+16 |
* | Move example contracts into new examples dir | Amir Bandeali | 2018-07-23 | 1 | -8/+8 |
* | Removed receiverData and `onReceive` callback from ERC721 proxy. | Greg Hysen | 2018-07-18 | 1 | -24/+0 |
* | Fix prettier | Fabio Berger | 2018-07-18 | 1 | -3/+1 |
* | merge v2-prototype | Fabio Berger | 2018-07-18 | 6 | -97/+403 |
|\ |
|
| * | Add tests for getOrderInfo and getOrdersInfo | Amir Bandeali | 2018-07-18 | 2 | -5/+307 |
| * | Fix bugs having to do with block timestamps and order expirationTimes | Alex Browne | 2018-07-17 | 6 | -94/+98 |
* | | Rename assetProxyUtils to assetDataUtils | Fabio Berger | 2018-07-17 | 7 | -95/+95 |
|/ |
|
* | Make it possible to configure block polling interval in base contract wrapper | Leonid Logvinov | 2018-07-05 | 6 | -24/+24 |
* | Improve robustness of revert reason assertions | Alex Browne | 2018-07-03 | 6 | -47/+47 |
* | Remove unused variable | Fabio Berger | 2018-07-02 | 1 | -1/+0 |
* | Merge branch 'v2-prototype' into fix/five_decimal_scenario | Fabio Berger | 2018-07-02 | 8 | -257/+139 |
|\ |
|
| * | Fix build | Amir Bandeali | 2018-06-30 | 2 | -5/+5 |
| * | Update file structure | Amir Bandeali | 2018-06-30 | 7 | -92/+91 |
| * | Make registerAssetProxy append only | Amir Bandeali | 2018-06-30 | 5 | -141/+42 |
| * | Update expectRevertReasonOrAlwaysFailingTransactionAsync to check status codes | Alex Browne | 2018-06-30 | 1 | -21/+3 |
* | | Print out entire orderFill scenario | Fabio Berger | 2018-07-02 | 1 | -7/+1 |
|/ |
|
* | Reduce the userAddresses to the individual addresses actually used by tests, ... | Fabio Berger | 2018-06-28 | 5 | -13/+22 |
* | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 1 | -8/+33 |
|\ |
|
| * | Add more revert reasons to tests | Amir Bandeali | 2018-06-27 | 1 | -6/+31 |
| * | Make dispatchTransferFrom revert with reason from AssetProxy on failure | Amir Bandeali | 2018-06-27 | 1 | -2/+2 |
* | | Move combinatorial fillOrder tests into the `fill_ordere` test file | Fabio Berger | 2018-06-27 | 2 | -48/+21 |
* | | Merge branch 'refactor/check-revert-reasons' into feature/combinatorial-testing | Fabio Berger | 2018-06-27 | 6 | -45/+45 |
|\| |
|
| * | Temporarily switch revert reasons to `TransferFailed`. Should be `InvalidAmou... | Fabio Berger | 2018-06-27 | 1 | -2/+2 |
| * | Rename RevertReasons to RevertReason since singular enum names are more common | Fabio Berger | 2018-06-26 | 6 | -54/+54 |
| * | Merge branch 'v2-prototype' into refactor/check-revert-reasons | Fabio Berger | 2018-06-26 | 5 | -10/+7 |
| |\ |
|
* | \ | Merge branch 'v2-prototype' into feature/combinatorial-testing | Fabio Berger | 2018-06-26 | 5 | -10/+7 |
|\ \ \
| | |/
| |/| |
|
| * | | Fix tests | Amir Bandeali | 2018-06-26 | 3 | -3/+3 |
| * | | 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 | 6 | -18/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | Move RevertReasons to @0xproject/types package | Fabio Berger | 2018-06-25 | 6 | -18/+10 |
* | | | merge check-revert-reasons | Fabio Berger | 2018-06-25 | 6 | -67/+112 |
|\| | |
|
| * | | Fix tslint | Fabio Berger | 2018-06-23 | 4 | -4/+4 |
| * | | Fix prettier | Fabio Berger | 2018-06-23 | 3 | -10/+10 |
| * | | Rename ContractLibErrors to RevertReasons | Fabio Berger | 2018-06-23 | 6 | -54/+54 |
| * | | 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 | 1 | -4/+5 |
| * | | 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 | 3 | -19/+435 |
| |\| |
|
| * | | Check revert reason in dispatcher tests | Fabio Berger | 2018-06-22 | 2 | -5/+13 |
| * | | 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 | 3 | -19/+435 |
|\ \ \
| | |/
| |/| |
|
| * | | Use make-promises-safe as a preloader instead of manually importing | Alex Browne | 2018-06-22 | 2 | -2/+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 | 3 | -18/+134 |
|\| |
|
| * | 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 | 7 | -305/+356 |
| | |\ |
|
| | * | | 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 |
| * | | | 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 | 5 | -5/+20 |
* | | | 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 | 1 | -1/+1 |
* | | | 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 | -0/+48 |
|/ / |
|
* | | 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 |
* | | Pop id from assetData before dispatching to AssetProxies | Amir Bandeali | 2018-06-13 | 2 | -20/+87 |
* | | Removed setting makerAssetData/takerAssetData from tests where values are sam... | Greg Hysen | 2018-06-08 | 1 | -34/+0 |
* | | Fixed up after rebasing. Contracts build and tests pass | Greg Hysen | 2018-06-08 | 2 | -4/+4 |
* | | Converged on naming scheme for asset data: renamed all instances of assetMeta... | Greg Hysen | 2018-06-08 | 7 | -128/+128 |
* | | Add missing awaitTransactionSuccessAsync calls | Alex Browne | 2018-06-08 | 1 | -0/+6 |
* | | Fixed path | Fabio Berger | 2018-06-07 | 2 | -10/+10 |
* | | merge v2-prototype | Fabio Berger | 2018-06-07 | 7 | -151/+158 |
|\ \ |
|
| * \ | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ... | fragosti | 2018-06-07 | 5 | -104/+134 |
| |\ \ |
|
| | * | | 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 | 5 | -45/+45 |
| | * | | Fix linter errors | Alex Browne | 2018-06-07 | 1 | -6/+2 |
| | * | | Add additional gas to calls to fillOrderNoThrow | Alex Browne | 2018-06-07 | 2 | -146/+49 |
| | * | | Fix some more test cases, especially those that call increaseTime | Alex Browne | 2018-06-07 | 1 | -36/+47 |
| | * | | Update exchange/transactions tests for Geth error messages | Alex Browne | 2018-06-07 | 1 | -4/+4 |
| | * | | Add more transactions to Geth on init. Skip tests that are failing. | Alex Browne | 2018-06-07 | 3 | -9/+106 |
| | * | | Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTrans... | Alex Browne | 2018-06-07 | 5 | -90/+70 |
| | |/ |
|
| * / | Linter now passes | fragosti | 2018-06-06 | 7 | -37/+14 |
| |/ |
|
* / | move generated contract wrappers from `contract_wrappers/generated/` to `gene... | Fabio Berger | 2018-06-06 | 7 | -26/+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 | 4 | -71/+69 |
* | 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 | 2 | -2/+4 |
|\ |
|
| * | Introduce ethereum-types package | Leonid Logvinov | 2018-06-01 | 2 | -2/+4 |
| * | Fix build | Amir Bandeali | 2018-06-01 | 1 | -1/+1 |
* | | 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 | 4 | -13/+141 |
|\| |
|
| * | 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 | 7 | -0/+42 |
| * | Fix formatting and tests | Amir Bandeali | 2018-05-31 | 7 | -48/+6 |
| * | Use last byte of signature as signature type | Amir Bandeali | 2018-05-31 | 2 | -7/+6 |
| * | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 1 | -0/+4 |
| * | 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 |
* | | 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 | 7 | -61/+35 |
|/ |
|
* | Merge pull request #571 from 0xProject/feature/contracts/proxyOwner | Amir Bandeali | 2018-05-25 | 1 | -7/+2 |
|\ |
|
| * | Cleanup tests | Amir Bandeali | 2018-05-25 | 1 | -2/+2 |
| * | Update multisig tests and utils | Amir Bandeali | 2018-05-25 | 1 | -5/+0 |
* | | 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 | 5 | -28/+28 |
* | Move contract utils | Leonid Logvinov | 2018-05-24 | 1 | -1/+1 |
* | 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 ExchangeWrapper | Fabio Berger | 2018-05-23 | 4 | -10/+4 |
* | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 7 | -111/+241 |
|\ |
|
| * | Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-proto... | Fabio Berger | 2018-05-23 | 7 | -107/+237 |
| |\ |
|
| | * | 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 | 1 | -2/+6 |
| | * | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 4 | -99/+177 |
| | * | Add missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 6 | -0/+36 |
| * | | Fix tslint issues | Fabio Berger | 2018-05-23 | 1 | -4/+4 |
| |/ |
|
* / | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 7 | -160/+136 |
|/ |
|
* | Merge pull request #572 from 0xProject/feature/contracts/atomicMatching | Greg Hysen | 2018-05-22 | 3 | -16/+847 |
|\ |
|
| * | Rebased against v2-prototype | Greg Hysen | 2018-05-19 | 2 | -9/+11 |
| * | Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, ... | Greg Hysen | 2018-05-19 | 1 | -20/+1 |
| * | 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 | 1 | -1/+1 |
| * | Atomic Order Matching - Tests | Greg Hysen | 2018-05-19 | 3 | -17/+890 |
* | | merge development | Fabio Berger | 2018-05-22 | 2 | -1/+2 |
|\ \
| |/
|/| |
|
| * | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 3 | -0/+3 |
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 6 | -61/+56 |
|\| |
|
| * | Fix linter errors | Leonid Logvinov | 2018-05-11 | 3 | -3/+3 |
| * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 3 | -21/+21 |
| * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 3 | -18/+22 |
| * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 3 | -46/+135 |
* | | Add hard coded proxyId into each AssetProxy | Amir Bandeali | 2018-05-01 | 1 | -0/+12 |
* | | 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 merge conflict issues | Fabio Berger | 2018-04-24 | 2 | -2/+0 |
* | | merge v2-prototype | Fabio Berger | 2018-04-24 | 3 | -158/+183 |
|\ \ |
|
| * | | Rename variables, create private validation methods in token wrappers | Amir Bandeali | 2018-04-24 | 2 | -148/+171 |
* | | | Fix tests | Amir Bandeali | 2018-04-24 | 4 | -95/+286 |
|/ / |
|
* | | Fix and cleanup tests | Amir Bandeali | 2018-04-24 | 3 | -563/+488 |
* | | Rename proxyUtils => assetProxyUtils | Amir Bandeali | 2018-04-23 | 3 | -37/+37 |
* | | Rename missed variables | Amir Bandeali | 2018-04-23 | 2 | -246/+246 |
* | | Add missing async suffix | Amir Bandeali | 2018-04-22 | 1 | -11/+11 |
* | | Rename token => asset | Amir Bandeali | 2018-04-22 | 3 | -442/+442 |
* | | Rename DummyToken => DummyERC20Token | Amir Bandeali | 2018-04-22 | 3 | -23/+23 |
* | | export proxyUtils instead of individual functions | Amir Bandeali | 2018-04-22 | 3 | -37/+37 |
* | | Remove unused constructor arguments | Amir Bandeali | 2018-04-22 | 3 | -6/+3 |
* | | Renamed addAssetProxy back to registerAssetProxy; this seemed to cause less c... | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
* | | Miscellaneous style changes to the contracts package; specifically tests | Greg Hysen | 2018-04-21 | 2 | -4/+8 |
* | | Ran prettier | Greg Hysen | 2018-04-21 | 2 | -20/+4 |
* | | renaming after tokenTransferProxy was removed | Greg Hysen | 2018-04-21 | 2 | -54/+54 |
* | | Removed ERC20 V1 Proxy + TokenTransferProxy | Greg Hysen | 2018-04-21 | 2 | -56/+5 |
* | | switched to constants in default order params. | Greg Hysen | 2018-04-21 | 2 | -4/+4 |
* | | Removed takerTokenAddress and makerTokenAddress from Order struct. | Greg Hysen | 2018-04-21 | 3 | -176/+159 |
* | | Removed unnecessary deployments in test | Greg Hysen | 2018-04-21 | 1 | -17/+1 |
* | | Moved ERC721 FillOrderNoThrow tests into wrapper | Greg Hysen | 2018-04-21 | 2 | -45/+60 |
* | | Style improvements to the Asset Proxy tests | Greg Hysen | 2018-04-21 | 1 | -95/+93 |
* | | Replaced instances of `accounts[0]` with `owner` in contracts test cases | Greg Hysen | 2018-04-21 | 3 | -14/+17 |
* | | Updated ERC20 v1 proxy names in tests | Greg Hysen | 2018-04-21 | 1 | -2/+2 |
* | | Ran prettier/linter on new contract tests | Greg Hysen | 2018-04-21 | 2 | -3/+0 |
* | | Added comments around deploying contracts to helper/wrapper tests | Greg Hysen | 2018-04-21 | 2 | -65/+34 |
* | | TS styles in core contract tests | Greg Hysen | 2018-04-21 | 1 | -91/+38 |
* | | Removed some unused ERC721 tokens | Greg Hysen | 2018-04-21 | 1 | -62/+13 |
* | | Minor style improvements to asset proxy utils | Greg Hysen | 2018-04-21 | 3 | -39/+39 |
* | | makerAssetProxyData/takerAssetProxyData -> makerAssetData/takerAssetData | Greg Hysen | 2018-04-21 | 3 | -28/+28 |
* | | nilAddress to ZeroEx.NULL_ADDRESS | Greg Hysen | 2018-04-21 | 3 | -10/+7 |
* | | Removed unnecessary assetProxyManagerAddress | Greg Hysen | 2018-04-21 | 3 | -15/+3 |
* | | setAssetProxy to addAssetProxy | Greg Hysen | 2018-04-21 | 3 | -7/+7 |
* | | Renamed TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 2 | -5/+7 |
* | | Renaming TransferProxy to Proxy | Greg Hysen | 2018-04-21 | 3 | -22/+22 |
* | | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 3 | -20/+620 |
* | | Add back require statements and tests (will move to another PR) | Amir Bandeali | 2018-04-21 | 1 | -0/+42 |
* | | Revert variable naming | Amir Bandeali | 2018-04-21 | 3 | -303/+313 |
* | | Update Solidity syntax and comments | Amir Bandeali | 2018-04-21 | 2 | -20/+15 |
* | | Add tests for marketBuyOrders | Amir Bandeali | 2018-04-21 | 1 | -2/+172 |