aboutsummaryrefslogtreecommitdiffstats
path: root/packages/0x.js/src/index.ts
diff options
context:
space:
mode:
authorfragosti <francesco.agosti93@gmail.com>2018-10-10 09:25:14 +0800
committerfragosti <francesco.agosti93@gmail.com>2018-10-10 09:25:14 +0800
commit2bd8cbb80cadc922ca13582a1f15d63815118205 (patch)
treef81ae5e91e720fe228d83b0e8af0fc676f35b7c5 /packages/0x.js/src/index.ts
parent941448d65cc42870a93e0430158bfd7ab52fd2cd (diff)
parentafb34da72978b5272cfb5a235498e483c72556bc (diff)
downloaddexon-sol-tools-2bd8cbb80cadc922ca13582a1f15d63815118205.tar
dexon-sol-tools-2bd8cbb80cadc922ca13582a1f15d63815118205.tar.gz
dexon-sol-tools-2bd8cbb80cadc922ca13582a1f15d63815118205.tar.bz2
dexon-sol-tools-2bd8cbb80cadc922ca13582a1f15d63815118205.tar.lz
dexon-sol-tools-2bd8cbb80cadc922ca13582a1f15d63815118205.tar.xz
dexon-sol-tools-2bd8cbb80cadc922ca13582a1f15d63815118205.tar.zst
dexon-sol-tools-2bd8cbb80cadc922ca13582a1f15d63815118205.zip
Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/redux-styles-container
Diffstat (limited to 'packages/0x.js/src/index.ts')
-rw-r--r--packages/0x.js/src/index.ts10
1 files changed, 8 insertions, 2 deletions
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index d07bfcfc8..6eb1fd8ee 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -53,7 +53,13 @@ export { OrderWatcher, OnOrderStateChangeCallback, OrderWatcherConfig } from '@0
export import Web3ProviderEngine = require('web3-provider-engine');
-export { RPCSubprovider, Callback, JSONRPCRequestPayloadWithMethod, ErrorCallback } from '@0xproject/subproviders';
+export {
+ RPCSubprovider,
+ Callback,
+ JSONRPCRequestPayloadWithMethod,
+ ErrorCallback,
+ MetamaskSubprovider,
+} from '@0xproject/subproviders';
export { AbiDecoder } from '@0xproject/utils';
@@ -68,7 +74,6 @@ export {
OrderStateInvalid,
OrderState,
AssetProxyId,
- SignerType,
ERC20AssetData,
ERC721AssetData,
SignatureType,
@@ -85,6 +90,7 @@ export {
JSONRPCRequestPayload,
JSONRPCResponsePayload,
JSONRPCErrorCallback,
+ JSONRPCResponseError,
LogEntry,
DecodedLogArgs,
LogEntryEvent,