aboutsummaryrefslogtreecommitdiff
path: root/wizard/WizardController.qml
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2020-04-13 15:36:44 -0500
committerluigi1111 <luigi1111w@gmail.com>2020-04-13 15:36:44 -0500
commiteed51e3ffa4a6a20dd6392e07a3d7afde99b088e (patch)
treef6379babcea1ead55ae2db686f30a99824f9c710 /wizard/WizardController.qml
parent6a889bdaa19bd6ef66165d18d10f82c2c5ed6fa0 (diff)
parent48aab5c6e57f9e66ffec7cae0c1398ac767381f7 (diff)
downloadmonzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.tar.gz
monzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.tar.xz
monzero-gui-eed51e3ffa4a6a20dd6392e07a3d7afde99b088e.zip
Merge pull request #2772
48aab5c WalletManager: wallet recovery - seed offset passphrase support (xiphon)
Diffstat (limited to 'wizard/WizardController.qml')
-rw-r--r--wizard/WizardController.qml4
1 files changed, 3 insertions, 1 deletions
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index 6ee5f38e..992ae2fb 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -59,6 +59,7 @@ Rectangle {
wizardController.walletOptionsLocation = '';
wizardController.walletOptionsPassword = '';
wizardController.walletOptionsSeed = '';
+ wizardController.walletOptionsSeedOffset = '';
wizardController.walletOptionsRecoverAddress = ''
wizardController.walletOptionsRecoverViewkey = ''
wizardController.walletOptionsRecoverSpendkey = ''
@@ -92,6 +93,7 @@ Rectangle {
property string walletOptionsLocation: ''
property string walletOptionsPassword: ''
property string walletOptionsSeed: ''
+ property string walletOptionsSeedOffset: ''
property string walletOptionsRecoverAddress: ''
property string walletOptionsRecoverViewkey: ''
property string walletOptionsRecoverSpendkey: ''
@@ -394,7 +396,7 @@ Rectangle {
var wallet = ''
// From seed or keys
if(wizardController.walletRestoreMode === 'seed')
- wallet = walletManager.recoveryWallet(tmp_wallet_filename, wizardController.walletOptionsSeed, nettype, restoreHeight, kdfRounds)
+ wallet = walletManager.recoveryWallet(tmp_wallet_filename, wizardController.walletOptionsSeed, wizardController.walletOptionsSeedOffset, nettype, restoreHeight, kdfRounds);
else
wallet = walletManager.createWalletFromKeys(tmp_wallet_filename, wizardController.language_wallet, nettype,
wizardController.walletOptionsRecoverAddress, wizardController.walletOptionsRecoverViewkey,