Merge pull request #822 from 0xProject/v2-contract-wrappers-WIP

V2 contract wrappers

4 files changed, 8 insertions, 7 deletions

diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json
index 97b08c3d3..ce209561f 100644
--- a/packages/order-utils/package.json
+++ b/packages/order-utils/package.json
@@ -72,7 +72,7 @@
         "typescript": "2.7.1"
     },
     "dependencies": {
-        "@0xproject/assert": "^0.2.12",
+        "@0xproject/assert": "^0.3.0",
         "@0xproject/base-contract": "^0.3.4",
         "@0xproject/json-schemas": "1.0.0",
         "@0xproject/sol-compiler": "^0.5.2",
diff --git a/packages/order-utils/src/order_factory.ts b/packages/order-utils/src/order_factory.ts
index 678336ac5..803cb82b1 100644
--- a/packages/order-utils/src/order_factory.ts
+++ b/packages/order-utils/src/order_factory.ts
@@ -57,9 +57,10 @@ export const orderFactory = {
 };
 
 function getVRSHexString(ecSignature: ECSignature): string {
-    const vrs = `0x${intToHex(ecSignature.v)}${ethUtil.stripHexPrefix(ecSignature.r)}${ethUtil.stripHexPrefix(
+    const ETH_SIGN_SIGNATURE_TYPE = '03';
+    const vrs = `${intToHex(ecSignature.v)}${ethUtil.stripHexPrefix(ecSignature.r)}${ethUtil.stripHexPrefix(
         ecSignature.s,
-    )}`;
+    )}${ETH_SIGN_SIGNATURE_TYPE}`;
     return vrs;
 }
 
diff --git a/packages/order-utils/test/exchange_transfer_simulator_test.ts b/packages/order-utils/test/exchange_transfer_simulator_test.ts
index bed04d879..37b2bd712 100644
--- a/packages/order-utils/test/exchange_transfer_simulator_test.ts
+++ b/packages/order-utils/test/exchange_transfer_simulator_test.ts
@@ -7,9 +7,9 @@ import { artifacts } from '../src/artifacts';
 import { assetProxyUtils } from '../src/asset_proxy_utils';
 import { constants } from '../src/constants';
 import { ExchangeTransferSimulator } from '../src/exchange_transfer_simulator';
-import { DummyERC20TokenContract } from '../src/generated_contract_wrappers/dummy_e_r_c20_token';
-import { ERC20ProxyContract } from '../src/generated_contract_wrappers/e_r_c20_proxy';
-import { ERC20TokenContract } from '../src/generated_contract_wrappers/e_r_c20_token';
+import { DummyERC20TokenContract } from '../src/generated_contract_wrappers/dummy_erc20_token';
+import { ERC20ProxyContract } from '../src/generated_contract_wrappers/erc20_proxy';
+import { ERC20TokenContract } from '../src/generated_contract_wrappers/erc20_token';
 import { BalanceAndProxyAllowanceLazyStore } from '../src/store/balance_and_proxy_allowance_lazy_store';
 import { TradeSide, TransferType } from '../src/types';
 
diff --git a/packages/order-utils/test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts b/packages/order-utils/test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts
index d41eaca40..68f6a164c 100644
--- a/packages/order-utils/test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts
+++ b/packages/order-utils/test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts
@@ -2,7 +2,7 @@ import { BigNumber } from '@0xproject/utils';
 
 import { AbstractBalanceAndProxyAllowanceFetcher } from '../../src/abstract/abstract_balance_and_proxy_allowance_fetcher';
 
-import { ERC20TokenContract } from '../../src/generated_contract_wrappers/e_r_c20_token';
+import { ERC20TokenContract } from '../../src/generated_contract_wrappers/erc20_token';
 
 export class SimpleERC20BalanceAndProxyAllowanceFetcher implements AbstractBalanceAndProxyAllowanceFetcher {
     private _erc20TokenContract: ERC20TokenContract;