Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes to TypeScript definitions #1131

Merged
merged 11 commits into from
Oct 24, 2017
Merged

Fixes to TypeScript definitions #1131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6ba821f
removed privateKey from web3.eth.signTransaction and web3.eth.account…
Oct 15, 2017
4ce9e6d
removed privateKey from web3.eth.signTransaction and web3.eth.account…
Oct 15, 2017
21ddda0
added vscode to gitignore and minor doco change
Oct 15, 2017
8a266a5
Added test to show privateKey can not be passed to accounts.signTrans…
Oct 15, 2017
f8b5eae
minor doco change
Oct 15, 2017
8a1393f
Merge branch '1.0' into 1.0
frozeman Oct 19, 2017
3752fb2
removed passing of private key
Oct 19, 2017
575d098
Merge branch '1.0' of https://github.com/naddison36/web3.js into 1.0
Oct 19, 2017
003c254
Merge commit '037b116bd2c034073816ccf7d6d69d4b41524879' into 1.0
Oct 21, 2017
6305866
Added Eth.signTransaction function
Oct 21, 2017
3daf969
reversing changes so my forked 1.0 branch is in sync with the upstrea…
Oct 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ bower_components
/bower
.idea/
.npm/
.vscode/
2 changes: 1 addition & 1 deletion packages/web3/index.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ declare class Web3 {
Shh: new (provider: t.Provider) => t.Shh
Bzz: new (provider: t.Provider) => t.Bzz
}
constructor(provider: t.Provider)
constructor(provider: t.Provider | string)
version: string
BatchRequest: new () => t.BatchRequest
extend(methods: any): any // TODO
Expand Down
23 changes: 22 additions & 1 deletion packages/web3/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,22 @@ export declare interface TransactionReceipt {
logs?: Array<Log>
events?: {
[eventName: string]: EventLog
},
status: string
}
export declare interface EncodedTransaction {
raw: string,
tx: {
nonce: string,
gasPrice: string,
gas: string,
to: string,
value: string,
input: string,
v: string,
r: string,
s: string,
hash: string
}
}
export declare interface BlockHeader {
Expand Down Expand Up @@ -265,6 +281,10 @@ export declare interface Contract {
options: {
address: string
jsonInterface: ABIDefinition[]
data: string
from: string
gasPrice: string
gas: number
}
methods: {
[fnName: string]: (...args) => TransactionObject<any>
Expand Down Expand Up @@ -313,7 +333,7 @@ export declare class Eth {
}
accounts: {
'new'(entropy?: string): Account
privateToAccount(privKey: string): Account
privateKeyToAccount(privKey: string): Account
publicToAddress(key: string): string
signTransaction(tx: Tx, privateKey: string, returnSignature?: boolean, cb?: (err: Error, result: string | Signature) => void): Promise<string> | Signature
recoverTransaction(signature: string | Signature): string
Expand Down Expand Up @@ -376,6 +396,7 @@ export declare class Eth {
isSyncing(cb?: Callback<boolean>): Promise<boolean>
net: Net
personal: Personal
signTransaction(tx: Tx, address?: string, cb?: Callback<string>): Promise<EncodedTransaction>
sendSignedTransaction(data: string, cb?: Callback<string>): PromiEvent<TransactionReceipt>
sendTransaction(tx: Tx, cb?: Callback<string>): PromiEvent<TransactionReceipt>
submitWork(nonce: string, powHash: string, digest: string, cb?: Callback<boolean>): Promise<boolean>
Expand Down