32 Commits

Author SHA1 Message Date
Fabio Berger
73429fc720 merge v2-prototype 2018-06-07 12:27:03 +02: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
Leonid Logvinov
1d68692bb6
Remove contracts -> @0xproject/order-utils dependency 2018-05-25 16:09:17 -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
Alex Browne
cde85243d6
Merge pull request #601 from 0xProject/contracts-test-fixes
Contracts test fixes
2018-05-22 11:48:41 -07:00
Fabio Berger
a682b5d90e Remove 0x.js dep from contracts 2018-05-22 11:18:50 -07:00
Fabio Berger
4a0c8d72b0 merge development 2018-05-22 09:25:02 -07:00
Fabio Berger
cc840a6911
Merge pull request #594 from 0xProject/improvement/addCustomTslintRules
Add more tslint rules
2018-05-22 18:04:50 +02: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
Fabio Berger
839db68571 Fix TSLint rules 2018-05-16 14:59:10 +02:00
Amir Bandeali
9e0471bfbb Merge branch 'development' into v2-prototype 2018-05-15 15:52:49 -04:00
Leonid Logvinov
e972ed8456
Fix linter errors 2018-05-10 18:12:34 +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
9dc4ec6fb5 Fix prettier 2018-04-25 18:07:22 +09:00
Amir Bandeali
27a44f0e77 Rename variables, create private validation methods in token wrappers 2018-04-23 23:23:01 -07: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
93b2736d65
Use the same templates as 0x.js 2018-02-27 12:05:46 -08:00
Leonid Logvinov
b61852b1f5 Special-case ZRXToken snake case conversion 2018-02-06 17:27:47 -08:00
Leonid Logvinov
a264c36a48 Change tests 2018-02-06 17:27:47 -08: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
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
d0fbea76d8
Remove truffle from ZRXToken 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