aboutsummaryrefslogtreecommitdiffstats
path: root/packages/website
diff options
context:
space:
mode:
authorFabio Berger <me@fabioberger.com>2017-12-20 01:02:50 +0800
committerFabio Berger <me@fabioberger.com>2017-12-20 01:02:50 +0800
commit06bd5a9b038c40d102db2cc8095bc08d79a547a8 (patch)
tree52508b9885b13321c80d0b2dd5a6ade9f9a11d63 /packages/website
parente38c7ff0760c766b92a7d19261a3a6f480adf567 (diff)
parent1316a2dd2a8971771f750d8a7f457212daad520b (diff)
downloaddexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar
dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.gz
dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.bz2
dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.lz
dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.xz
dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.tar.zst
dexon-sol-tools-06bd5a9b038c40d102db2cc8095bc08d79a547a8.zip
Merge branch 'development' into refactor/website
* development: Introduce an identityCommandBuilder Define types for methodID Define types for ethereumjs-abi Install types for yargs Fix comments Fix linter issues Fix linter error Rename SubscriptionOpts to BlockRange
Diffstat (limited to 'packages/website')
-rw-r--r--packages/website/ts/blockchain.ts6
-rw-r--r--packages/website/ts/containers/zero_ex_js_documentation.tsx1
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/website/ts/blockchain.ts b/packages/website/ts/blockchain.ts
index 529fd032f..d3bf6dda4 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',