Merge pull request #1668 from 0xProject/feat/contracts/tec-txorigin-check

Add tx.origin to TEC approvals

contracts/coordinator/test/utils/approval_factory.ts

@@ -13,6 +13,7 @@ export class ApprovalFactory {
     }
     public newSignedApproval(
         transaction: SignedZeroExTransaction,
+        txOrigin: string,
         approvalExpirationTimeSeconds: BigNumber,
         signatureType: CoordinatorSignatureType = CoordinatorSignatureType.EthSign,
     ): SignedCoordinatorApproval {
@@ -20,9 +21,14 @@ export class ApprovalFactory {
             ...transaction,
             verifyingContractAddress: this._verifyingContractAddress,
         };
-        const approvalHashBuff = hashUtils.getApprovalHashBuffer(coordinatorTransaction, approvalExpirationTimeSeconds);
+        const approvalHashBuff = hashUtils.getApprovalHashBuffer(
+            coordinatorTransaction,
+            txOrigin,
+            approvalExpirationTimeSeconds,
+        );
         const signatureBuff = signingUtils.signMessage(approvalHashBuff, this._privateKey, signatureType);
         const signedApproval = {
+            txOrigin,
             transaction: coordinatorTransaction,
             approvalExpirationTimeSeconds,
             signature: ethUtil.addHexPrefix(signatureBuff.toString('hex')),

contracts/coordinator/test/utils/constants.ts

@@ -6,6 +6,7 @@ export const constants = {
     COORDINATOR_APPROVAL_SCHEMA: {
         name: 'CoordinatorApproval',
         parameters: [
+            { name: 'txOrigin', type: 'address' },
             { name: 'transactionHash', type: 'bytes32' },
             { name: 'transactionSignature', type: 'bytes' },
             { name: 'approvalExpirationTimeSeconds', type: 'uint256' },

contracts/coordinator/test/utils/hash_utils.ts

@@ -7,7 +7,11 @@ import * as _ from 'lodash';
 import { constants } from './index';
 
 export const hashUtils = {
-    getApprovalHashBuffer(transaction: SignedZeroExTransaction, approvalExpirationTimeSeconds: BigNumber): Buffer {
+    getApprovalHashBuffer(
+        transaction: SignedZeroExTransaction,
+        txOrigin: string,
+        approvalExpirationTimeSeconds: BigNumber,
+    ): Buffer {
         const domain = {
             name: constants.COORDINATOR_DOMAIN_NAME,
             version: constants.COORDINATOR_DOMAIN_VERSION,
@@ -15,6 +19,7 @@ export const hashUtils = {
         };
         const transactionHash = hashUtils.getTransactionHashHex(transaction);
         const approval = {
+            txOrigin,
             transactionHash,
             transactionSignature: transaction.signature,
             approvalExpirationTimeSeconds: approvalExpirationTimeSeconds.toString(),
@@ -30,9 +35,13 @@ export const hashUtils = {
         const hashBuffer = signTypedDataUtils.generateTypedDataHash(typedData);
         return hashBuffer;
     },
-    getApprovalHashHex(transaction: SignedZeroExTransaction, approvalExpirationTimeSeconds: BigNumber): string {
+    getApprovalHashHex(
+        transaction: SignedZeroExTransaction,
+        txOrigin: string,
+        approvalExpirationTimeSeconds: BigNumber,
+    ): string {
         const hashHex = `0x${hashUtils
-            .getApprovalHashBuffer(transaction, approvalExpirationTimeSeconds)
+            .getApprovalHashBuffer(transaction, txOrigin, approvalExpirationTimeSeconds)
             .toString('hex')}`;
         return hashHex;
     },

contracts/coordinator/test/utils/types.ts

@@ -3,6 +3,7 @@ import { BigNumber } from '@0x/utils';
 
 export interface CoordinatorApproval {
     transaction: SignedZeroExTransaction;
+    txOrigin: string;
     approvalExpirationTimeSeconds: BigNumber;
 }