Merge remote-tracking branch 'origin/development' into feature/utils/prettybignum

1 files changed, 46 insertions, 2 deletions

diff --git a/packages/web3-wrapper/src/index.ts b/packages/web3-wrapper/src/index.ts
index 5d3d135e4..679563a2b 100644
--- a/packages/web3-wrapper/src/index.ts
+++ b/packages/web3-wrapper/src/index.ts
@@ -1,11 +1,55 @@
 export { Web3Wrapper } from './web3_wrapper';
 export { marshaller } from './marshaller';
+
+export { AbiDecoder } from '@0x/utils';
+
+export {
+    BlockParam,
+    TxData,
+    Provider,
+    TransactionReceipt,
+    Transaction,
+    TraceParams,
+    TransactionTrace,
+    BlockWithoutTransactionData,
+    LogEntry,
+    FilterObject,
+    CallData,
+    TransactionReceiptWithDecodedLogs,
+    BlockWithTransactionData,
+    LogTopic,
+    JSONRPCRequestPayload,
+    TransactionReceiptStatus,
+    DecodedLogArgs,
+    StructLog,
+    JSONRPCErrorCallback,
+    BlockParamLiteral,
+    ContractEventArg,
+    DecodedLogEntry,
+    LogEntryEvent,
+    OpCode,
+    TxDataPayable,
+    JSONRPCResponsePayload,
+    JSONRPCResponseError,
+    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,