const res = bytom.keys.restoreFromMnemonic(keyAlias, passwd, mnemonic)
- bytom.wallet.list(res.xPub).then(wallet =>{
+ bytom.wallet.list(res.xpub).then(wallet =>{
let walletInfo
if(wallet.length>0){
let ret = {
const res = bytom.keys.restoreFromKeystore(password, keystore)
- bytom.wallet.list(res.xPub).then(wallet =>{
+ bytom.wallet.list(res.xpub).then(wallet =>{
let walletInfo
if(wallet.length>0){
let ret = {
}
walletInfo.then(ret => {
- let resultObj = Object.assign(res, ret)
+ let resultObj = Object.assign(ret, {})
resultObj.alias = accountAlias
resultObj.keyAlias = res.keyAlias
resultObj.vMnemonic = true
+ resultObj.keystore = keystore
+ resultObj.xpub = res.xpub
_bytom.keychain.pairs[accountAlias] = resultObj
_bytom.currentAccount = resultObj
return bytom.keys.isValidMnemonic(mnemonic)
}
+account.isValidKeystore = function(keystore) {
+ return bytom.keys.isValidKeystore(keystore)
+}
+
export default account
const uiLang = (chrome.i18n.getUILanguage().split('_')[0]).split('-')[0]
this.domains = [];
this.language = uiLang||'en';
+ this.netType ='bytom';
+ this.net ='testnet';
}
static placeholder(){ return new Settings(); }
}
export const networksJS = {
- mainnet: `${networks['mainnet']}/bytom/v3/`,
+ mainnetbytom: `${networks['mainnet']}/bytom/v3/`,
mainnetvapor: `${networks['mainnet']}/vapor/v3/` ,
- testnet: `${networks['testnet']}:4000/bytom/v3/`,
+ testnetbytom: `${networks['testnet']}:4000/bytom/v3/`,
testnetvapor: `${networks['testnet']}:3000/vapor/v3/` ,
}
);
return
}
- this[Actions.SET_DATA]({
- keystore: this.formItem.keystoreF
- }).then(() => {
- this.$router.push('/restore-password');
- });
+
+ try{
+ const keystore = account.isValidKeystore(this.formItem.keystoreF)
+ this[Actions.SET_DATA]({
+ keystore: keystore
+ }).then(() => {
+ this.$router.push('/restore-password');
+ });
+ }catch (e){
+ this.$toast.error(
+ e.message || e
+ );
+ return
+ }
+
break;
}
case 'ktext':
return
}
- this[Actions.SET_DATA]({
- keystore: this.formItem.keystore
- }).then(() => {
- this.$router.push('/restore-password');
- });
+ try{
+ const keystore = account.isValidKeystore(this.formItem.keystore)
+ this[Actions.SET_DATA]({
+ keystore: keystore
+ }).then(() => {
+ this.$router.push('/restore-password');
+ });
+ }catch (e){
+ this.$toast.error(
+ e.message || e
+ );
+ return
+ }
+
break;
}
}
<div class="header color-black">
<BackButton/>
<h1>
- <div class="welcome-title">{{ data.mnemonic? $t('restore.sPassword'):$t('restore.vPassword')}}</div>
+ <div class="welcome-title">{{ (data && data.mnemonic)? $t('restore.sPassword'):$t('restore.vPassword')}}</div>
</h1>
</div>
<div class="divider"></div>
}).catch(err => {
loader.hide();
this.$toast.error(
- err.message
+ err.message || err
)
});
}else if(keystore){
}).catch(err => {
loader.hide();
this.$toast.error(
- err.message
+ err.message || err
)
});