From 8521775389b2e7ddefec20f1d06331e4bc3d0540 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 5 Mar 2018 21:05:30 -0500 Subject: Update ledgerco packages --- packages/subproviders/src/index.ts | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'packages/subproviders/src/index.ts') diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index 4da405ec0..566743fd0 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -1,8 +1,10 @@ import { - comm_node as LedgerNodeCommunication, - comm_u2f as LedgerBrowserCommunication, - eth as LedgerEthereumClientFn, -} from 'ledgerco'; + Eth as LedgerEthereumClientFn, +} from '@ledgerhq/hw-app-eth'; + +import { + TransportU2F as LedgerBrowserCommunication, +} from '@ledgerhq/hw-transport-u2f'; import { LedgerEthereumClient } from './types'; @@ -19,17 +21,17 @@ export { ECSignature, LedgerWalletSubprovider, LedgerCommunicationClient, NonceS * @return LedgerEthereumClient A browser client */ export async function ledgerEthereumBrowserClientFactoryAsync(): Promise { - const ledgerConnection = await LedgerBrowserCommunication.create_async(); + const ledgerConnection = await LedgerBrowserCommunication.create(); const ledgerEthClient = new LedgerEthereumClientFn(ledgerConnection); return ledgerEthClient; } -/** - * A factory for creating a LedgerEthereumClient usable in a Node.js context. - * @return LedgerEthereumClient A Node.js client - */ -export async function ledgerEthereumNodeJsClientFactoryAsync(): Promise { - const ledgerConnection = await LedgerNodeCommunication.create_async(); - const ledgerEthClient = new LedgerEthereumClientFn(ledgerConnection); - return ledgerEthClient; -} +// /** +// * A factory for creating a LedgerEthereumClient usable in a Node.js context. +// * @return LedgerEthereumClient A Node.js client +// */ +// export async function ledgerEthereumNodeJsClientFactoryAsync(): Promise { +// const ledgerConnection = await LedgerNodeCommunication.create_async(); +// const ledgerEthClient = new LedgerEthereumClientFn(ledgerConnection); +// return ledgerEthClient; +// } -- cgit v1.2.3 From 71e7e9c9c3ed89c1c25f46085c0968a62099cb5a Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 5 Mar 2018 21:07:07 -0500 Subject: Remove old ledger --- packages/subproviders/src/index.ts | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'packages/subproviders/src/index.ts') diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index 566743fd0..d296c7be6 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -25,13 +25,3 @@ export async function ledgerEthereumBrowserClientFactoryAsync(): Promise { -// const ledgerConnection = await LedgerNodeCommunication.create_async(); -// const ledgerEthClient = new LedgerEthereumClientFn(ledgerConnection); -// return ledgerEthClient; -// } -- cgit v1.2.3 From 7bfc499ec8e50778dd33183646dd19ef66496052 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Mon, 5 Mar 2018 22:14:00 -0500 Subject: Nuke tests for now --- packages/subproviders/src/index.ts | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'packages/subproviders/src/index.ts') diff --git a/packages/subproviders/src/index.ts b/packages/subproviders/src/index.ts index d296c7be6..e22b6f5f3 100644 --- a/packages/subproviders/src/index.ts +++ b/packages/subproviders/src/index.ts @@ -1,10 +1,5 @@ -import { - Eth as LedgerEthereumClientFn, -} from '@ledgerhq/hw-app-eth'; - -import { - TransportU2F as LedgerBrowserCommunication, -} from '@ledgerhq/hw-transport-u2f'; +import Eth from '@ledgerhq/hw-app-eth'; +import TransportU2F from '@ledgerhq/hw-transport-u2f'; import { LedgerEthereumClient } from './types'; @@ -21,7 +16,7 @@ export { ECSignature, LedgerWalletSubprovider, LedgerCommunicationClient, NonceS * @return LedgerEthereumClient A browser client */ export async function ledgerEthereumBrowserClientFactoryAsync(): Promise { - const ledgerConnection = await LedgerBrowserCommunication.create(); - const ledgerEthClient = new LedgerEthereumClientFn(ledgerConnection); + const ledgerConnection = await TransportU2F.create(); + const ledgerEthClient = new Eth(ledgerConnection); return ledgerEthClient; } -- cgit v1.2.3