38 Commits

Author SHA1 Message Date
Fabio Berger
73429fc720 merge v2-prototype 2018-06-07 12:27:03 +02:00
fragosti
e0d5b9daf8 Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/improve-linting 2018-06-06 16:36:11 -07:00
Alex Browne
167a38e27d
Add Async suffix to relevant assertions 2018-06-06 12:41:14 -07:00
Alex Browne
2dfc468094
Update more tests to pass on Geth 2018-06-06 12:40:30 -07:00
Alex Browne
31c98fc0db
Update some tests after rebase 2018-06-06 12:39:43 -07:00
Fabio Berger
cb754ee125 move generated contract wrappers from contract_wrappers/generated/ to generated_contract_wrappers in package with no non-generated contract wrappers 2018-06-06 15:39:38 +02:00
fragosti
59cb2132f2 Linter now passes 2018-06-05 11:46:05 -07:00
Alex Browne
064608a8ef
Add awaitTransactionSuccess where needed 2018-05-30 11:10:30 -07:00
Leonid Logvinov
1d68692bb6
Remove contracts -> @0xproject/order-utils dependency 2018-05-25 16:09:17 -07:00
Alex Browne
b05a3b7aed
Check transaction receipt status codes where applicable 2018-05-23 15:09:17 -07:00
Fabio Berger
c8dad01137 Fix await calls 2018-05-22 13:19:29 -07:00
Fabio Berger
5a09063adb Refactor etherToken test to use contract-wrappers 2018-05-22 13:15:16 -07:00
Fabio Berger
09d80b1e50 Fix imports 2018-05-22 13:14:38 -07:00
Fabio Berger
2b793f372a Merge branch 'v2-prototype' into refactor/contracts/remove0xjsDep
* 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
2018-05-22 13:02:21 -07:00
Fabio Berger
a682b5d90e Remove 0x.js dep from contracts 2018-05-22 11:18:50 -07:00
Alex Browne
4ca8903a21
Add missing blockchainLifecycle calls to contracts tests 2018-05-21 16:52:49 -07:00
Fabio Berger
0fdf32cf6f merge development 2018-05-21 13:38:12 -07:00
Alex Browne
251218af8b
Use make-promises-safe to catch unhandled rejections in tests 2018-05-16 17:36:37 -07:00
Amir Bandeali
9e0471bfbb Merge branch 'development' into v2-prototype 2018-05-15 15:52:49 -04:00
Fabio Berger
d370296e82 Merge branch 'development' into breakUp0xjs
* 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
2018-05-11 12:32:57 +02:00
Leonid Logvinov
e972ed8456
Fix linter errors 2018-05-10 18:12:34 +02:00
Fabio Berger
83dd333eba Fix tslint errors 2018-05-10 17:55:27 +02:00
Leonid Logvinov
f854f3ee2b
Remove unused deployer docs configs 2018-05-10 17:47:38 +02:00
Leonid Logvinov
75d24dea0e
Fix linter issues 2018-05-10 17:47:38 +02:00
Leonid Logvinov
3d58b38e4e
Remove deployer from metacoin and contract tests 2018-05-10 17:46:57 +02:00
Fabio Berger
209266dbed Split 0x.js into contract-wrappers, order-watcher but keep 0x.js as a unifying library with the same interface 2018-05-09 20:36:28 +02:00
Amir Bandeali
7201a74aea Move utils dir into src 2018-04-20 13:56:16 -07:00
Leonid Logvinov
249bf0163d
Move our contract templates to accept Provider instead of Web3Wrapper 2018-04-04 11:56:32 +03:00
Leonid Logvinov
13299158d1
Add sol-cover implementation 2018-03-12 03:37:27 +01:00
Leonid Logvinov
6205209fbb
Make an RPC constructor param implicit 2018-01-30 16:01:37 +01:00
Leonid Logvinov
9d62e5fb6f
Use an enum for contract name 2018-01-30 16:01:37 +01:00
Leonid Logvinov
6f13d107c4
Remove promisified web3 functions from tests 2018-01-30 16:01:37 +01:00
Leonid Logvinov
387363283c
Remove truffle from tests 2018-01-30 16:01:36 +01:00
Leonid Logvinov
709026bf1a
Refactor contracts tests to not use injected web3 instance 2018-01-30 16:01:36 +01:00
Leonid Logvinov
20c88a46d9
Remove truffle from UnlimitedAllowanceTokenV2 tests 2018-01-30 16:01:36 +01:00
Leonid Logvinov
eb881b9729
Remove truffle from MultiSigWalletWithTimeLockExceptRemoveAuthAddr tests 2018-01-30 16:01:36 +01:00
Leonid Logvinov
091ba473ff
Remove truffle from Ether Token tests 2018-01-30 16:01:36 +01:00
Leonid Logvinov
6463cda204
Remove truffle from tokenTransferProxy tests 2018-01-30 16:01:35 +01:00