diff options
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/0x.ts | 3 | ||||
| -rw-r--r-- | src/contract_wrappers/exchange_wrapper.ts | 8 | ||||
| -rw-r--r-- | src/types.ts | 1 |
5 files changed, 12 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ae83db1a7..0d20f2cb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ # CHANGELOG +v0.6.1 - _Jul. 19, 2017_ +------------------------ + * Improve documentation v0.6.0 - _Jul. 19, 2017_ -------------- +------------------------ * Made `ZeroEx` class accept `Web3Provider` instance instead of `Web3` instance * Added types for contract event arguments v0.5.2 - _Jul. 15, 2017_ diff --git a/package.json b/package.json index bc2c36497..4e1177637 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@0xproject/0x.js", - "version": "0.6.0", + "version": "0.6.1", "description": "A javascript library for interacting with the 0x protocol", "keywords": [ "0x.js", @@ -38,7 +38,8 @@ export class ZeroEx { */ public exchange: ExchangeWrapper; /** - * An instance of the TokenRegistryWrapper class containing methods for interacting with the 0x TokenRegistry smart contract. + * An instance of the TokenRegistryWrapper class containing methods for interacting with the 0x + * TokenRegistry smart contract. */ public tokenRegistry: TokenRegistryWrapper; /** diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index 6b8ffd014..e33dd6f6e 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -131,9 +131,9 @@ export class ExchangeWrapper extends ContractWrapper { * Fills a signed order with an amount denominated in baseUnits of the taker token. * Since the order in which transactions are included in the next block is indeterminate, race-conditions * could arise where a users balance or allowance changes before the fillOrder executes. Because of this, - * we allow you to specify `shouldCheckTransfer`. If true, the smart contract will not throw if while - * executing, the parties do not have sufficient balances/allowances, preserving gas costs. Setting it to - * false forgoes this check and causes the smart contract to throw (using all the gas supplied) instead. + * we allow you to specify `shouldCheckTransfer`. If true, the smart contract will not throw if the parties + * do not have sufficient balances/allowances, preserving gas costs. Setting it to false forgoes this check + * and causes the smart contract to throw (using all the gas supplied) instead. * @param signedOrder An object that conforms to the SignedOrder interface. * @param takerTokenFillAmount The amount of the order (in taker tokens baseUnits) that you wish to fill. * @param shouldCheckTransfer Whether or not you wish for the contract call to throw if upon @@ -717,7 +717,7 @@ export class ExchangeWrapper extends ContractWrapper { private _throwErrorLogsAsErrors(logs: ContractEvent[]): void { const errEvent = _.find(logs, {event: 'LogError'}); if (!_.isUndefined(errEvent)) { - const errCode = (errEvent.args as LogErrorContractEventArgs).errorId.toNumber() + const errCode = (errEvent.args as LogErrorContractEventArgs).errorId.toNumber(); const errMessage = this._exchangeContractErrCodesToMsg[errCode]; throw new Error(errMessage); } diff --git a/src/types.ts b/src/types.ts index c4191ebd8..7f52970e6 100644 --- a/src/types.ts +++ b/src/types.ts @@ -310,6 +310,7 @@ export interface ContractEventEmitter { watch: (eventCallback: EventCallback) => void; stopWatchingAsync: () => Promise<void>; } + /** * We re-export the `Web3.Provider` type specified in the Web3 Typescript typings * since it is the type of the `provider` argument to the `ZeroEx` constructor. |