Move types from sol-compiler to types so they can be used in other places without requiring sol-compiler as a dep

4 files changed, 3 insertions, 7 deletions

diff --git a/packages/contract-wrappers/package.json b/packages/contract-wrappers/package.json
index 86ffa1114..6ce7a775b 100644
--- a/packages/contract-wrappers/package.json
+++ b/packages/contract-wrappers/package.json
@@ -80,7 +80,6 @@
         "@0xproject/fill-scenarios": "^1.0.1-rc.3",
         "@0xproject/json-schemas": "^1.0.1-rc.4",
         "@0xproject/order-utils": "^1.0.1-rc.3",
-        "@0xproject/sol-compiler": "^1.0.5",
         "@0xproject/types": "^1.0.1-rc.4",
         "@0xproject/typescript-typings": "^1.0.4",
         "@0xproject/utils": "^1.0.5",
diff --git a/packages/contract-wrappers/src/artifacts.ts b/packages/contract-wrappers/src/artifacts.ts
index 2481b311a..7e67544d2 100644
--- a/packages/contract-wrappers/src/artifacts.ts
+++ b/packages/contract-wrappers/src/artifacts.ts
@@ -1,4 +1,4 @@
-import { ContractArtifact } from '@0xproject/sol-compiler';
+import { ContractArtifact } from 'ethereum-types';
 
 import * as DummyERC20Token from './artifacts/DummyERC20Token.json';
 import * as DummyERC721Token from './artifacts/DummyERC721Token.json';
diff --git a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
index daf70253a..490a6c50a 100644
--- a/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/contract-wrappers/src/contract_wrappers/contract_wrapper.ts
@@ -1,6 +1,6 @@
-import { ContractArtifact } from '@0xproject/sol-compiler';
 import { AbiDecoder, intervalUtils, logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
+import { ContractArtifact } from 'ethereum-types';
 import { BlockParamLiteral, ContractAbi, FilterObject, LogEntry, LogWithDecodedArgs, RawLog } from 'ethereum-types';
 import { Block, BlockAndLogStreamer, Log } from 'ethereumjs-blockstream';
 import * as _ from 'lodash';
diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index f7c10dcce..7b9f3cd12 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -51,15 +51,12 @@ export {
     DataItem,
     ConstructorStateMutability,
     StateMutability,
-} from 'ethereum-types';
-
-export {
     ContractArtifact,
     GeneratedCompilerOptions,
     ContractNetworks,
     Source,
     ContractNetworkData,
-} from '@0xproject/sol-compiler';
+} from 'ethereum-types';
 
 export {
     WETH9Events,