Merge branch '1.0' into fix/send-signed-transaction

web3 · Mar 26, 2019 · e49da4f · e49da4f
2 parents ad5224d + 1e31cc2
commit e49da4f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/packages/web3-eth/types/index.d.ts b/packages/web3-eth/types/index.d.ts
@@ -40,7 +40,7 @@ import * as net from 'net';
 export class Eth extends AbstractWeb3Module {
     constructor(
         provider: provider,
-        net?: net.Socket|null,
+        net?: net.Socket | null,
         options?: Web3ModuleOptions
     );
 
@@ -54,10 +54,15 @@ export class Eth extends AbstractWeb3Module {
 
     clearSubscriptions(): Promise<boolean>;
 
-    subscribe(type: 'logs', options?: Logs, callback?: (error: Error, log: Log) => void): Subscription<Log>;
-    subscribe(type: 'syncing', options?: null, callback?: (error: Error, result: any) => void): Subscription<any>;
+    subscribe(type: 'logs', options?: LogsOptions, callback?: (error: Error, log: Log) => void): Subscription<Log>;
+    subscribe(type: 'syncing', options?: null, callback?: (error: Error, result: Syncing) => void): Subscription<Syncing>;
     subscribe(type: 'newBlockHeaders', options?: null, callback?: (error: Error, blockHeader: BlockHeader) => void): Subscription<BlockHeader>;
     subscribe(type: 'pendingTransactions', options?: null, callback?: (error: Error, transactionHash: string) => void): Subscription<string>;
+    subscribe(
+        type: 'pendingTransactions' | 'logs' | 'syncing' | 'newBlockHeaders',
+        options?: null | LogsOptions,
+        callback?: (error: Error, item: Log | Syncing | BlockHeader | string) => void
+    ): Subscription<Log | BlockHeader | Syncing | string>;
 
     getProtocolVersion(callback?: (error: Error, protocolVersion: string) => void): Promise<string>;
 
@@ -186,13 +191,13 @@ export interface Block extends BlockHeader {
 export interface PastLogsOptions {
     fromBlock?: number | string;
     toBlock?: number | string;
-    address: string | string[];
+    address?: string | string[];
     topics?: Array<string | string[]>;
 }
 
-export interface Logs {
-    fromBlock?: number
-    address?: string
+export interface LogsOptions {
+    fromBlock?: number | string;
+    address?: string | string[];
     topics?: Array<string | string[]>
 }
 

diff --git a/packages/web3-eth/types/tests/eth.tests.ts b/packages/web3-eth/types/tests/eth.tests.ts
@@ -53,10 +53,10 @@ eth.subscribe('logs', {});
 // $ExpectType Subscription<Log>
 eth.subscribe('logs', {}, (error: Error, log: Log) => {});
 
-// $ExpectType Subscription<any>
+// $ExpectType Subscription<Syncing>
 eth.subscribe('syncing');
-// $ExpectType Subscription<any>
-eth.subscribe('syncing', null, (error: Error, result: any) => {});
+// $ExpectType Subscription<Syncing>
+eth.subscribe('syncing', null, (error: Error, result: Syncing) => {});
 
 // $ExpectType Subscription<BlockHeader>
 eth.subscribe('newBlockHeaders');