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
4cfeb6b8ac
Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype
...
* 'v2-prototype' of github.com:0xProject/0x-monorepo:
Rename some variables in multi_sig_with_time_lock.ts
Remove extra awaitTransactionMinedAsync calls
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
2018-05-22 11:58:50 -07:00
Fabio Berger
9373451ca8
Fix tslint issues
2018-05-22 11:58:42 -07:00
Fabio Berger
15c199d5a2
Add are to boolean naming conventions
2018-05-22 11:58:35 -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
c579db1a7b
Merge branch 'v2-prototype' of github.com:0xProject/0x-monorepo into v2-prototype
...
* 'v2-prototype' of github.com:0xProject/0x-monorepo:
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
2018-05-22 11:42:58 -07:00
Fabio Berger
61fa34e2ce
Fix tslint
2018-05-22 11:42:52 -07:00
Fabio Berger
96febf6639
Merge pull request #605 from 0xProject/fix/multiple/build-errors
...
Fix build/lint errors and warnings
2018-05-22 11:40:27 -07:00
Fabio Berger
09e59cf677
Fix the tsutils version, fixing ts typings issue
2018-05-22 11:23:14 -07:00
Fabio Berger
9119ee14b6
Update artifact
2018-05-22 11:19:19 -07:00
Fabio Berger
2ac2ae3eee
Fix tsutils version
2018-05-22 11:19:09 -07:00
Fabio Berger
a682b5d90e
Remove 0x.js dep from contracts
2018-05-22 11:18:50 -07:00
Alex Browne
e26c0c58ae
Rename some variables in multi_sig_with_time_lock.ts
2018-05-22 11:02:29 -07:00
Alex Browne
187fa71526
Remove extra awaitTransactionMinedAsync calls
2018-05-22 10:58:34 -07:00
Leonid Logvinov
031f97e97c
Publish
...
- 0x.js@0.38 .0
- @0xproject/abi-gen@0.3.0
- @0xproject/assert@0.2.10
- @0xproject/base-contract@0.3.2
- @0xproject/connect@0.6.13
- @0xproject/contract-wrappers@0.0.2
- contracts@2.1.29
- @0xproject/dev-utils@0.4.2
- @0xproject/fill-scenarios@0.0.2
- @0xproject/json-schemas@0.7.24
- @0xproject/metacoin@0.0.7
- @0xproject/migrations@0.0.6
- @0xproject/monorepo-scripts@0.1.20
- @0xproject/order-utils@0.0.5
- @0xproject/order-watcher@0.0.2
- @0xproject/react-docs-example@0.0.12
- @0xproject/react-docs@0.0.12
- @0xproject/react-shared@0.1.7
- @0xproject/sol-compiler@0.5.0
- @0xproject/sol-cov@0.0.11
- @0xproject/sol-resolver@0.0.5
- @0xproject/sra-report@0.1.0
- @0xproject/subproviders@0.10 .2
- @0xproject/testnet-faucets@1.0.30
- @0xproject/tslint-config@0.4.18
- @0xproject/types@0.7.0
- @0xproject/typescript-typings@0.3.2
- @0xproject/utils@0.6.2
- @0xproject/web3-wrapper@0.6.4
- @0xproject/website@0.0.33
2018-05-22 10:26:47 -07:00
Leonid Logvinov
b9e1c3c34f
Updated CHANGELOGS
2018-05-22 10:26:39 -07:00
Leonid Logvinov
1a35107a1d
Updated CHANGELOGS
2018-05-22 10:16:53 -07:00
Leonid Logvinov
d3e086c850
Change publish command name
2018-05-22 10:16:53 -07:00
Fabio Berger
4a0c8d72b0
merge development
2018-05-22 09:25:02 -07:00
Fabio Berger
ab9cfd293b
remove generated contract_wrappers during clean
2018-05-22 09:21:20 -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
Remco Bloemen
5456187dd0
Update artifacts
2018-05-22 17:13:04 +02:00
Remco Bloemen
73c95c328d
Update yarn.lock
2018-05-22 17:08:47 +02:00
Remco Bloemen
4a971be168
Fix warnings in Metacoin
2018-05-22 15:19:40 +02:00
Remco Bloemen
f657a3d811
Upgrade UglifyJS to include ES6 support
2018-05-22 15:19:40 +02:00
Remco Bloemen
b39f75a2e3
Add CancelOrder and MatchOrder types
2018-05-22 15:15:14 +02:00
Remco Bloemen
1dad14f8ea
Add missing return types
2018-05-22 13:50:07 +02:00
Remco Bloemen
5cc2e8de7b
Ignore classnames linter rule
2018-05-22 13:45:18 +02:00
Brandon Millman
d0abc60176
Add missing key
2018-05-21 21:41:03 -07:00
Brandon Millman
130e83d9b2
Use flexbox for wrapped ether item
2018-05-21 21:25:43 -07:00
Brandon Millman
ed8acdb11c
Re add wrapped ether item
2018-05-21 21:25:43 -07:00
Brandon Millman
26370da13d
Rewrite balance rows using flex box
2018-05-21 21:25:42 -07:00
Fabio Berger
c4a2f70017
Make lint run in parallel
2018-05-21 18:36:06 -07:00
Alex Browne
a5d315ee2a
Apply changes to test/exchange/match_orders.ts
2018-05-21 16:58:29 -07:00
Alex Browne
4fa57f55e6
Fix some unhandled promise rejections
2018-05-21 16:52:49 -07:00
Alex Browne
2c496a92ad
Add awaitTransactionMinedAsync after every sent transaction
2018-05-21 16:52:49 -07:00
Alex Browne
4ca8903a21
Add missing blockchainLifecycle calls to contracts tests
2018-05-21 16:52:49 -07:00
Greg Hysen
d460c0e8b9
Merge pull request #572 from 0xProject/feature/contracts/atomicMatching
...
Atomic Order Matching
2018-05-21 14:29:56 -07:00
Greg Hysen
11b6d290da
Removed debug line from chai_setup. Its failing linter and does not appear to be used (it was from an old PR I merged in).
2018-05-21 14:25:39 -07:00
Greg Hysen
d83902834f
Ran prettier
2018-05-21 13:54:11 -07:00
Fabio Berger
0fdf32cf6f
merge development
2018-05-21 13:38:12 -07:00
Greg Hysen
f4ebbfabf4
Added getNullFillResults
2018-05-18 17:07:00 -07:00
Greg Hysen
b5bcfc8fe7
orderFilledAmount -> orderTakerAssetFilledAmount
2018-05-18 17:07:00 -07:00
Greg Hysen
d13c08cc0d
Style improvements to order matching
2018-05-18 17:07:00 -07:00
Greg Hysen
89abd76570
Upgraded to Solidity 0.4.24
2018-05-18 17:07:00 -07:00
Greg Hysen
8c1ae35088
Rebased against v2-prototype
2018-05-18 17:05:36 -07:00
Greg Hysen
bb74789b42
Changed calculateFillResults to public visibility so that it can be used by the Forwarding Contract.
2018-05-18 17:01:06 -07:00
Greg Hysen
dbbd32d2ce
Moved feeTokenAddress to MatchOrderTester constructor. Since it is constant, we dont need to pass it in on each call.
2018-05-18 17:01:06 -07:00
Greg Hysen
80285a300d
Wording of calculateMatchedFillResults
2018-05-18 17:01:06 -07:00
Greg Hysen
2eb5819851
Cleaned up interface for decoding proxy data. Added a general decoder, which should be useful for the forwarding contract code.
2018-05-18 17:01:06 -07:00
