Update website to support latest ledger

This commit is contained in:
Jacob Evans 2018-04-11 15:12:02 +10:00
parent b08c616713
commit f44ef7ce59
No known key found for this signature in database
GPG Key ID: 2036DA2ADDFB0842
5 changed files with 26 additions and 16 deletions

25
packages/subproviders/package-lock.json generated Normal file
View File

@ -0,0 +1,25 @@
{
"name": "@0xproject/subproviders",
"version": "0.8.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
"@types/bip39": {
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/@types/bip39/-/bip39-2.4.0.tgz",
"integrity": "sha512-qxJBGh55SPbSGv+91D6H3WOR8vKdA/p8Oc58oK/DTbORgjO6Ebuo8MRzdy2OWi+dw/lxtX4VWJkkCUTSQvhAnw==",
"dev": true,
"requires": {
"@types/node": "9.6.2"
},
"dependencies": {
"@types/node": {
"version": "9.6.2",
"resolved": "https://registry.npmjs.org/@types/node/-/node-9.6.2.tgz",
"integrity": "sha512-UWkRY9X7RQHp5OhhRIIka58/gVVycL1zHZu0OTsT5LI86ABaMOSbUjAl+b0FeDhQcxclrkyft3kW5QWdMRs8wQ==",
"dev": true
}
}
}
}
}

View File

@ -18,7 +18,6 @@ export {
Callback, Callback,
ErrorCallback, ErrorCallback,
NextCallback, NextCallback,
LedgerWalletSubprovider,
LedgerCommunicationClient, LedgerCommunicationClient,
NonceSubproviderErrors, NonceSubproviderErrors,
LedgerSubproviderConfigs, LedgerSubproviderConfigs,

View File

@ -69,12 +69,6 @@ export interface LedgerGetAddressResult {
chainCode: string; chainCode: string;
} }
export interface LedgerWalletSubprovider {
getPath: () => string;
setPath: (path: string) => void;
setPathIndex: (pathIndex: number) => void;
}
export interface PartialTxParams { export interface PartialTxParams {
nonce: string; nonce: string;
gasPrice?: string; gasPrice?: string;

View File

@ -20,7 +20,6 @@ import {
InjectedWeb3Subprovider, InjectedWeb3Subprovider,
ledgerEthereumBrowserClientFactoryAsync, ledgerEthereumBrowserClientFactoryAsync,
LedgerSubprovider, LedgerSubprovider,
LedgerWalletSubprovider,
RedundantRPCSubprovider, RedundantRPCSubprovider,
} from '@0xproject/subproviders'; } from '@0xproject/subproviders';
import { Provider } from '@0xproject/types'; import { Provider } from '@0xproject/types';
@ -76,7 +75,7 @@ export class Blockchain {
private _userAddressIfExists: string; private _userAddressIfExists: string;
private _cachedProvider: Provider; private _cachedProvider: Provider;
private _cachedProviderNetworkId: number; private _cachedProviderNetworkId: number;
private _ledgerSubprovider: LedgerWalletSubprovider; private _ledgerSubprovider: LedgerSubprovider;
private _defaultGasPrice: BigNumber; private _defaultGasPrice: BigNumber;
private static _getNameGivenProvider(provider: Provider): string { private static _getNameGivenProvider(provider: Provider): string {
const providerType = utils.getProviderType(provider); const providerType = utils.getProviderType(provider);
@ -168,12 +167,6 @@ export class Blockchain {
} }
this._ledgerSubprovider.setPath(path); this._ledgerSubprovider.setPath(path);
} }
public updateLedgerDerivationIndex(pathIndex: number) {
if (_.isUndefined(this._ledgerSubprovider)) {
return; // noop
}
this._ledgerSubprovider.setPathIndex(pathIndex);
}
public async updateProviderToLedgerAsync(networkId: number) { public async updateProviderToLedgerAsync(networkId: number) {
utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.'); utils.assert(!_.isUndefined(this._zeroEx), 'ZeroEx must be instantiated.');

View File

@ -199,7 +199,6 @@ export class LedgerConfigDialog extends React.Component<LedgerConfigDialogProps,
} }
private _onAddressSelected(selectedRowIndexes: number[]) { private _onAddressSelected(selectedRowIndexes: number[]) {
const selectedRowIndex = selectedRowIndexes[0]; const selectedRowIndex = selectedRowIndexes[0];
this.props.blockchain.updateLedgerDerivationIndex(selectedRowIndex);
const selectedAddress = this.state.userAddresses[selectedRowIndex]; const selectedAddress = this.state.userAddresses[selectedRowIndex];
const selectAddressBalance = this.state.addressBalances[selectedRowIndex]; const selectAddressBalance = this.state.addressBalances[selectedRowIndex];
this.props.dispatcher.updateUserAddress(selectedAddress); this.props.dispatcher.updateUserAddress(selectedAddress);