Merge pull request #1496

057b5cd Add support for creating hardware wallet (stoffu)
5029bae get_libwallet_api: checkout v0.12.3.0 (stoffu)
This commit is contained in:
Riccardo Spagni
2018-07-12 17:06:31 +02:00
12 changed files with 278 additions and 9 deletions

View File

@@ -331,7 +331,7 @@ ApplicationWindow {
currentDaemonAddress = localDaemonAddress
console.log("initializing with daemon address: ", currentDaemonAddress)
currentWallet.initAsync(currentDaemonAddress, 0, persistentSettings.is_recovering, persistentSettings.restore_height);
currentWallet.initAsync(currentDaemonAddress, 0, persistentSettings.is_recovering, persistentSettings.is_recovering_from_device, persistentSettings.restore_height);
}
function walletPath() {
@@ -1014,6 +1014,7 @@ ApplicationWindow {
property string payment_id
property int restore_height : 0
property bool is_recovering : false
property bool is_recovering_from_device : false
property bool customDecorations : true
property string daemonFlags
property int logLevel: 0