Cleanup web3-wrapper and subproviders index.ts

2 files changed, 26 insertions, 6 deletions

diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts
index eb9347bdb..b5f9b3f90 100644
--- a/packages/subproviders/src/index.ts
+++ b/packages/subproviders/src/index.ts
@@ -1,9 +1,9 @@
 import Eth from '@ledgerhq/hw-app-eth';
 import TransportU2F from '@ledgerhq/hw-transport-u2f';
-import { LedgerEthereumClient } from './types';
-
 export import Web3ProviderEngine = require('web3-provider-engine');
 
+import { LedgerEthereumClient } from './types';
+
 /**
  * A factory method for creating a LedgerEthereumClient usable in a browser context.
  * @return LedgerEthereumClient A browser client for the LedgerSubprovider
@@ -38,12 +38,13 @@ export {
     NonceSubproviderErrors,
     LedgerSubproviderConfigs,
     PartialTxParams,
-    DerivedHDKeyInfo,
     JSONRPCRequestPayloadWithMethod,
     ECSignatureString,
     AccountFetchingConfigs,
     LedgerEthereumClientFactoryAsync,
     OnNextCompleted,
+    MnemonicWalletSubproviderConfigs,
+    LedgerGetAddressResult,
 } from './types';
 
 export { ECSignature } from '@0xproject/types';
diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts
index dc708eb8c..7cdd25e55 100644
--- a/packages/web3-wrapper/src/index.ts
+++ b/packages/web3-wrapper/src/index.ts
@@ -1,6 +1,8 @@
 export { Web3Wrapper } from './web3_wrapper';
 export { marshaller } from './marshaller';
 
+export { AbiDecoder } from '@0xproject/utils';
+
 export {
     BlockParam,
     TxData,
@@ -18,18 +20,35 @@ export {
     LogTopic,
     JSONRPCRequestPayload,
     TransactionReceiptStatus,
-    LogWithDecodedArgs,
     DecodedLogArgs,
     StructLog,
     JSONRPCErrorCallback,
     BlockParamLiteral,
+    ContractEventArg,
+    DecodedLogEntry,
+    LogEntryEvent,
+    OpCode,
+    TxDataPayable,
+    JSONRPCResponsePayload,
+    RawLogEntry,
+    DecodedLogEntryEvent,
+    LogWithDecodedArgs,
+    AbiDefinition,
+    RawLog,
+    FunctionAbi,
+    EventAbi,
+    EventParameter,
+    MethodAbi,
+    ConstructorAbi,
+    FallbackAbi,
+    DataItem,
+    ConstructorStateMutability,
+    StateMutability,
 } from 'ethereum-types';
 export {
     Web3WrapperErrors,
     NodeType,
     CallDataRPC,
-    CallTxDataBaseRPC,
-    AbstractBlockRPC,
     BlockWithoutTransactionDataRPC,
     BlockWithTransactionDataRPC,
     TransactionRPC,