diff options
author | Fabio Berger <me@fabioberger.com> | 2017-12-09 01:21:51 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2017-12-09 01:21:51 +0800 |
commit | af8d24d0eb5af781f4731b5559979f2b02579785 (patch) | |
tree | 6f429e6f2b3050de6dd7ce16e42c7f387bd5018a /packages/contracts/deploy/migrations | |
parent | ca85a97106ea6d09fbceafac8f9516945ccff399 (diff) | |
parent | 5eea829be9f5e8669c40dac965231051b668ed37 (diff) | |
download | dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.gz dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.bz2 dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.lz dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.xz dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.tar.zst dexon-sol-tools-af8d24d0eb5af781f4731b5559979f2b02579785.zip |
Merge branch 'development' into feature/addSubproviders
* development:
Update README.md
Inline network module
Stop supporting different file extensions in abi-gen
Refactor networkId out of web3Wrapper
Update connect types in preperation for publishing
Fix CI command
Address feedback
Refactor web3Wrapper to a separate package
# Conflicts:
# package.json
# packages/website/ts/blockchain.ts
Diffstat (limited to 'packages/contracts/deploy/migrations')
-rw-r--r-- | packages/contracts/deploy/migrations/migrate.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/packages/contracts/deploy/migrations/migrate.ts b/packages/contracts/deploy/migrations/migrate.ts index ea91febe4..c3d38875e 100644 --- a/packages/contracts/deploy/migrations/migrate.ts +++ b/packages/contracts/deploy/migrations/migrate.ts @@ -1,3 +1,4 @@ +import {Web3Wrapper} from '@0xproject/web3-wrapper'; import {BigNumber} from 'bignumber.js'; import * as _ from 'lodash'; import * as Web3 from 'web3'; @@ -5,7 +6,6 @@ import * as Web3 from 'web3'; import {Deployer} from './../src/deployer'; import {constants} from './../src/utils/constants'; import {Token} from './../src/utils/types'; -import {Web3Wrapper} from './../src/utils/web3_wrapper'; import {tokenInfo} from './config/token_info'; export const migrator = { |