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

Update Exchange artifacts and adjust ExchangeWrapper

Browse Source
This commit is contained in:
Leonid Logvinov
2017-08-14 18:46:38 -05:00
parent 23e3546073
commit a7924cef04
3 changed files with 205 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

405
src/artifacts/Exchange.json
View File

File diff suppressed because one or more lines are too long

4
src/contract_wrappers/exchange_wrapper.ts
View File

@@ -669,7 +669,7 @@ export class ExchangeWrapper extends ContractWrapper {
);
const wouldRoundingErrorOccur = await this._isRoundingErrorAsync(
signedOrder.takerTokenAmount, fillTakerAmount, signedOrder.makerTokenAmount,
fillTakerAmount, signedOrder.takerTokenAmount, signedOrder.makerTokenAmount,
);
if (wouldRoundingErrorOccur) {
throw new Error(ExchangeContractErrs.OrderFillRoundingError);
@@ -714,7 +714,7 @@ export class ExchangeWrapper extends ContractWrapper {
await assert.isUserAddressAvailableAsync(this._web3Wrapper);
const exchangeInstance = await this._getExchangeContractAsync();
const isRoundingError = await exchangeInstance.isRoundingError.call(
demoninator, numerator, makerTokenAmount,
numerator, demoninator, makerTokenAmount,
);
return isRoundingError;
}

6
src/types.ts
View File

@@ -54,7 +54,7 @@ export interface ExchangeContract extends ContractInstance {
call: (orderHash: string) => BigNumber.BigNumber;
};
isRoundingError: {
call: (takerTokenAmount: BigNumber.BigNumber, fillTakerAmount: BigNumber.BigNumber,
call: (fillTakerAmount: BigNumber.BigNumber, takerTokenAmount: BigNumber.BigNumber,
makerTokenAmount: BigNumber.BigNumber, txOpts?: TxOpts) => Promise<boolean>;
};
fillOrder: {
@@ -85,10 +85,10 @@ export interface ExchangeContract extends ContractInstance {
v: number[], r: string[], s: string[], txOpts?: TxOpts) => number;
};
cancelOrder: {
(orderAddresses: OrderAddresses, orderValues: OrderValues, canceltakerTokenAmount: BigNumber.BigNumber,
(orderAddresses: OrderAddresses, orderValues: OrderValues, cancelTakerTokenAmount: BigNumber.BigNumber,
txOpts?: TxOpts): ContractResponse;
estimateGas: (orderAddresses: OrderAddresses, orderValues: OrderValues,
canceltakerTokenAmount: BigNumber.BigNumber,
cancelTakerTokenAmount: BigNumber.BigNumber,
txOpts?: TxOpts) => number;
};
batchCancelOrders: {