Merge branch 'overload_functions' of github.com:jbaylina/web3.js into…

… overload_functions
web3 · Nov 20, 2017 · d4d0f66 · d4d0f66
2 parents 3a40879 + b108e94
commit d4d0f66
Showing 1 changed file with 14 additions and 5 deletions.
diff --git a/packages/web3/types.d.ts b/packages/web3/types.d.ts
@@ -94,7 +94,7 @@ export declare interface EventLog {
  transactionHash: string
  blockHash: string
  blockNumber: number
- raw?: { data: string, topics: any[] }
+ raw?: { data: string, topics: string[] }
 }
 export declare interface TransactionReceipt {
  transactionHash: string
@@ -329,11 +329,20 @@ export declare interface Contract {
  [eventName: string]: (options?: {
  filter?: object
  fromBlock?: BlockType
- topics?: any[]
+ topics?: string[]
  }, cb?: Callback<EventLog>) => EventEmitter
- allEvents: (options?: { filter?: object, fromBlock?: BlockType, topics?: any[] }, cb?: Callback<EventLog>) => EventEmitter
- }
-
+ allEvents: (options?: { filter?: object, fromBlock?: BlockType, topics?: string[] }, cb?: Callback<EventLog>) => EventEmitter
+ },
+ getPastEvents(
+ event: string,
+ options?: {
+ filter?: object,
+ fromBlock?: BlockType,
+ toBlock?: BlockType,
+ topics?: string[]
+ },
+ cb?: Callback<EventLog[]>
+ ): Promise<EventLog[]>
 }
 export declare interface Request { }
 export declare interface Providers {