4 files changed, 48 insertions, 51 deletions
diff --git a/packages/0x.js/src/0x.ts b/packages/0x.js/src/0x.ts
index 48d00c1ac..cdcdac474 100644
--- a/packages/0x.js/src/0x.ts
+++ b/packages/0x.js/src/0x.ts
@@ -9,13 +9,7 @@ import {
     EtherTokenWrapper,
     ExchangeWrapper,
 } from '@0xproject/contract-wrappers';
-import {
-    assetDataUtils,
-    ecSignOrderHashAsync,
-    generatePseudoRandomSalt,
-    isValidSignatureAsync,
-    orderHashUtils,
-} from '@0xproject/order-utils';
+import { assetDataUtils, generatePseudoRandomSalt, signatureUtils, orderHashUtils } from '@0xproject/order-utils';
 // HACK: Since we export assetDataUtils from ZeroEx and it has AssetProxyId, ERC20AssetData and ERC721AssetData
 // in it's public interface, we need to import these types here.
 // tslint:disable-next-line:no-unused-variable
@@ -197,7 +191,7 @@ export class ZeroEx {
      * @return  Whether the signature is valid for the supplied signerAddress and data.
      */
     public async isValidSignatureAsync(data: string, signature: string, signerAddress: string): Promise<boolean> {
-        const isValid = await isValidSignatureAsync(
+        const isValid = await signatureUtils.isValidSignatureAsync(
             this._contractWrappers.getProvider(),
             data,
             signature,
@@ -247,7 +241,7 @@ export class ZeroEx {
         signerAddress: string,
         signerType: SignerType = SignerType.Default,
     ): Promise<string> {
-        const signature = await ecSignOrderHashAsync(
+        const signature = await signatureUtils.ecSignOrderHashAsync(
             this._contractWrappers.getProvider(),
             orderHash,
             signerAddress,
diff --git a/packages/0x.js/src/index.ts b/packages/0x.js/src/index.ts
index 2ba60e730..5e465c38c 100644
--- a/packages/0x.js/src/index.ts
+++ b/packages/0x.js/src/index.ts
@@ -1,32 +1,13 @@
 export { ZeroEx } from './0x';
 
-export { Web3ProviderEngine, RPCSubprovider } from '@0xproject/subproviders';
-
 export {
-    ExchangeContractErrs,
-    Order,
-    SignedOrder,
-    SignerType,
-    ECSignature,
-    OrderStateValid,
-    OrderStateInvalid,
-    OrderState,
-    Token,
-    ERC20AssetData,
-    ERC721AssetData,
-    AssetProxyId,
-} from '@0xproject/types';
-
-export {
-    BlockParamLiteral,
-    FilterObject,
-    BlockParam,
-    LogWithDecodedArgs,
-    ContractEventArg,
-    Provider,
-    TransactionReceipt,
-    TransactionReceiptWithDecodedLogs,
-} from 'ethereum-types';
+    Web3ProviderEngine,
+    RPCSubprovider,
+    Callback,
+    JSONRPCRequestPayloadWithMethod,
+    ErrorCallback,
+    Subprovider,
+} from '@0xproject/subproviders';
 
 export {
     EventCallback,
@@ -52,15 +33,53 @@ export {
     ERC20TokenApprovalEventArgs,
     ERC20TokenEvents,
     ERC20TokenEventArgs,
+    ERC721TokenEventArgs,
     ERC721TokenApprovalEventArgs,
     ERC721TokenApprovalForAllEventArgs,
     ERC721TokenTransferEventArgs,
     ERC721TokenEvents,
     ExchangeCancelUpToEventArgs,
     ExchangeAssetProxyRegisteredEventArgs,
+    ExchangeSignatureValidatorApprovalEventArgs,
     ExchangeFillEventArgs,
     ExchangeCancelEventArgs,
     ExchangeEventArgs,
     ContractWrappersConfig,
     OrderInfo,
 } from '@0xproject/contract-wrappers';
+
+export {
+    ExchangeContractErrs,
+    Order,
+    SignedOrder,
+    ECSignature,
+    OrderStateValid,
+    OrderStateInvalid,
+    OrderState,
+    Token,
+    ERC20AssetData,
+    ERC721AssetData,
+    AssetProxyId,
+    OrderRelevantState,
+} from '@0xproject/types';
+
+export {
+    BlockParamLiteral,
+    FilterObject,
+    BlockParam,
+    LogWithDecodedArgs,
+    ContractEventArg,
+    Provider,
+    TransactionReceipt,
+    TransactionReceiptWithDecodedLogs,
+    LogTopic,
+    JSONRPCRequestPayload,
+    JSONRPCResponsePayload,
+    JSONRPCErrorCallback,
+    TransactionReceiptStatus,
+    LogEntry,
+    DecodedLogArgs,
+    LogEntryEvent,
+    DecodedLogEntry,
+    DecodedLogEntryEvent,
+} from 'ethereum-types';
diff --git a/packages/0x.js/src/monorepo_scripts/postpublish.ts b/packages/0x.js/src/monorepo_scripts/postpublish.ts
deleted file mode 100644
index dcb99d0f7..000000000
--- a/packages/0x.js/src/monorepo_scripts/postpublish.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.runAsync(packageJSON, tsConfigJSON, cwd);
diff --git a/packages/0x.js/src/monorepo_scripts/stage_docs.ts b/packages/0x.js/src/monorepo_scripts/stage_docs.ts
deleted file mode 100644
index e732ac8eb..000000000
--- a/packages/0x.js/src/monorepo_scripts/stage_docs.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { postpublishUtils } from '@0xproject/monorepo-scripts';
-
-import * as packageJSON from '../package.json';
-import * as tsConfigJSON from '../tsconfig.json';
-
-const cwd = `${__dirname}/..`;
-// tslint:disable-next-line:no-floating-promises
-postpublishUtils.publishDocsToStagingAsync(packageJSON, tsConfigJSON, cwd);