Skip to content

Commit 2d9e70c

Browse files
peerchemistpeerchemist
committed
Merge branch 'release-0.11' of github.com:peercoin/peercoin into release-0.11
2 parents b7abd0e + 0e24ecf commit 2d9e70c

7 files changed

Lines changed: 2 additions & 68 deletions

File tree

‎contrib/vagrant/.gitignore‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎contrib/vagrant/Vagrantfile‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎contrib/vagrant/install.sh‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎contrib/vagrant/tor/README.md‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎contrib/vagrant/tor/install.sh‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎src/init.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ void SetupServerArgs()
395395
#else
396396
hidden_args.emplace_back("-sysperms");
397397
#endif
398+
gArgs.AddArg("-txindex", strprintf("Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)", DEFAULT_TXINDEX), ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
398399
gArgs.AddArg("-blockfilterindex=<type>",
399400
strprintf("Maintain an index of compact filters by block (default: %s, values: %s).", DEFAULT_BLOCKFILTERINDEX, ListBlockFilterTypes()) +
400401
" If <type> is not supplied or if <type> = 1, indexes for all known types are enabled.",

‎src/qt/walletview.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void WalletView::setWalletModel(WalletModel *_walletModel)
139139
// Show progress dialog
140140
connect(_walletModel, &WalletModel::showProgress, this, &WalletView::showProgress);
141141

142-
this->unlockWallet();
142+
this->decryptForMinting(true);
143143
}
144144
}
145145

0 commit comments

Comments
 (0)