Fabio Berger
6058a74da5
Update naming in orderStateUtils to use asset over token, also removed cancelledAmount since in V2 it's binary.
2018-06-07 18:02:48 +02:00
Fabio Berger
bd3b652cfc
Fixed path
2018-06-07 13:15:13 +02:00
Fabio Berger
73429fc720
merge v2-prototype
2018-06-07 12:27:03 +02:00
Fabio Berger
10478a6b2f
Merge branch 'v2-prototype' into refactor/move-spawn-switch-to-utils
...
* v2-prototype: (66 commits)
Run prettier
Remove unused variable
Fix linting issues
Change shouldRenderHeader prop to shouldHideHeader
Get build and tests to pass
typo
Apply prettier
Update contracts tests after rebase
Apply various fixes based on PR feedback
Document debug_increaseTime method and fix typo in devnet README
Use an enum for ProviderType in contracts/src/utils/web3_wrapper
Update contracts package README
Update relevant changelogs
Remove global gas estimate buffer
Add Async suffix to relevant assertions
Fix linter errors
Update package.json and yarn.lock
Update more things to work with both Geth and Ganache
Small fixes and cleanup
Add additional gas to calls to fillOrderNoThrow
...
# Conflicts:
# packages/order-watcher/src/order_watcher/order_watcher.ts
# packages/react-docs/src/components/type.tsx
# packages/website/ts/components/ui/lifecycle_raised_button.tsx
# packages/website/ts/components/wallet/wallet.tsx
2018-06-07 12:21:44 +02:00
Fabio Berger
e0bc01eea1
Merge pull request #673 from mohoff/patch-1
...
typo
2018-06-07 08:54:05 +01:00
fragosti
2af6d3f6bc
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/website/onboarding-flow-allowances
2018-06-06 18:07:22 -07:00
fragosti
cbe5438a31
Render TokenAllowance
2018-06-06 18:06:03 -07:00
Francesco Agosti
67c4ad128c
Merge pull request #662 from 0xProject/feature/improve-linting
...
Tried enabling no-unused-variable...
2018-06-06 17:21:09 -07:00
fragosti
870eca0d9f
Run prettier
2018-06-06 16:59:28 -07:00
Alex Browne
d299458084
Use source-map-support package to include correct line numbers in mocha
2018-06-06 16:54:20 -07:00
fragosti
e0cf68f1d5
Remove unused variable
2018-06-06 16:45:26 -07:00
fragosti
64906a1ba5
Merge branch 'v2-prototype' of https://github.com/0xProject/0x-monorepo into feature/improve-linting
2018-06-06 16:43:37 -07:00
fragosti
e75721016e
Fix linting issues
2018-06-06 16:43:05 -07: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
Brandon Millman
5989844f1c
Merge pull request #672 from 0xProject/feature/website/account-management-polish
...
Account management polish
2018-06-06 16:12:47 -07:00
Brandon Millman
14e3f413a2
Change shouldRenderHeader prop to shouldHideHeader
2018-06-06 16:11:23 -07:00
fragosti
a97d77064a
Get build and tests to pass
2018-06-06 15:26:40 -07:00
mohoff
3342dd4001
typo
2018-06-06 23:21:53 +02:00
Alex Browne
785b9811f3
Merge pull request #622 from 0xProject/geth-devnet-rebase-on-v2
...
Run contract tests against private Geth network
2018-06-06 13:43:29 -07:00
Alex Browne
643c77ded0
Apply prettier
2018-06-06 13:28:32 -07:00
Alex Browne
76f01511a3
Update contracts tests after rebase
2018-06-06 13:10:59 -07:00
Alex Browne
dd8727d3ae
Apply various fixes based on PR feedback
2018-06-06 12:41:15 -07:00
Alex Browne
b933946f33
Document debug_increaseTime method and fix typo in devnet README
2018-06-06 12:41:15 -07:00
Alex Browne
5d2f9d7a33
Use an enum for ProviderType in contracts/src/utils/web3_wrapper
2018-06-06 12:41:15 -07:00
Alex Browne
3baf14b793
Update contracts package README
2018-06-06 12:41:15 -07:00
Alex Browne
c57e4ba508
Update relevant changelogs
2018-06-06 12:41:14 -07:00
Alex Browne
98656289ea
Remove global gas estimate buffer
2018-06-06 12:41:14 -07:00
Alex Browne
167a38e27d
Add Async suffix to relevant assertions
2018-06-06 12:41:14 -07:00
Alex Browne
ba6806df5d
Fix linter errors
2018-06-06 12:41:14 -07:00
Alex Browne
fe12101278
Update package.json and yarn.lock
2018-06-06 12:41:14 -07:00
Alex Browne
d6d7f4e875
Update more things to work with both Geth and Ganache
2018-06-06 12:40:31 -07:00
Alex Browne
63caddea62
Small fixes and cleanup
2018-06-06 12:40:31 -07:00
Alex Browne
36b01fbdcf
Add additional gas to calls to fillOrderNoThrow
2018-06-06 12:40:31 -07:00
Alex Browne
45a3d8b75a
Remove extra logs and other small fixes
2018-06-06 12:40:31 -07:00
Alex Browne
bca62c813d
Throw in web3-wrapper when rawCallResult is '0x'
2018-06-06 12:40:30 -07:00
Alex Browne
ae1cf74dcd
Remove outdated todo
2018-06-06 12:40:30 -07:00
Alex Browne
577a8dd005
Fix some more test cases, especially those that call increaseTime
2018-06-06 12:40:30 -07:00
Alex Browne
5900899c01
Add support for TEST_PROVIDER env var
2018-06-06 12:40:30 -07:00
Alex Browne
2dfc468094
Update more tests to pass on Geth
2018-06-06 12:40:30 -07:00
Alex Browne
98ffe9931d
Get LibBytes tests working on both Ganache and Geth
2018-06-06 12:40:30 -07:00
Alex Browne
2004c0d739
Add ability to quickly switch between Geth and Ganache by changing a const
2018-06-06 12:39:44 -07:00
Alex Browne
cd7cb025ad
Update exchange/transactions tests for Geth error messages
2018-06-06 12:39:43 -07:00
Alex Browne
96da267778
Fix ethers.js version override (the package is just called 'ethers')
2018-06-06 12:39:43 -07:00
Alex Browne
5816e410e9
Use our fork of ethers.js
2018-06-06 12:39:43 -07:00
Alex Browne
31c98fc0db
Update some tests after rebase
2018-06-06 12:39:43 -07:00
Alex Browne
00bf957b53
Add more transactions to Geth on init. Skip tests that are failing.
2018-06-06 12:39:43 -07:00
Alex Browne
5b999c2f7d
Increase gas limit to account for bigger ExchangeContract
2018-06-06 12:39:42 -07:00
Alex Browne
1cc9d9c071
Replace constant.REVERT test assertions with expectRevertOrAlwaysFailingTransaction
2018-06-06 12:39:42 -07:00
Alex Browne
72fb8460e9
Update code after rebase
2018-06-06 12:39:42 -07:00
Alex Browne
577156fe5f
Use Geth for contract tests
2018-06-06 12:39:39 -07:00
