crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated constants for TEC to Coordinator rename

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/coordinator/contracts/src/libs/LibCoordinatorApproval.sol
View File

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

6
contracts/coordinator/test/utils/constants.ts
View File

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

12
contracts/coordinator/test/utils/hash_utils.ts
View File

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