diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7d8701138..c002c4ce6 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -70,6 +70,7 @@ import { TouchIdProvider } from '../providers/touchid/touchid'; import { TxFormatProvider } from '../providers/tx-format/tx-format'; import { WalletProvider } from '../providers/wallet/wallet'; import { ReleaseProvider } from '../providers/release/release'; +import { DerivationPathHelperProvider } from '../providers/derivationPathHelper/derivationPathHelper'; export function createTranslateLoader(http: Http) { return new TranslatePoHttpLoader(http, 'assets/i18n', '.po'); @@ -123,6 +124,7 @@ let providers: any = [ TxFormatProvider, WalletProvider, ReleaseProvider, + DerivationPathHelperProvider, { provide: ErrorHandler, useClass: IonicErrorHandler diff --git a/src/pages/add/import-wallet/import-wallet.html b/src/pages/add/import-wallet/import-wallet.html index ce8bd1597..d3da44e2d 100644 --- a/src/pages/add/import-wallet/import-wallet.html +++ b/src/pages/add/import-wallet/import-wallet.html @@ -8,7 +8,6 @@
Recovery phrase
File/Text
-
Hardware wallet
@@ -29,25 +28,6 @@ -
- - Wallet type - - {{opt.label}} - - - - - Account number - - - - - Shared wallet - - -
- @@ -67,11 +47,6 @@ - - From hardware wallet - - - Testnet diff --git a/src/pages/add/import-wallet/import-wallet.ts b/src/pages/add/import-wallet/import-wallet.ts index 8296d41df..11ae067c5 100644 --- a/src/pages/add/import-wallet/import-wallet.ts +++ b/src/pages/add/import-wallet/import-wallet.ts @@ -2,8 +2,10 @@ import { Component, OnInit } from '@angular/core'; import { NavController } from 'ionic-angular'; import { Validators, FormBuilder, FormGroup } from '@angular/forms'; -import { AppProvider } from '../../../providers/app/app'; -import * as _ from 'lodash'; +import { BwcProvider } from '../../../providers/bwc/bwc'; +import { WalletProvider } from '../../../providers/wallet/wallet'; +import { DerivationPathHelperProvider } from '../../../providers/derivationPathHelper/derivationPathHelper'; +import { ConfigProvider } from '../../../providers/config/config'; @Component({ selector: 'page-import-wallet', @@ -15,70 +17,45 @@ export class ImportWalletPage implements OnInit{ public selectedTab: string; public seedOptions: any; - private appName: string; private derivationPathByDefault: string; private derivationPathForTestnet: string; private importForm: FormGroup; constructor( public navCtrl: NavController, - private app: AppProvider, - private fb: FormBuilder + private fb: FormBuilder, + private bwc: BwcProvider, + private dpHelper: DerivationPathHelperProvider, + private wp: WalletProvider, + private cp: ConfigProvider, ) { this.selectedTab = 'words'; - this.derivationPathByDefault = "m/44'/0'/0'"; - this.derivationPathForTestnet = "m/44'/1'/0'"; + this.derivationPathByDefault = this.dpHelper.default; + this.derivationPathForTestnet = this.dpHelper.defaultTestnet; this.showAdvOpts = false; this.formData = { words: null, - text: null, - filePassword: null, - selectedSeed: null, - isShared: null, - account: 1, mnemonicPassword: null, + file: null, + filePassword: null, derivationPath: this.derivationPathByDefault, - fromHW: false, testnet: false, - bwsURL: 'https://bws.bitpay.com/bws/api', + bwsURL: this.cp.get()['bws']['url'], }; - this.appName = this.app.info.name; - this.updateSeedSourceSelect(); } ngOnInit() { this.importForm = this.fb.group({ words: ['', Validators.required], + mnemonicPassword: [''], file: [''], filePassword: [''], - selectedSeed: [''], - isShared: [''], - account: [''], - mnemonicPassword: [''], derivationPath: [''], - fromHW: [''], testnet: [''], bwsURL: [''], }); } - updateSeedSourceSelect() { - if (this.appName === 'bitpay') return; - - this.seedOptions = [{ - id: 'trezor', - label: 'Trezor hardware wallet', - supportsTestnet: false - }, { - id: 'ledger', - label: 'Ledger hardware wallet', - supportsTestnet: false - }]; - this.formData.selectedSeed = { - id: this.seedOptions[0].id - }; - } - selectTab(tab: string) { this.selectedTab = tab; @@ -105,13 +82,17 @@ export class ImportWalletPage implements OnInit{ this.importForm.get('filePassword').updateValueAndValidity(); } - seedOptionsChange(id: string) { - if (id === 'trezor') this.formData.isShared = null; - } - setDerivationPath() { this.formData.derivationPath = this.formData.testnet ? this.derivationPathForTestnet : this.derivationPathByDefault; } + + normalizeMnemonic(words: string) { + if (!words || !words.indexOf) return words; + var isJA = words.indexOf('\u3000') > -1; + var wordList = words.split(/[\u3000\s]+/); + + return wordList.join(isJA ? '\u3000' : ' '); + }; import() { console.log(this.formData); diff --git a/src/providers/derivationPathHelper/derivationPathHelper.ts b/src/providers/derivationPathHelper/derivationPathHelper.ts new file mode 100644 index 000000000..763a33306 --- /dev/null +++ b/src/providers/derivationPathHelper/derivationPathHelper.ts @@ -0,0 +1,59 @@ +import { Injectable } from '@angular/core'; + +@Injectable() +export class DerivationPathHelperProvider { + public default: string; + public defaultTestnet: string; + + public constructor() { + this.default = "m/44'/0'/0'"; + this.defaultTestnet = "m/44'/1'/0'"; + } + + parse(str: string) { + var arr = str.split('/'); + var ret = { + derivationStrategy: '', + networkName: '', + account: 0 + }; + + if (arr[0] != 'm') + return false; + + switch (arr[1]) { + case "44'": + ret.derivationStrategy = 'BIP44'; + break; + case "45'": + return { + derivationStrategy: 'BIP45', + networkName: 'livenet', + account: 0, + } + case "48'": + ret.derivationStrategy = 'BIP48'; + break; + default: + return false; + }; + + switch (arr[2]) { + case "0'": + ret.networkName = 'livenet'; + break; + case "1'": + ret.networkName = 'testnet'; + break; + default: + return false; + }; + + var match = arr[3].match(/(\d+)'/); + if (!match) + return false; + ret.account = +match[1] + + return ret; + }; +} \ No newline at end of file