Merge branch 'development' of https://github.com/0xProject/0x-monorepo into feature/instant/move-features-over-from-zrx-buyer

3 files changed, 2 insertions, 24 deletions

diff --git a/packages/order-utils/src/artifacts.ts b/packages/order-utils/src/artifacts.ts
deleted file mode 100644
index 735cc2403..000000000
--- a/packages/order-utils/src/artifacts.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ContractArtifact } from 'ethereum-types';
-
-import * as DummyERC20Token from './artifacts/DummyERC20Token.json';
-import * as ERC20Proxy from './artifacts/ERC20Proxy.json';
-import * as Exchange from './artifacts/Exchange.json';
-import * as IValidator from './artifacts/IValidator.json';
-import * as IWallet from './artifacts/IWallet.json';
-export const artifacts = {
-    ERC20Proxy: (ERC20Proxy as any) as ContractArtifact,
-    DummyERC20Token: (DummyERC20Token as any) as ContractArtifact,
-    Exchange: (Exchange as any) as ContractArtifact,
-    IWallet: (IWallet as any) as ContractArtifact,
-    IValidator: (IValidator as any) as ContractArtifact,
-};
diff --git a/packages/order-utils/src/globals.d.ts b/packages/order-utils/src/globals.d.ts
deleted file mode 100644
index 94e63a32d..000000000
--- a/packages/order-utils/src/globals.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-declare module '*.json' {
-    const json: any;
-    /* tslint:disable */
-    export default json;
-    /* tslint:enable */
-}
diff --git a/packages/order-utils/src/signature_utils.ts b/packages/order-utils/src/signature_utils.ts
index 372d210d0..d755846ad 100644
--- a/packages/order-utils/src/signature_utils.ts
+++ b/packages/order-utils/src/signature_utils.ts
@@ -1,3 +1,5 @@
+import { ExchangeContract, IValidatorContract, IWalletContract } from '@0xproject/abi-gen-wrappers';
+import * as artifacts from '@0xproject/contract-artifacts';
 import { schemas } from '@0xproject/json-schemas';
 import { ECSignature, Order, SignatureType, SignedOrder, ValidatorSignature } from '@0xproject/types';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
@@ -5,12 +7,8 @@ import { Provider } from 'ethereum-types';
 import * as ethUtil from 'ethereumjs-util';
 import * as _ from 'lodash';
 
-import { artifacts } from './artifacts';
 import { assert } from './assert';
 import { eip712Utils } from './eip712_utils';
-import { ExchangeContract } from './generated_contract_wrappers/exchange';
-import { IValidatorContract } from './generated_contract_wrappers/i_validator';
-import { IWalletContract } from './generated_contract_wrappers/i_wallet';
 import { orderHashUtils } from './order_hash';
 import { OrderError } from './types';
 import { utils } from './utils';