crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Introduce BlockWithoutTransactionData and BlockWithTransactionData

Browse Source
This commit is contained in:
Leonid Logvinov
2017-07-26 15:11:33 +02:00
parent 67722c0fb8
commit cf8678b979
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/web3-typescript-typings/index.d.ts vendored
View File

@@ -121,22 +121,22 @@ declare module 'web3' {
solidity(sourceString: string, cb?: (err: any, result: any) => void): object,
}
getBlock(hashStringOrBlockNumber: string|Web3.BlockParam): Web3.Block;
getBlock(hashStringOrBlockNumber: string|Web3.BlockParam): Web3.BlockWithoutTransactionData;
getBlock(hashStringOrBlockNumber: string|Web3.BlockParam,
callback: (err: Error, blockObj: Web3.Block) => void): void;
callback: (err: Error, blockObj: Web3.BlockWithoutTransactionData) => void): void;
getBlock(hashStringOrBlockNumber: string|Web3.BlockParam,
returnTransactionObjects: true): Web3.BlockWithTransactions;
returnTransactionObjects: true): Web3.BlockWithTransactionData;
getBlock(hashStringOrBlockNumber: string|Web3.BlockParam, returnTransactionObjects: true,
callback: (err: Error, blockObj: Web3.BlockWithTransactions) => void): void;
callback: (err: Error, blockObj: Web3.BlockWithTransactionData) => void): void;
getBlockTransactionCount(hashStringOrBlockNumber: string|Web3.BlockParam): number;
getBlockTransactionCount(hashStringOrBlockNumber: string|Web3.BlockParam,
callback: (err: Error, blockTransactionCount: number) => void): void;
// TODO returnTransactionObjects
getUncle(hashStringOrBlockNumber: string|Web3.BlockParam, uncleNumber: number): Web3.Block;
getUncle(hashStringOrBlockNumber: string|Web3.BlockParam, uncleNumber: number): Web3.BlockWithoutTransactionData;
getUncle(hashStringOrBlockNumber: string|Web3.BlockParam, uncleNumber: number,
callback: (err: Error, uncle: Web3.Block) => void): void;
callback: (err: Error, uncle: Web3.BlockWithoutTransactionData) => void): void;
getTransaction(transactionHash: string): Web3.Transaction;
getTransaction(transactionHash: string,
@@ -232,7 +232,7 @@ declare module 'web3' {
stopWatching(): void;
}
interface Block {
interface AbstractBlock {
number: number|null;
hash: string|null;
parentHash: string;
@@ -251,9 +251,12 @@ declare module 'web3' {
timestamp: number;
uncles: Array<string>;
}
interface BlockWithTransactions extends Block {
interface BlockWithoutTransactionData extends AbstractBlock {
transactions: Array<string>;
}
interface BlockWithTransactionData extends AbstractBlock {
transactions: Array<Transaction>;
}
interface Transaction {
hash: string;