From c03e24e10b23ce1c542d3dea10bc26ae9d86fea5 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Mon, 4 Feb 2019 16:03:25 +0000
Subject: Fix bug where passing in signerAddress instead of exchangeAddress

---
 packages/order-utils/src/signature_utils.ts | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'packages/order-utils/src/signature_utils.ts')

diff --git a/packages/order-utils/src/signature_utils.ts b/packages/order-utils/src/signature_utils.ts
index 131144d48..efcc146bf 100644
--- a/packages/order-utils/src/signature_utils.ts
+++ b/packages/order-utils/src/signature_utils.ts
@@ -1,4 +1,5 @@
 import { ExchangeContract, IValidatorContract, IWalletContract } from '@0x/abi-gen-wrappers';
+import { getContractAddressesForNetworkOrThrow } from '@0x/contract-addresses';
 import * as artifacts from '@0x/contract-artifacts';
 import { schemas } from '@0x/json-schemas';
 import { ECSignature, Order, SignatureType, SignedOrder, ValidatorSignature } from '@0x/types';
@@ -92,7 +93,14 @@ export const signatureUtils = {
         assert.isWeb3Provider('provider', provider);
         assert.isHexString('data', data);
         assert.isETHAddressHex('signerAddress', signerAddress);
-        const exchangeContract = new ExchangeContract(artifacts.Exchange.compilerOutput.abi, signerAddress, provider);
+        const web3Wrapper = new Web3Wrapper(provider);
+        const networkId = await web3Wrapper.getNetworkIdAsync();
+        const addresses = getContractAddressesForNetworkOrThrow(networkId);
+        const exchangeContract = new ExchangeContract(
+            artifacts.Exchange.compilerOutput.abi,
+            addresses.exchange,
+            provider,
+        );
         const isValid = await exchangeContract.preSigned.callAsync(data, signerAddress);
         return isValid;
     },
-- 
cgit