Remove duplicate type definitions.

Clear private key earlier
Fix changelog in typescript-typings from bad merge
This commit is contained in:
Jacob Evans
2018-07-02 18:09:05 +10:00
parent ad570b8ae1
commit 687802394a
3 changed files with 2 additions and 59 deletions

View File

@@ -1,61 +1,3 @@
// tslint:disable:max-classes-per-file
// tslint:disable:class-name
// tslint:disable:async-suffix
// tslint:disable:completed-docs
// Ethereumjs-tx declarations
// Ledgerco declarations
interface ECSignatureString {
v: string;
r: string;
s: string;
}
interface ECSignature {
v: number;
r: string;
s: string;
}
interface ECSignatureBuffer {
v: number;
r: Buffer;
s: Buffer;
}
interface LedgerTransport {
close(): Promise<void>;
}
declare module '@ledgerhq/hw-app-eth' {
class Eth {
public transport: LedgerTransport;
constructor(transport: LedgerTransport);
public getAddress(
path: string,
boolDisplay?: boolean,
boolChaincode?: boolean,
): Promise<{ publicKey: string; address: string; chainCode: string }>;
public signTransaction(path: string, rawTxHex: string): Promise<ECSignatureString>;
public getAppConfiguration(): Promise<{ arbitraryDataEnabled: number; version: string }>;
public signPersonalMessage(path: string, messageHex: string): Promise<ECSignature>;
}
export default Eth;
}
declare module '@ledgerhq/hw-transport-u2f' {
export default class TransportU2F implements LedgerTransport {
public static create(): Promise<LedgerTransport>;
public close(): Promise<void>;
}
}
declare module '@ledgerhq/hw-transport-node-hid' {
export default class TransportNodeHid implements LedgerTransport {
public static create(): Promise<LedgerTransport>;
public close(): Promise<void>;
}
}
declare module '*.json' { declare module '*.json' {
const json: any; const json: any;
/* tslint:disable */ /* tslint:disable */

View File

@@ -49,8 +49,8 @@ export class EthLightwalletSubprovider extends BaseWalletSubprovider {
// respects this as it uses the parameters passed in // respects this as it uses the parameters passed in
let privKey = this._keystore.exportPrivateKey(txParams.from, this._pwDerivedKey); let privKey = this._keystore.exportPrivateKey(txParams.from, this._pwDerivedKey);
const privKeyWallet = new PrivateKeyWalletSubprovider(privKey); const privKeyWallet = new PrivateKeyWalletSubprovider(privKey);
const privKeySignature = await privKeyWallet.signTransactionAsync(txParams);
privKey = ''; privKey = '';
const privKeySignature = await privKeyWallet.signTransactionAsync(txParams);
return privKeySignature; return privKeySignature;
} }
/** /**

View File

@@ -6,6 +6,7 @@
"note": "Add types for `eth-lightwallet`", "note": "Add types for `eth-lightwallet`",
"pr": 775 "pr": 775
}, },
{
"note": "Improve 'web3-provider-engine' typings", "note": "Improve 'web3-provider-engine' typings",
"pr": 768 "pr": 768
}, },