From 235d78565e4d809d3ec1b91174fd0a831c126202 Mon Sep 17 00:00:00 2001 From: Cavan Date: Mon, 4 Jun 2018 16:24:37 -0600 Subject: Format subprovider using prettier --- .../src/subproviders/eth_lightwallet.ts | 2 ++ .../types/eth-lightwallet/index.d.ts | 24 ++++++---------------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/packages/subproviders/src/subproviders/eth_lightwallet.ts b/packages/subproviders/src/subproviders/eth_lightwallet.ts index fedcc9578..970c5d981 100644 --- a/packages/subproviders/src/subproviders/eth_lightwallet.ts +++ b/packages/subproviders/src/subproviders/eth_lightwallet.ts @@ -62,6 +62,7 @@ export class EthLightwalletSubprovider extends BaseWalletSubprovider { this._pwDerivedKey, txHex, txParams.from, + this._keystore.hdPathString, ); signedTxHex = `0x${signedTxHex}`; @@ -89,6 +90,7 @@ export class EthLightwalletSubprovider extends BaseWalletSubprovider { this._pwDerivedKey, data, address, + this._keystore.hdPathString, ); const signature = this._signing.concatSig(result); diff --git a/packages/typescript-typings/types/eth-lightwallet/index.d.ts b/packages/typescript-typings/types/eth-lightwallet/index.d.ts index b871fb289..a226d8049 100644 --- a/packages/typescript-typings/types/eth-lightwallet/index.d.ts +++ b/packages/typescript-typings/types/eth-lightwallet/index.d.ts @@ -2,41 +2,29 @@ declare module 'eth-lightwallet' { import { ECSignatureBuffer } from '@0xproject/types'; - interface signing { - signTx( + export class signing { + public static signTx( keystore: keystore, pwDerivedKey: Uint8Array, rawTx: string, signingAddress: string, ): string; - signMsg( + public static signMsg( keystore: keystore, pwDerivedKey: Uint8Array, rawMsg: string, signingAddress: string, ): ECSignatureBuffer; - signMsgHash( + public static signMsgHash( keystore: keystore, pwDerivedKey: Uint8Array, msgHash: string, signingAddress: string, ): ECSignatureBuffer; - concatSig(signature: any): string; + public static concatSig(signature: any): string; } - export const signing: signing; - - interface VaultOptions { - password: string; - seedPhrase: string; - salt?: string; - hdPathString: string; - } - export class keystore { - public static createVault( - options: VaultOptions, - callback?: (error: Error, keystore: keystore) => void, - ): keystore; + public static createVault(options: any, callback?: (error: Error, keystore: keystore) => void): keystore; public static generateRandomSeed(): string; public static isSeedValid(seed: string): boolean; public static deserialize(keystore: string): keystore; -- cgit v1.2.3