Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | - Refactor assetWrapper to contain more of the normalizing logic instead of ↵ | Fabio Berger | 2018-06-15 | 1 | -0/+2 |
| | | | | | | | | erc20Wrapper and erc721Wrapper - Add burn method to DummyERC721Token - Add additional methods to assetWrapper to set balance/allowances on ERC20 and ERC721 tokens - Use approve instead of approveAll for ERC721 tokens | ||||
* | Add tests for deepCopyBytes and missing write methods from LibBytes | Amir Bandeali | 2018-06-13 | 1 | -0/+1 |
| | |||||
* | Speedup awaitTransactionMinedAsync and reduce polling interval in contracts ↵ | Alex Browne | 2018-06-12 | 1 | -1/+4 |
| | | | | tests | ||||
* | Updated LibBytes error messages | Greg Hysen | 2018-06-08 | 1 | -5/+5 |
| | |||||
* | Small fixes and cleanup | Alex Browne | 2018-06-07 | 1 | -2/+0 |
| | |||||
* | Throw in web3-wrapper when rawCallResult is '0x' | Alex Browne | 2018-06-07 | 1 | -0/+1 |
| | |||||
* | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 1 | -0/+2 |
| | |||||
* | Get LibBytes tests working on both Ganache and Geth | Alex Browne | 2018-06-07 | 1 | -0/+5 |
| | |||||
* | Update code after rebase | Alex Browne | 2018-06-07 | 1 | -0/+1 |
| | |||||
* | Remove TxOrigin signature type, modify whitelist to use Validator signature type | Amir Bandeali | 2018-05-31 | 1 | -0/+1 |
| | |||||
* | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 1 | -0/+1 |
| | |||||
* | Fix imports | Fabio Berger | 2018-05-23 | 1 | -1/+1 |
| | |||||
* | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 1 | -0/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * v2-prototype: Fix tslint issues Add `are` to boolean naming conventions Fix tslint Fix the tsutils version, fixing ts typings issue Rename some variables in multi_sig_with_time_lock.ts Remove extra awaitTransactionMinedAsync calls Update artifacts Update yarn.lock Fix warnings in Metacoin Upgrade UglifyJS to include ES6 support Add CancelOrder and MatchOrder types Add missing return types Ignore classnames linter rule Apply changes to test/exchange/match_orders.ts Fix some unhandled promise rejections Add awaitTransactionMinedAsync after every sent transaction Add missing blockchainLifecycle calls to contracts tests # Conflicts: # packages/contracts/src/utils/exchange_wrapper.ts # packages/contracts/test/asset_proxy/proxies.ts # packages/contracts/test/exchange/dispatcher.ts # packages/contracts/test/multi_sig_with_time_lock.ts | ||||
| * | Add awaitTransactionMinedAsync after every sent transaction | Alex Browne | 2018-05-22 | 1 | -0/+1 |
| | | |||||
* | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 1 | -7/+8 |
|/ | |||||
* | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 1 | -6/+4 |
| | |||||
* | Define numbers of dummy tokens to deploy in constants | Amir Bandeali | 2018-04-24 | 1 | -0/+2 |
| | |||||
* | Add ERC20Wrapper | Amir Bandeali | 2018-04-24 | 1 | -2/+13 |
| | |||||
* | Asset Proxy Dispatcher | Greg Hysen | 2018-04-21 | 1 | -0/+1 |
| | |||||
* | Add private keys for testrpc mnemonic | Amir Bandeali | 2018-04-21 | 1 | -20/+14 |
| | |||||
* | Fix package.json | Amir Bandeali | 2018-04-21 | 1 | -5/+5 |
| | |||||
* | Add script for starting testrpc with preconfigured private keys | Amir Bandeali | 2018-04-21 | 1 | -0/+22 |
| | |||||
* | Move utils dir into src | Amir Bandeali | 2018-04-21 | 1 | -0/+14 |