From 76f4d67f33af208e83eea5bcfa8802ce0e482901 Mon Sep 17 00:00:00 2001 From: Cavan Date: Wed, 6 Jun 2018 00:01:19 -0600 Subject: Remove timestamps and fix typings --- packages/subproviders/CHANGELOG.json | 8 ++++++++ packages/subproviders/src/subproviders/eth_lightwallet.ts | 14 ++++++++++++-- .../typescript-typings/types/eth-lightwallet/index.d.ts | 8 +++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index 65a74f7a8..c4dca2864 100644 --- a/packages/subproviders/CHANGELOG.json +++ b/packages/subproviders/CHANGELOG.json @@ -1,4 +1,12 @@ [ + { + "version": "0.11.0", + "changes": [ + { + "note": "Add `EthLightwalletSubprovider`" + } + ] + }, { "timestamp": 1529397769, "version": "0.10.4", diff --git a/packages/subproviders/src/subproviders/eth_lightwallet.ts b/packages/subproviders/src/subproviders/eth_lightwallet.ts index af4ea77e9..fedcc9578 100644 --- a/packages/subproviders/src/subproviders/eth_lightwallet.ts +++ b/packages/subproviders/src/subproviders/eth_lightwallet.ts @@ -57,7 +57,12 @@ export class EthLightwalletSubprovider extends BaseWalletSubprovider { const tx = new EthereumTx(txParams); const txHex = tx.serialize().toString('hex'); - let signedTxHex: string = this._signing.signTx(this._keystore, this._pwDerivedKey, txHex, txParams.from); + let signedTxHex: string = this._signing.signTx( + this._keystore, + this._pwDerivedKey, + txHex, + txParams.from, + ); signedTxHex = `0x${signedTxHex}`; @@ -79,7 +84,12 @@ export class EthLightwalletSubprovider extends BaseWalletSubprovider { } assert.isHexString('data', data); assert.isETHAddressHex('address', address); - const result: ECSignatureBuffer = this._signing.signMsgHash(this._keystore, this._pwDerivedKey, data, address); + const result: ECSignatureBuffer = await this._signing.signMsgHash( + this._keystore, + this._pwDerivedKey, + data, + address, + ); 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 d31e67fc4..b871fb289 100644 --- a/packages/typescript-typings/types/eth-lightwallet/index.d.ts +++ b/packages/typescript-typings/types/eth-lightwallet/index.d.ts @@ -3,7 +3,12 @@ declare module 'eth-lightwallet' { import { ECSignatureBuffer } from '@0xproject/types'; interface signing { - signTx(keystore: keystore, pwDerivedKey: Uint8Array, rawTx: string, signingAddress: string): string; + signTx( + keystore: keystore, + pwDerivedKey: Uint8Array, + rawTx: string, + signingAddress: string, + ): string; signMsg( keystore: keystore, pwDerivedKey: Uint8Array, @@ -26,6 +31,7 @@ declare module 'eth-lightwallet' { salt?: string; hdPathString: string; } + export class keystore { public static createVault( options: VaultOptions, -- cgit v1.2.3