From b333ed91de8d4f08cd614a52e2b0d602995c2b27 Mon Sep 17 00:00:00 2001
From: Amir Bandeali <abandeali1@gmail.com>
Date: Thu, 21 Jun 2018 16:08:45 -0700
Subject: Add event to setSignatureValidatorApproval, rename signer =>
 signerAddress accross all contracts

---
 packages/contracts/src/utils/exchange_wrapper.ts    | 2 +-
 packages/contracts/src/utils/transaction_factory.ts | 6 +++---
 packages/contracts/src/utils/types.ts               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/contracts/src/utils')

diff --git a/packages/contracts/src/utils/exchange_wrapper.ts b/packages/contracts/src/utils/exchange_wrapper.ts
index 4cc8f0b89..06eb70644 100644
--- a/packages/contracts/src/utils/exchange_wrapper.ts
+++ b/packages/contracts/src/utils/exchange_wrapper.ts
@@ -215,7 +215,7 @@ export class ExchangeWrapper {
     ): Promise<TransactionReceiptWithDecodedLogs> {
         const txHash = await this._exchange.executeTransaction.sendTransactionAsync(
             signedTx.salt,
-            signedTx.signer,
+            signedTx.signerAddress,
             signedTx.data,
             signedTx.signature,
             { from },
diff --git a/packages/contracts/src/utils/transaction_factory.ts b/packages/contracts/src/utils/transaction_factory.ts
index 19ef4e1bf..348c0715d 100644
--- a/packages/contracts/src/utils/transaction_factory.ts
+++ b/packages/contracts/src/utils/transaction_factory.ts
@@ -9,7 +9,7 @@ const EIP712_ZEROEX_TRANSACTION_SCHEMA: EIP712Schema = {
     name: 'ZeroExTransaction',
     parameters: [
         { name: 'salt', type: EIP712Types.Uint256 },
-        { name: 'signer', type: EIP712Types.Address },
+        { name: 'signerAddress', type: EIP712Types.Address },
         { name: 'data', type: EIP712Types.Bytes },
     ],
 };
@@ -25,10 +25,10 @@ export class TransactionFactory {
     }
     public newSignedTransaction(data: string, signatureType: SignatureType = SignatureType.EthSign): SignedTransaction {
         const salt = generatePseudoRandomSalt();
-        const signer = `0x${this._signerBuff.toString('hex')}`;
+        const signerAddress = `0x${this._signerBuff.toString('hex')}`;
         const executeTransactionData = {
             salt,
-            signer,
+            signerAddress,
             data,
         };
         const executeTransactionHashBuff = EIP712Utils.structHash(
diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts
index a6d0c2a88..7a1f92afd 100644
--- a/packages/contracts/src/utils/types.ts
+++ b/packages/contracts/src/utils/types.ts
@@ -108,7 +108,7 @@ export enum ContractName {
 export interface SignedTransaction {
     exchangeAddress: string;
     salt: BigNumber;
-    signer: string;
+    signerAddress: string;
     data: string;
     signature: string;
 }
-- 
cgit v1.2.3