diff options
| author | Leonid <logvinov.leon@gmail.com> | 2017-12-19 19:10:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-19 19:10:59 +0800 |
| commit | 04268d7f4b4a8a3496518a450bfcf01bb056a57e (patch) | |
| tree | 089c743f946ff175838b4ee3142d5ead1aecdc0c /packages/website/ts | |
| parent | c63f76dde7267c54328d2f12f401d94484e5a91a (diff) | |
| parent | 156dae1d33bd0a19c764262fbf0c9d6743425fc6 (diff) | |
| download | dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.gz dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.bz2 dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.lz dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.xz dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.tar.zst dexon-sol-tools-04268d7f4b4a8a3496518a450bfcf01bb056a57e.zip | |
Merge pull request #272 from 0xProject/fix/subscription-opts
Rename SubscriptionOpts to BlockRange
Diffstat (limited to 'packages/website/ts')
| -rw-r--r-- | packages/website/ts/blockchain.ts | 6 | ||||
| -rw-r--r-- | packages/website/ts/containers/zero_ex_js_documentation.tsx | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts index a42b19cff..2a4aabeb2 100644 --- a/packages/website/ts/blockchain.ts +++ b/packages/website/ts/blockchain.ts @@ -1,5 +1,6 @@ import { BlockParam, + BlockRange, DecodedLogEvent, ExchangeContractEventArgs, ExchangeEvents, @@ -9,7 +10,6 @@ import { LogWithDecodedArgs, Order, SignedOrder, - SubscriptionOpts, Token as ZeroExToken, TransactionReceiptWithDecodedLogs, ZeroEx, @@ -524,12 +524,12 @@ export class Blockchain { } private async fetchHistoricalExchangeLogFillEventsAsync(indexFilterValues: IndexedFilterValues) { const fromBlock = tradeHistoryStorage.getFillsLatestBlock(this.userAddress, this.networkId); - const subscriptionOpts: SubscriptionOpts = { + const blockRange: BlockRange = { fromBlock, toBlock: 'latest' as BlockParam, }; const decodedLogs = await this.zeroEx.exchange.getLogsAsync<LogFillContractEventArgs>( - ExchangeEvents.LogFill, subscriptionOpts, indexFilterValues, + ExchangeEvents.LogFill, blockRange, indexFilterValues, ); for (const decodedLog of decodedLogs) { if (!this.doesLogEventInvolveUser(decodedLog)) { diff --git a/packages/website/ts/containers/zero_ex_js_documentation.tsx b/packages/website/ts/containers/zero_ex_js_documentation.tsx index 1ce9ba139..ded62d2bc 100644 --- a/packages/website/ts/containers/zero_ex_js_documentation.tsx +++ b/packages/website/ts/containers/zero_ex_js_documentation.tsx @@ -95,6 +95,7 @@ const docsInfoConfig: DocsInfoConfig = { 'ExchangeEvents', 'IndexedFilterValues', 'SubscriptionOpts', + 'BlockRange', 'BlockParam', 'OrderFillOrKillRequest', 'OrderCancellationRequest', |