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

Fix build errors

Browse Source
This commit is contained in:
Amir Bandeali
2018-04-02 15:28:56 -07:00
parent 3541f5e1da
commit 7a66da5a51
5 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/contracts/src/contracts/current/protocol/Exchange/MixinExchangeCore.sol
View File

@@ -134,7 +134,7 @@ contract MixinExchangeCore is
// Validate order is not cancelled
if (order.salt < makerEpoch[order.makerAddress]) {
LogError(uint8(Errors.ORDER_FULLY_FILLED_OR_CANCELLED), orderHash);
LogError(uint8(Errors.ORDER_CANCELLED), orderHash);
return 0;
}

10
packages/contracts/src/utils/exchange_wrapper.ts
View File

@@ -154,14 +154,8 @@ export class ExchangeWrapper {
const tx = await this._getTxWithDecodedExchangeLogsAsync(txHash);
return tx;
}
public async cancelOrdersUpToAsync(
salt: BigNumber,
from: string,
): Promise<TransactionReceiptWithDecodedLogs> {
const txHash = await this._exchange.cancelOrdersUpTo.sendTransactionAsync(
salt,
{ from },
);
public async cancelOrdersUpToAsync(salt: BigNumber, from: string): Promise<TransactionReceiptWithDecodedLogs> {
const txHash = await this._exchange.cancelOrdersUpTo.sendTransactionAsync(salt, { from });
const tx = await this._getTxWithDecodedExchangeLogsAsync(txHash);
return tx;
}

7
packages/contracts/src/utils/log_decoder.ts
View File

@@ -1,7 +1,6 @@
import { LogWithDecodedArgs, RawLog } from '@0xproject/types';
import { AbiDefinition, LogEntry, LogWithDecodedArgs, RawLog } from '@0xproject/types';
import { AbiDecoder, BigNumber } from '@0xproject/utils';
import * as _ from 'lodash';
import * as Web3 from 'web3';
import { artifacts } from './artifacts';
import { Artifact } from './types';
@@ -12,7 +11,7 @@ export class LogDecoder {
if (_.isUndefined(networkIdIfExists)) {
throw new Error('networkId not specified');
}
const abiArrays: Web3.AbiDefinition[][] = [];
const abiArrays: AbiDefinition[][] = [];
_.forEach(artifacts, (artifact: Artifact) => {
const networkIfExists = artifact.networks[networkIdIfExists];
if (_.isUndefined(networkIfExists)) {
@@ -22,7 +21,7 @@ export class LogDecoder {
});
this._abiDecoder = new AbiDecoder(abiArrays);
}
public decodeLogOrThrow<ArgsType>(log: Web3.LogEntry): LogWithDecodedArgs<ArgsType> | RawLog {
public decodeLogOrThrow<ArgsType>(log: LogEntry): LogWithDecodedArgs<ArgsType> | RawLog {
const logWithDecodedArgsOrLog = this._abiDecoder.tryToDecodeLogOrNoop(log);
if (_.isUndefined((logWithDecodedArgsOrLog as LogWithDecodedArgs<ArgsType>).args)) {
throw new Error(`Unable to decode log: ${JSON.stringify(log)}`);