Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge v2-prototype | Fabio Berger | 2018-06-07 | 1 | -7/+6 |
|\ | |||||
| * | Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into ↵ | fragosti | 2018-06-07 | 1 | -5/+4 |
| |\ | | | | | | | | | | feature/improve-linting | ||||
| | * | Add Async suffix to relevant assertions | Alex Browne | 2018-06-07 | 1 | -3/+3 |
| | | | |||||
| | * | Update more tests to pass on Geth | Alex Browne | 2018-06-07 | 1 | -9/+6 |
| | | | |||||
| | * | Update some tests after rebase | Alex Browne | 2018-06-07 | 1 | -2/+4 |
| | | | |||||
| * | | Linter now passes | fragosti | 2018-06-06 | 1 | -2/+2 |
| |/ | |||||
* / | move generated contract wrappers from `contract_wrappers/generated/` to ↵ | Fabio Berger | 2018-06-06 | 1 | -1/+1 |
|/ | | | | `generated_contract_wrappers` in package with no non-generated contract wrappers | ||||
* | Add awaitTransactionSuccess where needed | Alex Browne | 2018-05-31 | 1 | -1/+4 |
| | |||||
* | Remove contracts -> @0xproject/order-utils dependency | Leonid Logvinov | 2018-05-26 | 1 | -31/+22 |
| | |||||
* | Check transaction receipt status codes where applicable | Alex Browne | 2018-05-24 | 1 | -3/+12 |
| | |||||
* | 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 imports | Fabio Berger | 2018-05-23 | 1 | -1/+0 |
| | |||||
* | Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep | Fabio Berger | 2018-05-23 | 1 | -3/+10 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 missing blockchainLifecycle calls to contracts tests | Alex Browne | 2018-05-22 | 1 | -0/+7 |
| | | |||||
* | | Remove 0x.js dep from contracts | Fabio Berger | 2018-05-23 | 1 | -3/+4 |
|/ | |||||
* | merge development | Fabio Berger | 2018-05-22 | 1 | -0/+1 |
|\ | |||||
| * | Use make-promises-safe to catch unhandled rejections in tests | Alex Browne | 2018-05-17 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'development' into v2-prototype | Amir Bandeali | 2018-05-16 | 1 | -9/+8 |
|\| | |||||
| * | Merge branch 'development' into breakUp0xjs | Fabio Berger | 2018-05-11 | 1 | -3/+5 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * development: Fix ganache subprovider config Fix a bug in compiler config precedence Fix linter errors Fix templates Remove unused deployer docs configs Add a legacy endpoint for the deployer Add a check for compiler output Add a comment Put ARTIFACTS_VERSION in a config Improve a comment Remove _applyDefaultsToDeployTxDataAsync Add a HACK comment Fix linter issues Rename deployer to sol-compiler Remove deployer Remove deployer from 0x.js and migrations Configure migrations with a compiler.json Remove deployer from metacoin and contract tests Update wallet footer and add remove token functionality # Conflicts: # .gitignore # packages/0x.js/package.json # packages/0x.js/src/0x.ts # packages/contracts/package.json # packages/contracts/test/multi_sig_with_time_lock.ts # packages/contracts/test/multi_sig_with_time_lock_except_remove_auth_addr.ts # packages/contracts/util/artifacts.ts # packages/deployer/test/deployer_test.ts # packages/migrations/package.json | ||||
| | * | Fix linter errors | Leonid Logvinov | 2018-05-11 | 1 | -1/+1 |
| | | | |||||
| | * | Remove unused deployer docs configs | Leonid Logvinov | 2018-05-10 | 1 | -2/+2 |
| | | | |||||
| | * | Fix linter issues | Leonid Logvinov | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
| | * | Remove deployer from metacoin and contract tests | Leonid Logvinov | 2018-05-10 | 1 | -3/+5 |
| | | | |||||
| * | | Fix tslint errors | Fabio Berger | 2018-05-10 | 1 | -1/+1 |
| | | | |||||
| * | | Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a ↵ | Fabio Berger | 2018-05-10 | 1 | -3/+3 |
| |/ | | | | | | | unifying library with the same interface | ||||
* / | Move utils dir into src | Amir Bandeali | 2018-04-21 | 1 | -2/+2 |
|/ | |||||
* | Move our contract templates to accept Provider instead of Web3Wrapper | Leonid Logvinov | 2018-04-04 | 1 | -4/+4 |
| | |||||
* | Add sol-cover implementation | Leonid Logvinov | 2018-03-12 | 1 | -3/+2 |
| | |||||
* | Make an RPC constructor param implicit | Leonid Logvinov | 2018-01-30 | 1 | -1/+1 |
| | |||||
* | Use an enum for contract name | Leonid Logvinov | 2018-01-30 | 1 | -1/+2 |
| | |||||
* | Remove promisified web3 functions from tests | Leonid Logvinov | 2018-01-30 | 1 | -14/+8 |
| | |||||
* | Remove truffle from tests | Leonid Logvinov | 2018-01-30 | 1 | -6/+5 |
| | |||||
* | Refactor contracts tests to not use injected web3 instance | Leonid Logvinov | 2018-01-30 | 1 | -6/+3 |
| | |||||
* | Remove truffle from UnlimitedAllowanceTokenV2 tests | Leonid Logvinov | 2018-01-30 | 1 | -2/+1 |
| | |||||
* | Remove truffle from MultiSigWalletWithTimeLockExceptRemoveAuthAddr tests | Leonid Logvinov | 2018-01-30 | 1 | -1/+1 |
| | |||||
* | Remove truffle from Ether Token tests | Leonid Logvinov | 2018-01-30 | 1 | -12/+24 |
| | |||||
* | Remove truffle from tokenTransferProxy tests | Leonid Logvinov | 2018-01-30 | 1 | -0/+124 |