Migrate batchCancelOrders

This commit is contained in:
Leonid Logvinov
2017-07-07 15:23:37 -07:00
parent 406763ff61
commit e2696c259b
3 changed files with 11 additions and 10 deletions

View File

@@ -127,11 +127,11 @@
"type": "uint256[6][]"
},
{
"name": "cancelValuesT",
"name": "cancelTakerTokenAmounts",
"type": "uint256[]"
}
],
"name": "batchCancel",
"name": "batchCancelOrders",
"outputs": [
{
"name": "success",

View File

@@ -549,20 +549,20 @@ export class ExchangeWrapper extends ContractWrapper {
];
});
// We use _.unzip<any> because _.unzip doesn't type check if values have different types :'(
const [orderAddresses, orderValues, takerTokenCancelAmounts] =
const [orderAddresses, orderValues, cancelTakerTokenAmounts] =
_.unzip<any>(orderAddressesValuesAndTakerTokenCancelAmounts);
const gas = await exchangeInstance.batchCancel.estimateGas(
const gas = await exchangeInstance.batchCancelOrders.estimateGas(
orderAddresses,
orderValues,
takerTokenCancelAmounts,
cancelTakerTokenAmounts,
{
from: maker,
},
);
const response: ContractResponse = await exchangeInstance.batchCancel(
const response: ContractResponse = await exchangeInstance.batchCancelOrders(
orderAddresses,
orderValues,
takerTokenCancelAmounts,
cancelTakerTokenAmounts,
{
from: maker,
gas,

View File

@@ -96,10 +96,11 @@ export interface ExchangeContract extends ContractInstance {
canceltakerTokenAmount: BigNumber.BigNumber,
txOpts?: TxOpts) => number;
};
batchCancel: {
(orderAddresses: OrderAddresses[], orderValues: OrderValues[], cancelAmount: BigNumber.BigNumber[],
batchCancelOrders: {
(orderAddresses: OrderAddresses[], orderValues: OrderValues[], cancelTakerTokenAmounts: BigNumber.BigNumber[],
txOpts?: TxOpts): ContractResponse;
estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[], cancelAmount: BigNumber.BigNumber[],
estimateGas: (orderAddresses: OrderAddresses[], orderValues: OrderValues[],
cancelTakerTokenAmounts: BigNumber.BigNumber[],
txOpts?: TxOpts) => number;
};
fillOrKill: {