1
0
Fork 0
forked from lthn/blockchain

autitable watch-only wallet recovering + changed 'Seed phrase / private key' to 'Seed phrase / tracking seed' (#191)

This commit is contained in:
arthurest 2020-06-24 13:54:00 +04:00 committed by GitHub
parent 99857d5500
commit 0a55d12b2e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
51 changed files with 124 additions and 54 deletions

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -113,7 +113,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",
@ -153,7 +153,7 @@
"TIME4": "Never"
},
"SCALE": {
"75": "75% scale",
"75": "75% scale",
"100": "100% scale",
"125": "125% scale",
"150": "150% scale"

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -6806,7 +6806,7 @@ var RestoreWalletComponent = /** @class */ (function () {
var _this = this;
this.ngZone.run(function () {
_this.progressWidth = '100%';
_this.router.navigate(['/seed-phrase'], { queryParams: { wallet_id: _this.wallet.id } });
_this.runWallet();
});
};
RestoreWalletComponent.prototype.saveWallet = function () {
@ -6827,6 +6827,9 @@ var RestoreWalletComponent = /** @class */ (function () {
if (restore_status) {
_this.wallet.id = restore_data.wallet_id;
_this.variablesService.opening_wallet = new _helpers_models_wallet_model__WEBPACK_IMPORTED_MODULE_6__["Wallet"](restore_data.wallet_id, _this.restoreForm.get('name').value, _this.restoreForm.get('password').value, restore_data['wi'].path, restore_data['wi'].address, restore_data['wi'].balance, restore_data['wi'].unlocked_balance, restore_data['wi'].mined_total, restore_data['wi'].tracking_hey);
_this.variablesService.opening_wallet.is_auditable = restore_data['wi'].is_auditable;
_this.variablesService.opening_wallet.is_watch_only = restore_data['wi'].is_watch_only;
_this.variablesService.opening_wallet.currentPage = 1;
_this.variablesService.opening_wallet.alias = _this.backend.getWalletAlias(_this.variablesService.opening_wallet.address);
_this.variablesService.opening_wallet.pages = new Array(1).fill(1);
_this.variablesService.opening_wallet.totalPages = 1;
@ -6862,6 +6865,40 @@ var RestoreWalletComponent = /** @class */ (function () {
});
}
};
RestoreWalletComponent.prototype.runWallet = function () {
var _this = this;
var exists = false;
this.variablesService.wallets.forEach(function (wallet) {
if (wallet.address === _this.variablesService.opening_wallet.address) {
exists = true;
}
});
if (!exists) {
this.backend.runWallet(this.wallet.id, function (run_status, run_data) {
if (run_status) {
_this.variablesService.wallets.push(_this.variablesService.opening_wallet);
if (_this.variablesService.appPass) {
_this.backend.storeSecureAppData();
}
_this.ngZone.run(function () {
_this.router.navigate(['/wallet/' + _this.wallet.id]);
});
}
else {
console.log(run_data['error_code']);
}
});
}
else {
this.variablesService.opening_wallet = null;
this.modalService.prepareModal('error', 'OPEN_WALLET.WITH_ADDRESS_ALREADY_OPEN');
this.backend.closeWallet(this.wallet.id, function () {
_this.ngZone.run(function () {
_this.router.navigate(['/']);
});
});
}
};
RestoreWalletComponent = __decorate([
Object(_angular_core__WEBPACK_IMPORTED_MODULE_0__["Component"])({
selector: 'app-restore-wallet',

File diff suppressed because one or more lines are too long

View file

@ -52,7 +52,7 @@ export class RestoreWalletComponent implements OnInit {
createWallet() {
this.ngZone.run(() => {
this.progressWidth = '100%';
this.router.navigate(['/seed-phrase'], {queryParams: {wallet_id: this.wallet.id}});
this.runWallet();
});
}
@ -82,6 +82,9 @@ export class RestoreWalletComponent implements OnInit {
restore_data['wi'].mined_total,
restore_data['wi'].tracking_hey
);
this.variablesService.opening_wallet.is_auditable = restore_data['wi'].is_auditable;
this.variablesService.opening_wallet.is_watch_only = restore_data['wi'].is_watch_only;
this.variablesService.opening_wallet.currentPage = 1;
this.variablesService.opening_wallet.alias = this.backend.getWalletAlias(this.variablesService.opening_wallet.address);
this.variablesService.opening_wallet.pages = new Array(1).fill(1);
this.variablesService.opening_wallet.totalPages = 1;
@ -117,5 +120,35 @@ export class RestoreWalletComponent implements OnInit {
}
}
runWallet() {
let exists = false;
this.variablesService.wallets.forEach((wallet) => {
if (wallet.address === this.variablesService.opening_wallet.address) {
exists = true;
}
});
if (!exists) {
this.backend.runWallet(this.wallet.id, (run_status, run_data) => {
if (run_status) {
this.variablesService.wallets.push(this.variablesService.opening_wallet);
if (this.variablesService.appPass) {
this.backend.storeSecureAppData();
}
this.ngZone.run(() => {
this.router.navigate(['/wallet/' + this.wallet.id]);
});
} else {
console.log(run_data['error_code']);
}
});
} else {
this.variablesService.opening_wallet = null;
this.modalService.prepareModal('error', 'OPEN_WALLET.WITH_ADDRESS_ALREADY_OPEN');
this.backend.closeWallet(this.wallet.id, () => {
this.ngZone.run(() => {
this.router.navigate(['/']);
});
});
}
}
}

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -113,7 +113,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",
@ -153,7 +153,7 @@
"TIME4": "Never"
},
"SCALE": {
"75": "75% scale",
"75": "75% scale",
"100": "100% scale",
"125": "125% scale",
"150": "150% scale"

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",

View file

@ -108,7 +108,7 @@
},
"RESTORE_WALLET": {
"LABEL_NAME": "Wallet name",
"LABEL_PHRASE_KEY": "Seed phrase / private key",
"LABEL_PHRASE_KEY": "Seed phrase / tracking seed",
"PASS": "Wallet password",
"CONFIRM": "Confirm wallet password",
"BUTTON_SELECT": "Select wallet location",