diff options
| author | Fabio Berger <me@fabioberger.com> | 2018-06-02 04:05:17 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2018-06-02 04:05:17 +0800 |
| commit | b7b45b69a66cfaf9c3737d1a8d95be21edccf527 (patch) | |
| tree | 4337613836a8062bd73fc8ee1e4db444961df172 /packages/migrations | |
| parent | df9cfe7840b99d72ed95058e47f2ffb6623d440e (diff) | |
| parent | 9ca41b9536908dddfa51854abd41b7926e69bd09 (diff) | |
| download | dexon-0x-contracts-b7b45b69a66cfaf9c3737d1a8d95be21edccf527.tar.gz dexon-0x-contracts-b7b45b69a66cfaf9c3737d1a8d95be21edccf527.tar.zst dexon-0x-contracts-b7b45b69a66cfaf9c3737d1a8d95be21edccf527.zip | |
Merge branch 'v2-prototype' into refactor/order-utils/for-v2
* v2-prototype: (33 commits)
Only show ProviderDisplay in portal
Improve sol-cov docs
Remove old parse code
Refactor order parser and add shared order support to new portal
Add generate and fill order routes
Address feedback
Override ethereumjs-tx version
Fix missing key
Update placeholder param ordering
Change userEtherBalanceInWei to optional so we can know if its loading
Add loading state to ProviderDisplay
Tweaks
Add Placeholder component
Add StandardIconRow
Split render into loading and loaaded
Fix linter errors
Fix linter errors
Add ethereum-types to extraFileIncludes
Introduce ethereum-types package
Remove merge conflicts from yarn.lock
...
# Conflicts:
# packages/contracts/src/utils/exchange_wrapper.ts
# packages/contracts/src/utils/match_order_tester.ts
# packages/contracts/src/utils/types.ts
# packages/contracts/test/exchange/core.ts
# packages/contracts/test/exchange/match_orders.ts
# packages/contracts/test/libraries/lib_bytes.ts
# packages/sol-cov/package.json
Diffstat (limited to 'packages/migrations')
| -rw-r--r-- | packages/migrations/package.json | 1 | ||||
| -rw-r--r-- | packages/migrations/src/migrate.ts | 2 | ||||
| -rw-r--r-- | packages/migrations/src/v1/migration.ts | 2 | ||||
| -rw-r--r-- | packages/migrations/src/v2/migration.ts | 2 |
4 files changed, 4 insertions, 3 deletions
diff --git a/packages/migrations/package.json b/packages/migrations/package.json index b8137cab9..75d735e6a 100644 --- a/packages/migrations/package.json +++ b/packages/migrations/package.json @@ -53,6 +53,7 @@ "@0xproject/typescript-typings": "^0.3.2", "@0xproject/utils": "^0.6.2", "@0xproject/web3-wrapper": "^0.6.4", + "ethereum-types": "^0.0.1", "ethers": "^3.0.15", "lodash": "^4.17.4" }, diff --git a/packages/migrations/src/migrate.ts b/packages/migrations/src/migrate.ts index 49b4e897c..a6fd86e5a 100644 --- a/packages/migrations/src/migrate.ts +++ b/packages/migrations/src/migrate.ts @@ -1,7 +1,7 @@ #!/usr/bin/env node import { devConstants, web3Factory } from '@0xproject/dev-utils'; -import { Provider } from '@0xproject/types'; import { logUtils } from '@0xproject/utils'; +import { Provider } from 'ethereum-types'; import * as path from 'path'; import * as yargs from 'yargs'; diff --git a/packages/migrations/src/v1/migration.ts b/packages/migrations/src/v1/migration.ts index 233339244..baa776537 100644 --- a/packages/migrations/src/v1/migration.ts +++ b/packages/migrations/src/v1/migration.ts @@ -1,6 +1,6 @@ -import { Provider, TxData } from '@0xproject/types'; import { BigNumber, NULL_BYTES } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Provider, TxData } from 'ethereum-types'; import * as _ from 'lodash'; import { ArtifactWriter } from '../artifact_writer'; diff --git a/packages/migrations/src/v2/migration.ts b/packages/migrations/src/v2/migration.ts index fd7223252..08a8ad2a7 100644 --- a/packages/migrations/src/v2/migration.ts +++ b/packages/migrations/src/v2/migration.ts @@ -1,6 +1,6 @@ -import { Provider, TxData } from '@0xproject/types'; import { BigNumber, NULL_BYTES } from '@0xproject/utils'; import { Web3Wrapper } from '@0xproject/web3-wrapper'; +import { Provider, TxData } from 'ethereum-types'; import * as _ from 'lodash'; import { ArtifactWriter } from '../artifact_writer'; |