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

Move thirdparty wallet definitions in ethereumjs-wallet out of root into /thirdparty #325

Merged
merged 14 commits into from
Oct 27, 2017
Merged

Move thirdparty wallet definitions in ethereumjs-wallet out of root into /thirdparty #325

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
58ec7a9
Progress commit -- ethereumjs-wallet typings
Oct 21, 2017
3924dad
Add hdkey module + better wallet typing
Oct 21, 2017
de8e607
Add provider-engine typings
Oct 21, 2017
143c7eb
Add jsdoc descriptions for hdkey constructor methods
Oct 21, 2017
28a8047
Fix missing return type
Oct 21, 2017
9aab2fa
Fix another missing return
Oct 21, 2017
77cb185
Make provider engine options optional
Oct 21, 2017
2d5f390
Add priv/pubkey members to wallet instance
Oct 21, 2017
dfdd3a9
Use proper interface naming for V3Wallet
Oct 21, 2017
926a3c0
Use proper interface naming for PublicKeyOnlyWallet
Oct 21, 2017
a3af301
Merge branch 'develop' into ethereumjs-wallet
dternyak Oct 25, 2017
60e76f4
merge 'develop' into 'ethereumjs-wallet' and fix conflicts
dternyak Oct 26, 2017
5cc7582
Fix definition module for thirdparty wallets
Oct 27, 2017
cecb9cb
Merge develop
Oct 27, 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
70 changes: 39 additions & 31 deletions common/typescript/ethereumjs-wallet.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,45 @@ declare module 'ethereumjs-wallet/provider-engine' {
}
}

declare module 'ethereumjs-wallet/thirdparty' {
import {
IPublicKeyOnlyWallet,
IFullWallet,
IEtherWalletLocked,
IEtherWalletUnlocked
} from 'ethereumjs-wallet';
/**
* @description import a brain wallet used by Ether.Camp
* @param input
* @param password
*/
function fromEtherCamp(passphrase: string): IFullWallet;

/**
* @description import a wallet generated by EtherWallet
* @param input
* @param password
*/
function fromEtherWallet(
input: IEtherWalletLocked | IEtherWalletUnlocked | string,
password: string
): IFullWallet;

/**
* @description import a wallet from a KryptoKit seed
* @param entropy
* @param seed
*/
function fromKryptoKit(entropy: string, seed: string): IFullWallet;

/**
* @description import a brain wallet used by Quorum Wallet
* @param passphrase
* @param userid
*/
function fromQuorumWallet(passphrase: string, userid: string): IFullWallet;
}

declare module 'ethereumjs-wallet/hdkey' {
import { Buffer } from 'buffer';
import { IPublicKeyOnlyWallet, IFullWallet } from 'ethereumjs-wallet';
Expand Down Expand Up @@ -293,35 +332,4 @@ declare module 'ethereumjs-wallet' {
input: IPresaleWallet | string,
password: string
): IFullWallet;

/**
* @description import a brain wallet used by Ether.Camp
* @param input
* @param password
*/
function fromEtherCamp(passphrase: string): IFullWallet;

/**
* @description import a wallet generated by EtherWallet
* @param input
* @param password
*/
function fromEtherWallet(
input: IEtherWalletLocked | IEtherWalletUnlocked | string,
password: string
): IFullWallet;

/**
* @description import a wallet from a KryptoKit seed
* @param entropy
* @param seed
*/
function fromKryptoKit(entropy: string, seed: string): IFullWallet;

/**
* @description import a brain wallet used by Quorum Wallet
* @param passphrase
* @param userid
*/
function fromQuorumWallet(passphrase: string, userid: string): IFullWallet;
}