From 687802394a6959ca5058ae1a4445d513d04062c6 Mon Sep 17 00:00:00 2001
From: Jacob Evans <jacob@dekz.net>
Date: Mon, 2 Jul 2018 18:09:05 +1000
Subject: Remove duplicate type definitions.

Clear private key earlier
Fix changelog in typescript-typings from bad merge
---
 packages/subproviders/src/globals.d.ts             | 58 ----------------------
 .../subproviders/eth_lightwallet_subprovider.ts    |  2 +-
 packages/typescript-typings/CHANGELOG.json         |  1 +
 3 files changed, 2 insertions(+), 59 deletions(-)

(limited to 'packages')

diff --git a/packages/subproviders/src/globals.d.ts b/packages/subproviders/src/globals.d.ts
index 287d5e0fe..94e63a32d 100644
--- a/packages/subproviders/src/globals.d.ts
+++ b/packages/subproviders/src/globals.d.ts
@@ -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' {
     const json: any;
     /* tslint:disable */
diff --git a/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts b/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
index b594ffb24..3cd94dac3 100644
--- a/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
+++ b/packages/subproviders/src/subproviders/eth_lightwallet_subprovider.ts
@@ -49,8 +49,8 @@ export class EthLightwalletSubprovider extends BaseWalletSubprovider {
         // respects this as it uses the parameters passed in
         let privKey = this._keystore.exportPrivateKey(txParams.from, this._pwDerivedKey);
         const privKeyWallet = new PrivateKeyWalletSubprovider(privKey);
-        const privKeySignature = await privKeyWallet.signTransactionAsync(txParams);
         privKey = '';
+        const privKeySignature = await privKeyWallet.signTransactionAsync(txParams);
         return privKeySignature;
     }
     /**
diff --git a/packages/typescript-typings/CHANGELOG.json b/packages/typescript-typings/CHANGELOG.json
index 2e4b8dfdf..1d4230783 100644
--- a/packages/typescript-typings/CHANGELOG.json
+++ b/packages/typescript-typings/CHANGELOG.json
@@ -6,6 +6,7 @@
                 "note": "Add types for `eth-lightwallet`",
                 "pr": 775
             },
+            {
                 "note": "Improve 'web3-provider-engine' typings",
                 "pr": 768
             },
-- 
cgit