| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
|/ |
|
* | 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 |
* | | Add marketBuyOrders, rename variables, and fx old tests | Amir Bandeali | 2018-04-21 | 3 | -419/+355 |
* | | Fix build errors | Amir Bandeali | 2018-04-21 | 1 | -13/+21 |
* | | Separate filled/cancelled errors | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
* | | Remove partial cancels | Amir Bandeali | 2018-04-21 | 2 | -69/+4 |
* | | updated test name to reflect smart contracts | Greg Hysen | 2018-04-21 | 1 | -1/+1 |
* | | Change from cancelOrdersBefore to cancelOrdersUpTo. The effect is that orders... | Greg Hysen | 2018-04-21 | 1 | -23/+27 |
* | | Renamed all instances of timestamp to salt. Clarified test case wording. | Greg Hysen | 2018-04-21 | 1 | -15/+15 |
* | | Fixed spacing | Greg Hysen | 2018-04-21 | 1 | -51/+51 |
* | | Implementation and tests in the protocol for cancelling all orders up to a sp... | Greg Hysen | 2018-04-21 | 1 | -0/+67 |
* | | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 3 | -6/+6 |
* | | Address feedback and lint | Amir Bandeali | 2018-04-21 | 2 | -6/+3 |
* | | Add tests for fillOrderNoThrow based functions | Amir Bandeali | 2018-04-21 | 2 | -130/+302 |
* | | Fix package.json | Amir Bandeali | 2018-04-21 | 1 | -1/+0 |
* | | Add fillOrderNoThrow to exchange wrapper and add test | Amir Bandeali | 2018-04-21 | 1 | -6/+48 |
* | | Modify tests to work with new utils | Amir Bandeali | 2018-04-21 | 3 | -371/+419 |
* | | Fix log decoding | Amir Bandeali | 2018-04-21 | 1 | -13/+13 |
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -13/+14 |
* | | Fix compile errors | Amir Bandeali | 2018-04-21 | 1 | -4/+4 |
* | | Move log decoding logic to exchange wrapper | Amir Bandeali | 2018-04-21 | 1 | -10/+9 |
* | | Add logDecoder, remove outdated tests | Amir Bandeali | 2018-04-21 | 1 | -124/+124 |
* | | Move utils dir into src | Amir Bandeali | 2018-04-21 | 3 | -21/+16 |
* | | Merge development | Amir Bandeali | 2018-04-21 | 1 | -10/+7 |
* | | Run prettier | Amir Bandeali | 2018-04-21 | 1 | -11/+3 |
* | | Get tests to build | Amir Bandeali | 2018-04-21 | 2 | -173/+150 |
|/ |
|
* | Fix tests | Leonid Logvinov | 2018-04-05 | 1 | -1/+0 |
* | Move our contract templates to accept Provider instead of Web3Wrapper | Leonid Logvinov | 2018-04-04 | 3 | -22/+19 |
* | Add sol-cover implementation | Leonid Logvinov | 2018-03-12 | 3 | -9/+6 |
* | Remove only | Leonid Logvinov | 2018-02-28 | 1 | -1/+1 |
* | Fix a typo | Leonid Logvinov | 2018-02-28 | 1 | -1/+1 |
* | Improve an error message when an inorrect number of constructor params is passed | Leonid Logvinov | 2018-02-28 | 3 | -10/+10 |
* | Change backend for contracts contracts | Leonid Logvinov | 2018-02-28 | 1 | -4/+4 |
* | Fix namings | Leonid Logvinov | 2018-02-28 | 1 | -2/+2 |
* | Use the same templates as 0x.js | Leonid Logvinov | 2018-02-28 | 3 | -14/+26 |
* | Fix build by using local events types | Leonid Logvinov | 2018-02-28 | 3 | -12/+19 |
* | Fix namings | Leonid Logvinov | 2018-02-09 | 1 | -84/+90 |
* | Use Order and SignedOrder type from 0x.js | Leonid Logvinov | 2018-02-07 | 3 | -241/+233 |
* | Introduce SignedOrder class and remove type assertions | Leonid Logvinov | 2018-02-07 | 3 | -220/+223 |
* | Make orderHashHex a getter instead of a property | Leonid Logvinov | 2018-02-07 | 2 | -26/+37 |
* | Change tests | Leonid Logvinov | 2018-02-07 | 3 | -58/+89 |
* | Update contract versions, fix tests | Amir Bandeali | 2018-02-03 | 1 | -1/+1 |
* | Remove accounts magic from tests | Leonid Logvinov | 2018-01-30 | 3 | -8/+4 |
* | Make an RPC constructor param implicit | Leonid Logvinov | 2018-01-30 | 3 | -3/+3 |
* | Use an enum for contract name | Leonid Logvinov | 2018-01-30 | 3 | -20/+21 |
* | Normalize the dependencies | Leonid Logvinov | 2018-01-30 | 1 | -35/+24 |
* | Remove truffle from tests | Leonid Logvinov | 2018-01-30 | 3 | -99/+113 |
* | Refactor contracts tests to not use injected web3 instance | Leonid Logvinov | 2018-01-30 | 3 | -20/+9 |
* | Remove truffle from Exchange tests | Leonid Logvinov | 2018-01-30 | 3 | -20/+65 |
* | Remove truffle from tokenTransferProxy tests | Leonid Logvinov | 2018-01-30 | 3 | -0/+1367 |