updated constants for TEC to Coordinator rename

This commit is contained in:
Greg Hysen 2019-03-06 14:48:03 -08:00
parent e3f85a7c0f
commit 977cd2505e
3 changed files with 12 additions and 12 deletions

View File

@ -25,7 +25,7 @@ contract LibCoordinatorApproval is
LibEIP712Domain
{
// Hash for the EIP712 Coordinator approval message
bytes32 constant internal EIP712_Coordinator_APPROVAL_SCHEMA_HASH = keccak256(abi.encodePacked(
bytes32 constant internal EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH = keccak256(abi.encodePacked(
"CoordinatorApproval(",
"bytes32 transactionHash,",
"bytes transactionSignature,",
@ -59,7 +59,7 @@ contract LibCoordinatorApproval is
pure
returns (bytes32 result)
{
bytes32 schemaHash = EIP712_Coordinator_APPROVAL_SCHEMA_HASH;
bytes32 schemaHash = EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH;
bytes32 transactionSignatureHash = keccak256(approval.transactionSignature);
// TODO(abandeali1): optimize by loading from memory in assembly
bytes32 transactionHash = approval.transactionHash;
@ -67,7 +67,7 @@ contract LibCoordinatorApproval is
// Assembly for more efficiently computing:
// keccak256(abi.encodePacked(
// EIP712_Coordinator_APPROVAL_SCHEMA_HASH,
// EIP712_COORDINATOR_APPROVAL_SCHEMA_HASH,
// approval.transactionHash,
// keccak256(approval.transactionSignature)
// approval.expiration,

View File

@ -1,9 +1,9 @@
import { BigNumber } from '@0x/utils';
export const constants = {
Coordinator_DOMAIN_NAME: '0x Protocol Trade Execution Coordinator',
Coordinator_DOMAIN_VERSION: '1.0.0',
Coordinator_APPROVAL_SCHEMA: {
COORDINATOR_DOMAIN_NAME: '0x Protocol Trade Execution Coordinator',
COORDINATOR_DOMAIN_VERSION: '1.0.0',
COORDINATOR_APPROVAL_SCHEMA: {
name: 'CoordinatorApproval',
parameters: [
{ name: 'transactionHash', type: 'bytes32' },

View File

@ -9,8 +9,8 @@ import { constants } from './index';
export const hashUtils = {
getApprovalHashBuffer(transaction: SignedZeroExTransaction, approvalExpirationTimeSeconds: BigNumber): Buffer {
const domain = {
name: constants.Coordinator_DOMAIN_NAME,
version: constants.Coordinator_DOMAIN_VERSION,
name: constants.COORDINATOR_DOMAIN_NAME,
version: constants.COORDINATOR_DOMAIN_VERSION,
verifyingContractAddress: transaction.verifyingContractAddress,
};
const transactionHash = hashUtils.getTransactionHashHex(transaction);
@ -20,9 +20,9 @@ export const hashUtils = {
approvalExpirationTimeSeconds: approvalExpirationTimeSeconds.toString(),
};
const typedData = eip712Utils.createTypedData(
constants.Coordinator_APPROVAL_SCHEMA.name,
constants.COORDINATOR_APPROVAL_SCHEMA.name,
{
CoordinatorApproval: constants.Coordinator_APPROVAL_SCHEMA.parameters,
CoordinatorApproval: constants.COORDINATOR_APPROVAL_SCHEMA.parameters,
},
approval,
domain,
@ -38,8 +38,8 @@ export const hashUtils = {
},
getTransactionHashBuffer(transaction: ZeroExTransaction | SignedZeroExTransaction): Buffer {
const domain = {
name: constants.Coordinator_DOMAIN_NAME,
version: constants.Coordinator_DOMAIN_VERSION,
name: constants.COORDINATOR_DOMAIN_NAME,
version: constants.COORDINATOR_DOMAIN_VERSION,
verifyingContractAddress: transaction.verifyingContractAddress,
};
const normalizedTransaction = _.mapValues(transaction, value => {