Merge pull request #642 from 0xProject/feature/ethereum-types

Introduce ethereum-types package

5 files changed, 7 insertions, 5 deletions

diff --git a/packages/sol-compiler/package.json b/packages/sol-compiler/package.json
index a74e4ae3e..60ed3655f 100644
--- a/packages/sol-compiler/package.json
+++ b/packages/sol-compiler/package.json
@@ -28,7 +28,8 @@
             "assets": [],
             "docPublishConfigs": {
                 "extraFileIncludes": [
-                    "../types/src/index.ts"
+                    "../types/src/index.ts",
+                    "../ethereum-types/src/index.ts"
                 ],
                 "s3BucketPath": "s3://doc-jsons/sol-compiler/",
                 "s3StagingBucketPath": "s3://staging-doc-jsons/sol-compiler/"
@@ -80,6 +81,7 @@
         "@0xproject/utils": "^0.6.2",
         "@0xproject/web3-wrapper": "^0.6.4",
         "@types/yargs": "^11.0.0",
+        "ethereum-types": "^0.0.1",
         "chalk": "^2.3.0",
         "ethereumjs-util": "^5.1.1",
         "isomorphic-fetch": "^2.2.1",
diff --git a/packages/sol-compiler/src/compiler.ts b/packages/sol-compiler/src/compiler.ts
index 1d5bdb940..d2dda75ea 100644
--- a/packages/sol-compiler/src/compiler.ts
+++ b/packages/sol-compiler/src/compiler.ts
@@ -11,9 +11,9 @@ import {
     Resolver,
     URLResolver,
 } from '@0xproject/sol-resolver';
-import { ContractAbi } from '@0xproject/types';
 import { logUtils, promisify } from '@0xproject/utils';
 import chalk from 'chalk';
+import { ContractAbi } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as fs from 'fs';
 import 'isomorphic-fetch';
diff --git a/packages/sol-compiler/src/utils/encoder.ts b/packages/sol-compiler/src/utils/encoder.ts
index 806efbbca..0f2d75691 100644
--- a/packages/sol-compiler/src/utils/encoder.ts
+++ b/packages/sol-compiler/src/utils/encoder.ts
@@ -1,4 +1,4 @@
-import { AbiDefinition, AbiType, ContractAbi, DataItem } from '@0xproject/types';
+import { AbiDefinition, AbiType, ContractAbi, DataItem } from 'ethereum-types';
 import * as _ from 'lodash';
 import * as web3Abi from 'web3-eth-abi';
 
diff --git a/packages/sol-compiler/src/utils/types.ts b/packages/sol-compiler/src/utils/types.ts
index d43347fa6..759a7a555 100644
--- a/packages/sol-compiler/src/utils/types.ts
+++ b/packages/sol-compiler/src/utils/types.ts
@@ -1,4 +1,4 @@
-import { ContractAbi, Provider, TxData } from '@0xproject/types';
+import { ContractAbi, Provider, TxData } from 'ethereum-types';
 import * as solc from 'solc';
 import * as Web3 from 'web3';
 import * as yargs from 'yargs';
diff --git a/packages/sol-compiler/test/util/provider.ts b/packages/sol-compiler/test/util/provider.ts
index 2bd178129..7215ffae7 100644
--- a/packages/sol-compiler/test/util/provider.ts
+++ b/packages/sol-compiler/test/util/provider.ts
@@ -1,5 +1,5 @@
 import { web3Factory } from '@0xproject/dev-utils';
-import { Provider } from '@0xproject/types';
+import { Provider } from 'ethereum-types';
 import * as Web3 from 'web3';
 
 const providerConfigs = { shouldUseInProcessGanache: true };