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

Add CancelOrder and MatchOrder types

Browse Source
This commit is contained in:
Remco Bloemen
2018-05-22 14:52:06 +02:00
parent 1dad14f8ea
commit b39f75a2e3
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/contracts/src/utils/order_utils.ts
View File

@@ -4,7 +4,7 @@ import ethUtil = require('ethereumjs-util');
import * as _ from 'lodash'; import * as _ from 'lodash';
import { crypto } from './crypto'; import { crypto } from './crypto';
import { OrderStruct, SignatureType, SignedOrder, UnsignedOrder } from './types'; import { CancelOrder, MatchOrder, OrderStruct, SignatureType, SignedOrder, UnsignedOrder } from './types';
export const orderUtils = { export const orderUtils = {
createFill: (signedOrder: SignedOrder, takerAssetFillAmount?: BigNumber) => { createFill: (signedOrder: SignedOrder, takerAssetFillAmount?: BigNumber) => {
@@ -15,7 +15,7 @@ export const orderUtils = {
}; };
return fill; return fill;
}, },
createCancel(signedOrder: SignedOrder, takerAssetCancelAmount?: BigNumber) { createCancel(signedOrder: SignedOrder, takerAssetCancelAmount?: BigNumber): CancelOrder {
const cancel = { const cancel = {
order: orderUtils.getOrderStruct(signedOrder), order: orderUtils.getOrderStruct(signedOrder),
takerAssetCancelAmount: takerAssetCancelAmount || signedOrder.takerAssetAmount, takerAssetCancelAmount: takerAssetCancelAmount || signedOrder.takerAssetAmount,
@@ -80,7 +80,7 @@ export const orderUtils = {
const orderHashHex = `0x${orderHashBuff.toString('hex')}`; const orderHashHex = `0x${orderHashBuff.toString('hex')}`;
return orderHashHex; return orderHashHex;
}, },
createMatchOrders(signedOrderLeft: SignedOrder, signedOrderRight: SignedOrder) { createMatchOrders(signedOrderLeft: SignedOrder, signedOrderRight: SignedOrder): MatchOrder {
const fill = { const fill = {
left: orderUtils.getOrderStruct(signedOrderLeft), left: orderUtils.getOrderStruct(signedOrderLeft),
right: orderUtils.getOrderStruct(signedOrderRight), right: orderUtils.getOrderStruct(signedOrderRight),

12
packages/contracts/src/utils/types.ts
View File

@@ -197,3 +197,15 @@ export interface ProxyData {
tokenAddress?: string; tokenAddress?: string;
data?: any; data?: any;
} }
export interface CancelOrder {
order: OrderStruct;
takerAssetCancelAmount: BigNumber;
}
export interface MatchOrder {
left: OrderStruct;
right: OrderStruct;
leftSignature: string;
rightSignature: string;
}