From 6ce151c67655605e8845136b7decbb0e23b90501 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 27 Jun 2018 10:59:52 +0300 Subject: Change import paths from z_r_x and e_r_c to zrx and erc --- packages/order-utils/test/exchange_transfer_simulator_test.ts | 6 +++--- .../test/utils/simple_erc20_balance_and_proxy_allowance_fetcher.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'packages/order-utils') 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; -- cgit v1.2.3 From 2f07ee0a8f1d7b3ab3ad338b426122b1f9bf8430 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Wed, 27 Jun 2018 15:47:58 +0300 Subject: Dump assert version and make the order-watcher depend on the old assert version --- packages/order-utils/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages/order-utils') diff --git a/packages/order-utils/package.json b/packages/order-utils/package.json index e3c81de44..9931b2ca0 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", -- cgit v1.2.3 From 9c8de3e933d607b54e0d0a19f0a3e39bc356d6d9 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Tue, 3 Jul 2018 15:47:13 +0300 Subject: Fix VRS signature generation in order-utils --- packages/order-utils/src/order_factory.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'packages/order-utils') 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; } -- cgit v1.2.3