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

Unpin coordinator deps.

Browse Source 
Update coordinator tests for new tooling.
Remove unecessary `chainId` parameter in `eip712_utils.createCoordinatorApprovalTypeData`
This commit is contained in:
Lawrence Forman
2019-03-26 16:04:21 -04:00
committed by Amir Bandeali
parent e6aff19a0c
commit e51b425200
3 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
contracts/coordinator/test/libs.ts
View File

@@ -74,7 +74,6 @@ describe('Libs tests', () => {
const expectedApprovalHash = hashUtils.getApprovalHashHex( const expectedApprovalHash = hashUtils.getApprovalHashHex(
signedTx, signedTx,
coordinatorContract.address, coordinatorContract.address,
chainId,
txOrigin, txOrigin,
approvalExpirationTimeSeconds, approvalExpirationTimeSeconds,
); );

3
contracts/coordinator/test/utils/approval_factory.ts
View File

@@ -8,12 +8,10 @@ import { hashUtils, SignedCoordinatorApproval } from './index';
export class ApprovalFactory { export class ApprovalFactory {
private readonly _privateKey: Buffer; private readonly _privateKey: Buffer;
private readonly _verifyingContractAddress: string; private readonly _verifyingContractAddress: string;
private readonly _chainId: number;
constructor(privateKey: Buffer, verifyingContractAddress: string, chainId: number) { constructor(privateKey: Buffer, verifyingContractAddress: string, chainId: number) {
this._privateKey = privateKey; this._privateKey = privateKey;
this._verifyingContractAddress = verifyingContractAddress; this._verifyingContractAddress = verifyingContractAddress;
this._chainId = chainId;
} }
public newSignedApproval( public newSignedApproval(
@@ -25,7 +23,6 @@ export class ApprovalFactory {
const approvalHashBuff = hashUtils.getApprovalHashBuffer( const approvalHashBuff = hashUtils.getApprovalHashBuffer(
transaction, transaction,
this._verifyingContractAddress, this._verifyingContractAddress,
this._chainId,
txOrigin, txOrigin,
approvalExpirationTimeSeconds, approvalExpirationTimeSeconds,
); );

1
packages/order-utils/src/eip712_utils.ts
View File

@@ -113,6 +113,7 @@ export const eip712Utils = {
name: constants.COORDINATOR_DOMAIN_NAME, name: constants.COORDINATOR_DOMAIN_NAME,
version: constants.COORDINATOR_DOMAIN_VERSION, version: constants.COORDINATOR_DOMAIN_VERSION,
verifyingContractAddress, verifyingContractAddress,
chainId: transaction.chainId,
}; };
const transactionHash = transactionHashUtils.getTransactionHashHex(transaction); const transactionHash = transactionHashUtils.getTransactionHashHex(transaction);
const approval = { const approval = {