Flesh out 0x.js index.ts and added some exports to other index.ts in the process

4 files changed, 51 insertions, 6 deletions

diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index bb93b86ea..a26d827d7 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -46,18 +46,24 @@ export {
     ExchangeCancelEventArgs,
     ExchangeEventArgs,
     ExchangeEvents,
+    ContractEvents,
 } from '@0xproject/contract-wrappers';
 
+export { ContractWrapper } from '@0xproject/contract-wrappers/lib/src/contract_wrappers/contract_wrapper';
+
+export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher';
+
 export {
     Web3ProviderEngine,
     RPCSubprovider,
     Callback,
     JSONRPCRequestPayloadWithMethod,
     ErrorCallback,
-    Subprovider,
 } from '@0xproject/subproviders';
 
-export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0xproject/order-watcher';
+export { Web3Wrapper, NodeType } from '@0xproject/web3-wrapper';
+
+export { AbiDecoder } from '@0xproject/utils';
 
 export { BigNumber } from '@0xproject/utils';
 
@@ -74,10 +80,22 @@ export {
     Token,
     ERC20AssetData,
     ERC721AssetData,
+    SignatureType,
+    OrderRelevantState,
 } from '@0xproject/types';
 
 export {
+    ContractArtifact,
+    GeneratedCompilerOptions,
+    ContractNetworks,
+    ContractVersionData,
+    ContractNetworkData,
+    Source,
+} from '@0xproject/sol-compiler';
+
+export {
     BlockParamLiteral,
+    ContractAbi,
     FilterObject,
     BlockParam,
     LogWithDecodedArgs,
@@ -95,4 +113,28 @@ export {
     LogEntryEvent,
     DecodedLogEntry,
     DecodedLogEntryEvent,
+    RawLog,
+    AbiDefinition,
+    TxData,
+    CallData,
+    BlockWithoutTransactionData,
+    BlockWithTransactionData,
+    Transaction,
+    TraceParams,
+    TransactionTrace,
+    AbstractBlock,
+    CallTxDataBase,
+    StructLog,
+    TxDataPayable,
+    FunctionAbi,
+    EventAbi,
+    EventParameter,
+    OpCode,
+    MethodAbi,
+    ConstructorAbi,
+    FallbackAbi,
+    DataItem,
+    ConstructorStateMutability,
+    StateMutability,
+    AbiType,
 } from 'ethereum-types';
diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index 41d60f05a..647636cb0 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -25,6 +25,7 @@ export {
     OnOrderStateChangeCallback,
     OrderStatus,
     OrderInfo,
+    ContractEvents,
 } from './types';
 
 export {
diff --git a/packages/ethereum-types/src/index.ts b/packages/ethereum-types/src/index.ts
index f4d445e3b..b2af028fb 100644
--- a/packages/ethereum-types/src/index.ts
+++ b/packages/ethereum-types/src/index.ts
@@ -20,7 +20,7 @@ export type ConstructorStateMutability = 'nonpayable' | 'payable';
 export type StateMutability = 'pure' | 'view' | ConstructorStateMutability;
 
 export interface MethodAbi {
-    type: AbiType.Function;
+    type: 'function';
     name: string;
     inputs: DataItem[];
     outputs: DataItem[];
@@ -30,14 +30,14 @@ export interface MethodAbi {
 }
 
 export interface ConstructorAbi {
-    type: AbiType.Constructor;
+    type: 'constructor';
     inputs: DataItem[];
     payable: boolean;
     stateMutability: ConstructorStateMutability;
 }
 
 export interface FallbackAbi {
-    type: AbiType.Fallback;
+    type: 'fallback';
     payable: boolean;
 }
 
@@ -46,7 +46,7 @@ export interface EventParameter extends DataItem {
 }
 
 export interface EventAbi {
-    type: AbiType.Event;
+    type: 'event';
     name: string;
     inputs: EventParameter[];
     anonymous: boolean;
diff --git a/packages/sol-compiler/src/index.ts b/packages/sol-compiler/src/index.ts
index 89d529887..fe72a37d6 100644
--- a/packages/sol-compiler/src/index.ts
+++ b/packages/sol-compiler/src/index.ts
@@ -6,4 +6,6 @@ export {
     ContractNetworks,
     GeneratedCompilerOptions,
     ContractNetworkData,
+    ContractVersionData,
+    Source,
 } from './utils/types';