From a8d328bfc926a62d61830334fadc43fc5d013e0e Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Thu, 7 Jun 2018 16:03:14 -0700
Subject: Basic EIP712 encoder

---
 packages/contracts/src/utils/transaction_factory.ts | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'packages/contracts/src')

diff --git a/packages/contracts/src/utils/transaction_factory.ts b/packages/contracts/src/utils/transaction_factory.ts
index 7aaf3691c..bb15a0309 100644
--- a/packages/contracts/src/utils/transaction_factory.ts
+++ b/packages/contracts/src/utils/transaction_factory.ts
@@ -26,21 +26,22 @@ export class TransactionFactory {
     public newSignedTransaction(data: string, signatureType: SignatureType = SignatureType.EthSign): SignedTransaction {
         const executeTransactionSchemaHashBuff = EIP712Utils.compileSchema(EIP712_EXECUTE_TRANSACTION_SCHEMA);
         const salt = generatePseudoRandomSalt();
-        const dataHash = crypto.solSHA3([ethUtil.toBuffer(data)]);
-        const executeTransactionDataHash = crypto.solSHA3([
-            executeTransactionSchemaHashBuff,
+        const signer = `0x${this._signerBuff.toString('hex')}`;
+        const executeTransactionData = {
             salt,
-            EIP712Utils.pad32Buffer(this._signerBuff),
-            dataHash,
-        ]);
-        const txHash = EIP712Utils.createEIP712Message(executeTransactionDataHash, this._exchangeAddress);
+            signer,
+            data,
+        };
+        const executeTransactionHashBuff = EIP712Utils.structHash(
+            EIP712_EXECUTE_TRANSACTION_SCHEMA,
+            executeTransactionData,
+        );
+        const txHash = EIP712Utils.createEIP712Message(executeTransactionHashBuff, this._exchangeAddress);
         const signature = signingUtils.signMessage(txHash, this._privateKey, signatureType);
         const signedTx = {
             exchangeAddress: this._exchangeAddress,
-            salt,
-            signer: `0x${this._signerBuff.toString('hex')}`,
-            data,
             signature: `0x${signature.toString('hex')}`,
+            ...executeTransactionData,
         };
         return signedTx;
     }
-- 
cgit v1.2.3