diff options
| author | Brandon Millman <brandon.millman@gmail.com> | 2018-05-24 05:16:32 +0800 |
|---|---|---|
| committer | Brandon Millman <brandon.millman@gmail.com> | 2018-05-24 05:16:32 +0800 |
| commit | 3fe94891d3569a4615f4aa32d47f0065b5957fe9 (patch) | |
| tree | 83d4e4ccf7748d2100aa935c457de0a893eaec9c /packages/website/ts/types.ts | |
| parent | d0abc60176dba3116cb3986d298ab5164c1fe49c (diff) | |
| parent | f6b81f588d98e09e7a5806902d94e2892d029481 (diff) | |
| download | dexon-sol-tools-3fe94891d3569a4615f4aa32d47f0065b5957fe9.tar dexon-sol-tools-3fe94891d3569a4615f4aa32d47f0065b5957fe9.tar.gz dexon-sol-tools-3fe94891d3569a4615f4aa32d47f0065b5957fe9.tar.bz2 dexon-sol-tools-3fe94891d3569a4615f4aa32d47f0065b5957fe9.tar.lz dexon-sol-tools-3fe94891d3569a4615f4aa32d47f0065b5957fe9.tar.xz dexon-sol-tools-3fe94891d3569a4615f4aa32d47f0065b5957fe9.tar.zst dexon-sol-tools-3fe94891d3569a4615f4aa32d47f0065b5957fe9.zip | |
Merge branch 'v2-prototype' into feature/website/wallet-flex-box
* v2-prototype: (95 commits)
Add missing dep to website
Upgrade solidity parser
Fix trace test
Fix linter issues
Move contract utils
Fix prettier
Fix NameResolver
Fix prettier
Remove 0x.js as a dependency from website
Enable 0x.js tests
Fix small bug in order-utils
Address feedback
Fix Tslint error caused by "PromiseLike" value
Fix Tslint error caused by "PromiseLike" value
Update dogfood url
fix contract-wrappers version
Parse compiler.json in SolCompilerArtifactsAdapter
Fix TokenTransferProxy artifact name since it's now suffixed with _v1
Update yarn.lock
Fix signature verification test
...
Diffstat (limited to 'packages/website/ts/types.ts')
| -rw-r--r-- | packages/website/ts/types.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/website/ts/types.ts b/packages/website/ts/types.ts index 33e4d6c30..294a58f64 100644 --- a/packages/website/ts/types.ts +++ b/packages/website/ts/types.ts @@ -1,4 +1,4 @@ -import { ECSignature } from '0x.js'; +import { ECSignature } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; |