# Conflicts:
#	src/qt/vitae/privacywidget.cpp
#	src/qt/vitae/send.cpp

askpassphrasedialog is used instead
# Conflicts:
#	src/Makefile.qt.include
#	src/qt/CMakeLists.txt
#	src/qt/vitae/forms/walletpassworddialog.ui
#	src/qt/vitae/walletpassworddialog.cpp
#	src/qt/vitae/walletpassworddialog.h

Connect the signal emitted by WalletModel::requestUnlock to the TopBar,
in order to present the unlock-wallet dialog, before creating the
UnlockContext.
The wallet will then restore its previous state (Unlocked or
UnlockedForStaking) upon destruction of the UnlockContext object.
# Conflicts:
#	src/qt/vitae/topbar.cpp

PWidget::verifyWalletUnlocked replaced with the UnlockContext.

Add flows:
- Create New Receive Address
- Create New Payment Request
- Create Masternode Controller
- Create Cold Staking Address
- Send Cold Stake Delegation
- Add multisend recipient
# Conflicts:
#	src/qt/vitae/masternodeswidget.cpp

…llets

28d051f65f6429244bf4f5236671b57bf83c5acb [QA] Add Travis job to run functional tests with --legacywallet (random-zebra)
9b9407094b10ccab53f2594fe8af9f005793df82 [Tests] Skip unrelated tests when --legacywallet (random-zebra)

Pull request description:

  Follows the discussion in #1410 .
  Defines a list of tests to be skipped by the `test_runner` when running with the `--legacywallet` flag (not directly related to the wallet / key management).
  Also adds a specific Travis job, to run the functional test suite on pre-HD wallets.

  Note: currently based on top of
  - [x] #1411

  to make legacy tests pass.

ACKs for top commit:
  Fuzzbawls:
    ACK 28d051f65f6429244bf4f5236671b57bf83c5acb

Tree-SHA512: 4a8c896a3b8232221b8f86480d4b3e730297e1efb103cd61ac26fd104d6d90577a2fdab2a9002932c4d61d5a7404f7ef588e92958cdfb28249b018f58e74dd2a

aa661444c23497fa8053fc8d6ae1fbfe9814a4a4 [Tests] Remove non-determinism which is breaking net_tests (random-zebra)

Pull request description:

  from bitcoin#8070

  > If addrmanUncorrupted does not have the same nKey every time it will map addrs to different bucket positions and occasionally cause a collision between two addrs, breaking the test.

ACKs for top commit:
  Fuzzbawls:
    ACK aa661444c23497fa8053fc8d6ae1fbfe9814a4a4
  furszy:
    utACK aa66144 and merging

Tree-SHA512: 759b9214ec6c51d440559483bf3fc712407a9b9a14afca1f26f4383c468639054b5673a9d815775fad90a66308f1ac309ef7730808fcea0bdd5e48a95df654c3

5d492c033640f5dd03068a13493f98b046e24eda [CMake] Fix missing file error (Fuzzbawls)

Pull request description:

  #1443 removed the `denomgenerationdialog` files, but the `.cpp` file
  reference wasn't also removed from the GUI's `CMakeLists.txt` file.

ACKs for top commit:
  random-zebra:
    utACK 5d492c033640f5dd03068a13493f98b046e24eda
  furszy:
    utACK 5d492c0

Tree-SHA512: 4b705819352c0493099bfb55710483dad1aa7bc91725f24d43b07585dbdb06828bf2619b51e9482130de7ca2fd2be5b469a03d053e93e7fc2010b0c1a66bd3dc

# Conflicts:
#	src/qt/CMakeLists.txt

c54fd9dfded28f2b4ff86914422fb592bd86f320 [Qt] Switch to newer connect syntax (Fuzzbawls)

Pull request description:

  Switch all Qt connections to the newer functor-based syntax.

  Marked [WIP] for now until larger PRs can be merged.

  Mostly ported from bitcoin/bitcoin#13529

  Requires the following PR to be merged first in order to adhere to standards:
  - [x] #1351

ACKs for top commit:
  furszy:
    ACK c54fd9d
  random-zebra:
    ACK c54fd9dfded28f2b4ff86914422fb592bd86f320 and merging...

Tree-SHA512: d5222264566a8920ab97e8c586f134156d9d0514d014b430bdd47a34b0620ab94a1c6d341b6a57322f1131a8fad91a5e1af907f3bd7112d0ab5e04c4cc9f5ae5

# Conflicts:
#	.travis/lint_06_script.sh
#	src/qt/optionsdialog.cpp
#	src/qt/rpcconsole.cpp
#	src/qt/vitae.cpp
#	src/qt/vitae/navmenuwidget.cpp
#	src/qt/vitae/privacywidget.cpp
#	src/qt/vitae/send.cpp

53cfbee2ab38ba61091d63d631156e7684028861 [GUI] Automatic wallet backup after upgrade to HD (random-zebra)

Pull request description:

  Based on
  - [x] #1387

  Offer the option to directly backup the wallet after upgrade-to-HD (and successive re-lock) is completed.

  The message on the initial dialog is changed (from "Note that you will need to MAKE A NEW BACKUP.."):

  ![backup1](https://user-images.githubusercontent.com/18186894/77027832-8d4f8b00-6997-11ea-88b5-d48ec64dc318.png)

  If the user clicks "OK", and the wallet is locked, the unlock dialog is directly shown (as per #1387)

  ![backup2](https://user-images.githubusercontent.com/18186894/77027846-94769900-6997-11ea-8638-b59a11836fb3.png)

  After the upgrade, the client directly presents this dialog:

  ![backup3](https://user-images.githubusercontent.com/18186894/77028494-38ad0f80-6999-11ea-9fe4-1d1f06cf8c7c.png)

  If the user clicks "OK", then the open-file dialog is presented, so the user can select the filename for the backup file and click "Save" completing the flow.
  If the user clicks "CANCEL" (or dismisses the open-file dialog later), a snackbar  popup warns the user, telling to remember to backup asap.

ACKs for top commit:
  furszy:
    Tested ACK 53cfbee.
  Fuzzbawls:
    ACK 53cfbee2ab38ba61091d63d631156e7684028861

Tree-SHA512: 80fbcdb4d9805d75db98a0f394840f734314e6d249539997f1948cd7775ac2a81239b762386b7770c6ca4b8a2c38acdf1d5ae7ee7f07591bfdfc7dd4ee39cfc2

02acbc13ecee568b266001f6ed1636e4c4146917 [GUI][Trivial] Fix capsLabel color (make it text-warning) (random-zebra)

Pull request description:

  Ref: PIVX-Project/PIVX#1428 (comment)

  Caps-lock warning is black.
  Assign text-warning css to make it clearly visible (and instantly recognizable as warning) in both themes.

ACKs for top commit:
  Fuzzbawls:
    re-ACK 02acbc13ecee568b266001f6ed1636e4c4146917
  furszy:
    ACK 02acbc1

Tree-SHA512: f49a8e49e772c1da7ae60804a2a6109294d6a7889f47a0e094f523704bcac0df4dccfa248ba5db7f7b4f6786079376ed48facfc6cd72c386be007a7b6ae3bf74

…lableCoins

f2d31e5176c790086c990d5a73463d1c3f0d875e [Bug] Fix min depth requirement for stake inputs in AvailableCoins (random-zebra)

Pull request description:

  If `nDepth` is equal to `nStakeMinDepth - 1` then the coin is not skipped in `AvailableCoins` and gets included in the list of stakeable utxos.
  This utxo won't be able to stake though, as it will fail `ContextCheck` in `Stake()` (logging an error), thus it shouldn't have been included in the first place.

ACKs for top commit:
  furszy:
    ACK f2d31e5 .
  Fuzzbawls:
    ACK f2d31e5176c790086c990d5a73463d1c3f0d875e

Tree-SHA512: 1b75a555e9ad4d2526fdc49e9059baaed1c383b6abc121f9cd85c48f44f82b21e13e8ee66f6d535c078f226360f93fd12ebf1889124acb74c0e7fcc17464dad7

…plete

aa5dc7b2c6728d97aad36ad9125ed6a619bb8310 [Consensus] Strict check amounts in CCSFO for mnsync incomplete (random-zebra)
d6a106006a4ab00debe9bb34912c778ec21c20f8 [Consensus] CheckColdStakeFreeOutput when mnsync not complete (random-zebra)

Pull request description:

  Follow up to #1331 for the same bug.

  **Problem:** if the finalized budgets and the masternode list are not synchronized, the output returned from `IsBudgetPaymentBlock` is unreliable.

  For the moment we fix it by checking that the sum of the stake input value and block reward is at least equal to the sum of the values of non-free outputs.

  A better approach, for the future, would be probably to outright prevent any call to `CheckBlock` when `IsInitialBlockDownload` is false but mnSync is not fully completed yet.

Top commit has no ACKs.

Tree-SHA512: cd2e765b865172a55bd8b05d132d356078b1956da6449c819ebdcedd1291d412fdf4249ac5e0d1e7db808c9c3543451df085791ed743e7441618368a07fad6c6

# Conflicts:
#	src/main.cpp

b8f3277377b8ea7e421b23afb70b41b12542383b [Trivial] Cleaning not used pCheckpointCache. (furszy)

Pull request description:

  Auto-descriptive PR.

ACKs for top commit:
  random-zebra:
    utACK b8f3277377b8ea7e421b23afb70b41b12542383b

Tree-SHA512: 7c3e86b0d513b8e57c7396a384b7d78ac88c15647df768c88bd21e949ca6863440a4d259678fe1c09df570adb8c597a12d2e7fa5dc235e0056ae58561c6840c6

7d9adb8a272efbf36295917e964cb32565ceba1c [Bug] Fix g_best_block_initialization in ABC (random-zebra)

Pull request description:

  `g_best_block` holds a cached best block hash.
  This is updated during `ActivateBestChain` (in `UpdateTip`).

  **Problem**: at startup, the object is not initialized until a new block arrives (`ActivateBestChainStep` is not called) thus `g_best_block != chainActive.Tip()->GetBlockHash()` so, if the client stakes before receiving a new block, that stake gets orphaned.
  In case of segregated devnet with just one staker, it is impossible to move the chain at all.

ACKs for top commit:
  furszy:
    utACK 7d9adb8
  Fuzzbawls:
    ACK 7d9adb8a272efbf36295917e964cb32565ceba1c

Tree-SHA512: 9f46862c2e99ded240d589a765cede130248f8fbcb36dddccda4a35ac320bcb9e887b1e44de9c73e6cbbf9f193763b0cfd7bd00b14931c52e63f80f16e744a18

…rough proxy

fdca17c3251da125afda75e7673080df1810c9fc Consolidate scattered max peer connection values into single declaration. (furszy)
bd4c7137c7f8925120e6c5e789f6fb8af724528d netbase: Do not print an error on connection timeouts through proxy If a timeout happens while reading the proxy response, this effectively means we timed out while connecting to the remote node. This is very common for Tor, so do not print an error message. (furszy)
f936a2f5e23ef88378102d3aa214ee07b14beb2e netbase: Make InterruptibleRecv return an error code instead of bool. (furszy)

Pull request description:

  If a timeout happens while reading the proxy response, this effectively means we timed out while connecting to the remote node. This is very common for Tor, so do not print an error message to the log in that case.

  Avoids a flood of
  ```
  ERROR: Error reading proxy response
  ```

  while running through Tor, causing users to blame the proxy.

  Coming from upstream [9726](bitcoin/bitcoin#9726)

ACKs for top commit:
  Fuzzbawls:
    utACK fdca17c3251da125afda75e7673080df1810c9fc
  random-zebra:
    utACK fdca17c3251da125afda75e7673080df1810c9fc

Tree-SHA512: 6007c544710a0b103712f134c962368bd4704bbea4e1b93ccc55dd5ce65db063089facf3cdd335b132920256a9fe3fe59ed8e81add57f8ba85e9a7589c086961

[Squash] Definitive height for testnet: 1519000
# Conflicts:
#	src/chainparams.cpp

Meant to be used in the first output of the coinstake (unspendable
marker), to publish the signature of the used modifier.
The hash of this signature will be used as modifier for the next block.

coinstake txes are now marked with the first output that can either be
empty (as before) or with an OP_STAKEMODIFIER script

# Conflicts:
#	src/stakeinput.cpp

# Conflicts:
#	src/kernel.cpp

Previous modifier signature is published in the first coinstake output
and it's verified at the end of CheckProofOfStake

The name is now confusing as it could return true also for V3 modifiers.
Just use the height explicitely, which makes the code more readable.

opcode + len + compact signature --> max = 67 bytes

- V1 modifiers: Move computation from main to chain
- V3 modifiers: Pass coinstake output from AddToBlockIndex
# Conflicts:
#	src/main.cpp

9fb0a439b1991437500c8d210e80e9b5717092fc util: Throw tinyformat::format_error on formatting error (random-zebra)
67eb699090f6c787c22f4a3184042a11a20b04c4 util: Properly handle errors during log message formatting (random-zebra)
66ec97b3f3c23aeab286a9ebaf7a430db527bfc2 Do not evaluate hidden LogPrint arguments (random-zebra)
2713458c9559fb1a5503cc407d0797e18a6e6c85 util: Remove zero-argument versions of LogPrint and error (random-zebra)
500dfeed876660a209b2e833473f747bb293d4d0 util: Update tinyformat (random-zebra)
68378877e8b6cfeade4ce5987c621064be1c22b3 util: switch LogPrint and error to variadic templates (random-zebra)
0fa578f598d3ada97d3e89f1bab967a480ef539f tinyformat: force USE_VARIADIC_TEMPLATES (random-zebra)

Pull request description:

  this backports the following pull requests from upstream bitcoin:
  - bitcoin#8000 (0fa578f, 6837887)
  > Now that we started using c++11, force use of variadic templates.
  The autodetection may be wonky on some compilers, see discussion here and is unnecessary for us anyhow.

  - bitcoin#8274 (500dfee, 2713458)
  > Updates tinyformat.h to commit c42f/tinyformat@3a33bbf upstream.

  - bitcoin#9417 (66ec97b)
  > There are a few cases where hashes are computed inside LogPrint arguments - where they usually go unused. As LogPrint statements should never have side effects besides printing something, we can avoid the evaluation in this case.
  Advantage: perhaps a small performance improvement; I haven't benchmarked.
  Disadvantage: if we would have statements with side-effects, this could make this a bit harder to debug.

  - bitcoin#9963 (67eb699, 9fb0a43)
  > Instead of having an exception propagate into the program (which at worst causes a crash) when an error happens while formatting a log message, just print a message to the log. This message clearly indicates what log message was formatted wrongly, and what error happened during formatting it.

ACKs for top commit:
  Fuzzbawls:
    ACK 9fb0a439b1991437500c8d210e80e9b5717092fc
  furszy:
    cool, utACK 9fb0a43 .

Tree-SHA512: 29a902bb712612ca093a8fe863e9eff1c17d40955bbc37a5ceb6f057068ac6150dfcffd6836a6b0bd6295aa9bffd0925eb69e50f82ccaa7d84215efc274a59a4

3e02ff77ef339253f408acebf0a96065e0eba7c8 [Cleanup] Remove old governancepage and proposalframe code (Akshay)

Pull request description:

  After the v4.0 UI revamp,the old governance page and its proposalframe code hasnt been used anywhere.This PR removes currently unused forms,css code and files related to the old governance page UI

ACKs for top commit:
  random-zebra:
    utACK 3e02ff77ef339253f408acebf0a96065e0eba7c8
  furszy:
    utACK 3e02ff7
  Fuzzbawls:
    ACK 3e02ff77ef339253f408acebf0a96065e0eba7c8

Tree-SHA512: 4ba4a15989cebe7956219644eccbd6284f9244b413d74c8440ce4dd812e92e9437edd1b4435ecafcfd786fbad51dfd8d03d84fcdaffb0228acce2187e5d78e8f

# Conflicts:
#	src/Makefile.qt.include
#	src/qt/governancepage.cpp
#	src/qt/proposalframe.cpp
#	src/qt/proposalframe.h
#	src/qt/res/css/default.css

e2c3e77838c6f4921a4b7279b803335cd988ee72 [Trivial] Remove spammy log in CheckSignature (random-zebra)

Pull request description:

  Remove extra logs in `CSignedMessage::CheckSignature`.
  This method is inherited by all classes extending `CSignedMessage` and its log does not give useful information to the verifier at all (it's not even clear what is the class in question). Might just be of some help when signing (`VerifyHash` is called from within `CSignedMessage::Sign` too).
  All relevant logs for verifiers are already provided by the caller - e.g.
  ```cpp
  if (!mess.CheckSignature()) { /* log something */ }
  ```

ACKs for top commit:
  furszy:
    utACK e2c3e77.
  Fuzzbawls:
    utACK e2c3e77838c6f4921a4b7279b803335cd988ee72

Tree-SHA512: cf7e24aed86f26f6895289ebc07ece268864836f954372db4834e94f7aac9192bd97d6dec6269efe9c3ee6ce601a8fabd2fc98b29c91e6230bfb9d0386d06727

40e41169503533f08f4d1861c3b76a3a0c6226eb Do not increment nAttempts by more than one for every Good connection. (Gregory Maxwell)
b988ce6d9e99622fcc366a091bd64300fa251a5f Avoid counting failed connect attempts when probably offline. (Gregory Maxwell)

Pull request description:

  Backport of bitcoin/bitcoin#8065

  > If a node is offline failed outbound connection attempts will crank up
  > the addrman counter and effectively blow away our state.
  >
  > This change reduces the problem by only counting attempts made while
  > the node believes it has outbound connections to at least two
  > netgroups.
  >
  > Connect and addnode connections are also not counted, as there is no
  > reason to unequally penalize them for their more frequent
  > connections -- though there should be no real effect from this
  > unless their addnode configureation is later removed.
  >
  > Wasteful repeated connection attempts while only a few connections are
  > up are avoided via nLastTry.
  >
  > This is still somewhat incomplete protection because our outbound
  > peers could be down but not timed out or might all be on 'local'
  > networks (although the requirement for multiple netgroups helps).

  Note: A future PR will focus on refactoring the layer 2 (masternode) methods to stop using `ConnectNode()` directly

ACKs for top commit:
  random-zebra:
    ACK 40e41169503533f08f4d1861c3b76a3a0c6226eb
  furszy:
    utACK 40e4116

Tree-SHA512: 96adadea1d214a2afcf5e43c13a4409ca3de1d81ae51225bda74eabda6a3435a7678c3826e3c3930e543b084de1f28a4a5a102ccd1e3ad3c01da4937f312941b

# Conflicts:
#	src/activemasternode.cpp

bf7c1e48ccec9c150ee6b0a784e937fd2327448c Fix height_start_StakeModifierV3 (Stamek)

Pull request description:

ACKs for top commit:
  random-zebra:
    ACK bf7c1e48ccec9c150ee6b0a784e937fd2327448c
  furszy:
    ACK bf7c1e4

Tree-SHA512: 7fdb55ab9356017ce19ce13f05c621f84d410a9ba776d37b33a672cea8190bb0f485de32feff424ce17570d7d061ca1ca0ddaec7b4835701fb457030dea6a536

# Conflicts:
#	src/chainparams.cpp

d2ea5077a56a49cec3b048230431b446535c395f [Net] Protocol update enforcement for 70919 (random-zebra)

Pull request description:

  Required by #1462 (if accepted).
  Bumps protocol to `70919` and adds the enforcement logic.

ACKs for top commit:
  Fuzzbawls:
    ACK d2ea5077a56a49cec3b048230431b446535c395f
  furszy:
    utACK d2ea507

Tree-SHA512: 9cbf86d861c064931e7961a2e3cec424c8a5997c54c746dcafc9d140a2f130cc04c5349c6cec0dc5853ea1b9fed8bec728130cd32b221599499c62e5fbb66149

# Conflicts:
#	src/main.cpp
#	src/version.h

bf6b4a2354d64bc10f3db89b0b62e8dbe35ae7f6 [GUI] Settings widget, expand/collapse scroll area. (furszy)

Pull request description:

  Solving #1078.

ACKs for top commit:
  random-zebra:
    Very nice refactoring. Tested ACK bf6b4a2354d64bc10f3db89b0b62e8dbe35ae7f6
  Fuzzbawls:
    ACK bf6b4a2354d64bc10f3db89b0b62e8dbe35ae7f6

Tree-SHA512: 09e2153a661e273010fcd2678be609197f1f2b6882c355a9148a03cb55286a9f214f5206a6c44f7831d427606e589a428de456720e7a3af4df88641361402ba1

2df5e68da503e5d400703365754ed86c4c2a46fd [GUI] One-click export accounting (random-zebra)
a3edc532677803776237eb0042395b2f6b91bbc6 [GUI] One-click wallet file backup (random-zebra)

Pull request description:

  Export to file directly, after selecting the destination and clicking "Save", without requiring additional button presses.
  Interested flows:
  - backup wallet
  - export txes to csv
  - export addresses to csv

  Closes #1417

ACKs for top commit:
  furszy:
    ACK 2df5e68

Tree-SHA512: 96da02d48d65f5a16dc0649f9560a59cdf8e4b5f4bd2a98e8380bbdd5db24b35a8f0ed990315d1338ea85f39bcdae18c0ab8a4539a08e362b4b347783c5984a9

9ef34e735f14f74149a3569a2bfb0ee173723bf2 [GUI][Model] Fix staking address validation (random-zebra)

Pull request description:

  **Problem**: `validateStakingAddress` uses a naive validation based on the first letter, and is currently broken on regtest (as `IsTestNetwork` was updated in PIVX-Project/PIVX@2be6f7b to be false on RegTestNet).

  **Fix**: introduce a boolean argument in `validateAddress` (which already uses a full `CBitcoinAddress` validation) to properly check staking addresses as well.

ACKs for top commit:
  furszy:
    ACK 9ef34e7
  Fuzzbawls:
    ACK 9ef34e735f14f74149a3569a2bfb0ee173723bf2

Tree-SHA512: c09317dae93bb2a9479c7faffa387f6fcb6e47826ae3d11c2d52212a5b485fc63da12f37058e2990f07ac226e99c02563d337adc84f85d260e73eb5f5734defa

42233c8d8be1daab8f60d6a3ff3b1d235ee4c362 [Model] Cache initial sync state. (furszy)
6ae486d11a4e44af9bb26b3d39d9ce66985e7438 dashboard, unused filters removed. (furszy)

Pull request description:

  We were locking `cs_main`, calling `IsInitialBlockDownload` on every new row inserted in the transaction table model.

  This PR caches the IBD state and updates it on every new block from the back-end without lock `cs_main` at all.

ACKs for top commit:
  random-zebra:
    ACK 42233c8d8be1daab8f60d6a3ff3b1d235ee4c362
  Fuzzbawls:
    ACK 42233c8d8be1daab8f60d6a3ff3b1d235ee4c362

Tree-SHA512: 85bd565d1bcd3c37ac08d89a0f8bf84f757e3520c1771660e51e2d2d354a70e744b5ac7033c0b339a9f4a404e8676e6f5ed17121fe62d8d5c52db0eeea3ce54d

…cals

58b39ca5a10b249c226fd94eb643ec19134a0cdf [Scripts] Add override flag to fetch all translations (Fuzzbawls)
a747678f5c2ccfeaab52a5a85ab80df634c075d1 [Scripts] Add Transifex CLI configuration slug (Fuzzbawls)
db7e68ae0297d2ff4ff3d8e1f8063289d8ae1071 [Scripts] Only fetch translations for high-completion locals (Fuzzbawls)

Pull request description:

  This restricts the fetching of translations from Transifex during the
  translation process to only fetch the translations that meet a defined
  minimum completion threshold percentage.

  In order to allow testers/self-compilers to see partial translations in-wallet,
  a runtime override flag has been added to the `update-translations.py`
  script; `--ignore_completion`

  Also, finally add the public configuration file for the `tx` CLI tool

  Closes #1432

ACKs for top commit:
  random-zebra:
    ACK 58b39ca5a10b249c226fd94eb643ec19134a0cdf
  furszy:
    ACK 58b39ca

Tree-SHA512: 27becc586059deb9d1e97e6483e8c55da9b29b2d29a72e3b73093c33e41bb250c9c7f8c11a5390c0385e13b3b3869ae21c8d71729b6ddf1d035521689d62dff0

backports bitcoin@1111bb91f517838e5b9f778bf6b5a9c8d561e857

backports bitcoin@faaee1e39a91b3f603881655d3980c29af09852b

backports bitcoin@fa3b9ee8b2280af4bcbcfffff275aaf8dd125929

# Conflicts:
#	src/zvit/zpos.h

Partially coming from 25340b7

# Conflicts:
#	src/init.cpp
#	src/wallet/wallet.h

# Conflicts:
#	src/Makefile.am
#	src/init.cpp
#	src/wallet/wallet.cpp

# Conflicts:
#	src/init.h

[Move-Only] Unlock method moved to the wallet class.

# Conflicts:
#	src/crypter.cpp

Reasons:

1) pwalletMain can or cannot be created.
2) It can get to the point of more than one Wallets object created (example, unit tests creating wallets with different db paths) and the CzPIVWallet using only one of them..
3) The implementation is just wrong.

# Conflicts:
#	src/init.cpp
#	src/test/zerocoin_transactions_tests.cpp
#	src/wallet/wallet_zerocoin.cpp
#	src/zvit/zvittracker.cpp
#	src/zvit/zvittracker.h
#	src/zvit/zvitwallet.cpp
#	src/zvit/zvitwallet.h

ab42b403ff069d8e99bbf1fce906b1254b782e7e [GUI][Trivial] ColdStakingWidget: fix containerSend margins (random-zebra)

Pull request description:

  Cold staking widget: set containerSend margins to zero to keep consistency with send widget.
  Closes #1444

  Before:
  ![cswidg1](https://user-images.githubusercontent.com/18186894/78084802-778b8e00-73b9-11ea-95ca-90a05a5eb710.png)

  <br>

  After:
  ![cswidg2](https://user-images.githubusercontent.com/18186894/78084809-7bb7ab80-73b9-11ea-9eb5-a317113d3074.png)

ACKs for top commit:
  furszy:
    utACK ab42b40 .
  Fuzzbawls:
    ACK ab42b403ff069d8e99bbf1fce906b1254b782e7e

Tree-SHA512: 391b7fb3f1b436a9234c8d502176490572af2ec3d788319b6fae9ece16dbe1003a40fdb0b56f733fb466895c3f5d0293618b58dc731afdde712fb1641f2ee0a0

…of strings

c3dc81623f297cdfda1b5797dcc5b7f6c40312f8 [Core] LogAcceptCategory: use uint32_t rather than sets of strings (random-zebra)

Pull request description:

  implemented on top of:
  - [x] #1449

  from bitcoin#9424

  > This changes the logging categories to boolean flags instead of strings.
  This simplifies the acceptance testing by avoiding accessing a scoped static thread local pointer to a thread local set of strings. It eliminates the only use of boost::thread_specific_ptr outside of lockorder debugging.
  This change allows log entries to be directed to multiple categories and makes it easy to change the logging flags at runtime (e.g. via an RPC, though that isn't done by this commit.)
  It also eliminates the fDebug global.
  Configuration of unknown logging categories now produces a warning.

  We add 4 more debug categories:
  - BCLog::STAKING
  - BCLog::MASTERNODE (which includes previous "masternode" and "mnpayments" categories)
  - BCLog::MNBUDGET
  - BCLog::LEGACYZC

ACKs for top commit:
  Fuzzbawls:
    ACK c3dc81623f297cdfda1b5797dcc5b7f6c40312f8

Tree-SHA512: 0c2ffc30df5b4239396c6f2ef6c551bbca5696aa1087b5e12a206fc9b1def9ef6cd9c6f6c0cbbb8da0d667e782848a884514de21609714668d0b5ad87eca8e56

# Conflicts:
#	src/activemasternode.cpp
#	src/init.cpp
#	src/main.cpp
#	src/masternode-budget.cpp
#	src/masternode.cpp
#	src/masternodeman.cpp
#	src/obfuscation.cpp
#	src/obfuscation.h
#	src/swifttx.cpp
#	src/util.cpp
#	src/util.h

4283fd791b577f1b020df76b64d0ff953e0076d2 [GUI] Hide charts container when not USE_QTCHARTS (random-zebra)

Pull request description:

  QT charts are included by default (unless explicitely disabled or the library is not found). In which case, almost half of the dashboard space is basically "wasted".

  ![charts1](https://user-images.githubusercontent.com/18186894/78017902-45444700-734d-11ea-9d87-b181c7b85832.png)

  <br>

  This PR proposes to hide the charts container instead.

  ![charts2](https://user-images.githubusercontent.com/18186894/78017911-4a08fb00-734d-11ea-8fae-770f55eb31c1.png)

ACKs for top commit:
  Fuzzbawls:
    utACK 4283fd791b577f1b020df76b64d0ff953e0076d2
  furszy:
    utACK 4283fd7

Tree-SHA512: 7413a3c6e84a5e106ab4eb7f9b90f8817a07036c8135b4b8855bc88166247b26a13eeecc4b758a285859edf08bf946dffd100cd9a3da3803a0678bb4097d5b8f

61332f11b86d8d5bf864c324e7db29168a2f0182 [Depends] Update OpenSSL download URL (Fuzzbawls)

Pull request description:

  The URL for OpenSSL 1.0.1k has changed, so update it here.

ACKs for top commit:
  furszy:
    ACK 61332f1
  random-zebra:
    utACK 61332f11b86d8d5bf864c324e7db29168a2f0182

Tree-SHA512: be32ae8dd5cb285098d1ff2198e241e66f15f2df4b343ac15bc4f0910a296d4a40eeac2964f8eed08e1efb325c76bcf9dcc5c6a577ea298d735173e315f859be

3dfe2fb335921b3cf218dbb5bde7126ea074f803 fix: tor topbar button text. (furszy)

Pull request description:

  Fixing a badly bold font style set in the Tor topbar's button text.
   It's not needed and it shouldn't have been coded in that way as it will not parse the tag properly.

ACKs for top commit:
  random-zebra:
    utACK 3dfe2fb335921b3cf218dbb5bde7126ea074f803
  Fuzzbawls:
    ACK 3dfe2fb335921b3cf218dbb5bde7126ea074f803

Tree-SHA512: 26f065eebbb7eedf6af752c6d985b1f5e5bf09f37846d76b39815dd2506266cf4a0263a5b7cb55cbcb67901b906234638b1b0bdd4d138216b6b1e246e68d011c

feacea34873e1da3864f59fa26d5db66e0f1208a [GUI] ClientModel try to initialize cacheTip if it's null. (furszy)

Pull request description:

  Fixing cacheTip not sync with the back-end information when the node has no connection and thereby there was no tip signal broadcasted to the front-end to update the cached tip. Showing a wrong chain height instead of the correct back-end tip.

  This will only happen one time. Once the tip gets updated, it will not request it anymore from the back-end and only receive signals. Not locking `cs_main` anymore.

ACKs for top commit:
  random-zebra:
    utACK feacea34873e1da3864f59fa26d5db66e0f1208a
  Fuzzbawls:
    ACK feacea34873e1da3864f59fa26d5db66e0f1208a

Tree-SHA512: 901c3a2a459b78e5e021ec0cde102aaec2e4bb0813a0b3d155c8b44360d4965bfb21a7d8ba4febc883731cbb3831a6981fe9137e38bec8bd9292a8f3801f312a

# Conflicts:
#	src/qt/clientmodel.cpp
#	src/qt/clientmodel.h

0a854456a8cccb95bb76631aa2ad22a7c2888a59 [Core] Add -debugexclude option (random-zebra)

Pull request description:

  Implemented on top of:
  - [x] #1449
  - [x] #1437

  Backports bitcoin#10123

  > setting `-debug` can lead to very noisy debug.logs with subcomponents filling up the log file. See for example https://travis-ci.org/bitcoin/bitcoin/jobs/216767286 where there are hundreds of libevent debug logs.

  This commit adds an option to exclude certain components from debug logging. The usage is:
  ```
  pivxd -debug -debugexclude=<component1> -debugexclude=<component2> ...
  ```

  This finally reduces spammy logs in the functional tests debug, due to libevent and leveldb (bitcoin#10124 was already included backporting the test suite).

ACKs for top commit:
  furszy:
    Code looking good, utACK 0a85445 .
  Fuzzbawls:
    ACK 0a854456a8cccb95bb76631aa2ad22a7c2888a59

Tree-SHA512: 6ccbe275ab11f3e1739ed117e49db0a2e56db345287cddc7cc18fc1131d7800d0f08a7e93005f70cf45ed8e340580f91c3017532bd2ea28fedb5735409ae068b

# Conflicts:
#	src/Makefile.qt.include
#	src/qt/CMakeLists.txt
#	src/qt/vitae/coincontrolvitwidget.cpp
#	src/qt/vitae/forms/coincontrolvitwidget.ui

# Conflicts:
#	src/qt/coincontroldialog.cpp

# Conflicts:
#	src/qt/coincontroldialog.cpp

a9c922b96bd0b17c61e2b8742d72ef5bc894ebb8 Net: Fix resource leak in ReadBinaryFile(...) (practicalswift)

Pull request description:

  Straightforward fix. Coming from upstream [10587](bitcoin/bitcoin#10587)
  ```
  Potential file descriptor leak introduced in commit 0b6f40d via PR #10408
  (submitted 2017-05-16, merged 2017-05-18).
  ```

ACKs for top commit:
  Fuzzbawls:
    ACK a9c922b96bd0b17c61e2b8742d72ef5bc894ebb8
  random-zebra:
    utACK a9c922b96bd0b17c61e2b8742d72ef5bc894ebb8 and merging...

Tree-SHA512: d9fdf1f04e73bb2118a2ad88113d2f4676dedba8668fc1396f446689000f1a75a8bb678f5f84cb7be20781bde1932f2ffe8606666fd371d00d2d5228077350c6

be27c9308cddddb4b74db4c49e8103d1b10cee3e [GUI] Add missing error notification in encrypt wallet. (furszy)

Pull request description:

  Adding an error notification when the encryption process throws an exception.

ACKs for top commit:
  Fuzzbawls:
    utACK be27c9308cddddb4b74db4c49e8103d1b10cee3e
  random-zebra:
    utACK be27c9308cddddb4b74db4c49e8103d1b10cee3e and merging...

Tree-SHA512: 59b9fff073f75e36247b0fc2a89760a40f597e7fd9a3c4b4c8aaa1fc46a6721e25f61867f3257831ae6dbf21bea7f7920c93eaf6eb51a4601fd5bc009693ca4d

17a580a745b59166694a009001b1baa3112d664c [Net] Relay actual peers instead of localhost on getaddr (akshaynexus)

Pull request description:

  This fixes the getaddr response which is crucial for dns-seeders and wallet to find peers.On current code it only checks localhost addr being valid and if its known,while in reality we need to relay the node passed in args.

  Credit to @Aviator-Coding for pointing the bug out and the fix.

ACKs for top commit:
  furszy:
    Quite nice find 👍 , ACK 17a580a .
  Fuzzbawls:
    ACK 17a580a745b59166694a009001b1baa3112d664c
  random-zebra:
    ACK 17a580a745b59166694a009001b1baa3112d664c and merging...

Tree-SHA512: e273c0c8b20a2b2a89af4f899dd5aab851f1e205d0703cd7990073c17cce138054e18d832b10ec2a81e48877b5c64d4824f71def14ba5e27898baa7bb49ad0e0

a1819b5888f67727e02a8dd234b9842535f0022e [Wallet] Clean pwalletMain wrong usage inside wallet.cpp  . (furszy)
ef3ca99c826598cdcc0c781e738e4cf485b1a563 [Wallet] Clean more pwalletMain wrong usage in wallet_zerocoin. (furszy)
0dc11204c8699df9ed237ad2cdc99cf61d1e45ef [Move-only] Move GetDeterministicSeed & AddDeterministicSeed to legacy wallet_zerocoin. (furszy)
1ed1b5f3bc2cfcec89da16e8b5001b8c73021705 [Wallet] Cleanup wrong pwalletMain usage in wallet_zerocoin.cpp (furszy)

Pull request description:

  Essentially `wallet.cpp`, `crypter.cpp` and `wallet_zerocoin.cpp` were wrongly using/calling `pwalletMain` when those files are actually THE WALLET.

  This was blocking the `CWallet` object usage in unit test as the wallet (or any other wallet created that it's not `pwalletMain`) would be calling a pointer that could or couldn't exist when it should just call an internal method.

ACKs for top commit:
  random-zebra:
    Big ACK a1819b5888f67727e02a8dd234b9842535f0022e here.
  Fuzzbawls:
    ACK a1819b5888f67727e02a8dd234b9842535f0022e

Tree-SHA512: b978f842aa08f72905dd2210ad84cdea2399baf01bdf0b7d14015b9f005829c4a50c204ad57ba3c91cc261dc0ac1e8cb70205256b423feedfdad9d4022a80336

# Conflicts:
#	src/crypter.cpp
#	src/wallet/wallet_zerocoin.cpp
#	src/zvit/zvitwallet.cpp

8efee92c5342dd16887053d273a6a99af5ccda2a [Trivial][RPC] Remove references to old command list-conf (random-zebra)

Pull request description:

  `startmasternode` and `createmasternodebroadcast` error outputs are still
  referencing old command `list-conf` (deprecated since version v2.3.1).
  Replace with `listmasternodeconf`.

  Closes #1496

ACKs for top commit:
  furszy:
    utACK 8efee92
  Fuzzbawls:
    utACK 8efee92c5342dd16887053d273a6a99af5ccda2a

Tree-SHA512: 882a6bc00d8af03408f7894486b7e4b7e9ebd28cdf3b9876aa47ccecc6440d657b1d2a47e9cf26ec8a013fbaf788fe48cb934493fee5819468e4abcfc77f4d1f

d16b7b210bc0d6b83eae666a2ee776cc193043e3 Buffer log messages and explicitly open logs (random-zebra)

Pull request description:

  implemented on top of
  - [x] #1449
  - [x] #1437
  - [x] #1439

  Backports bitcoin#6149

  > Prevents stomping on debug logs in datadirs that are locked by other
  instances and lost parameter interaction messages that can get wiped by
  ShrinkDebugFile().
  The log is now opened explicitly and all emitted messages are buffered
  until this open occurs.  The version message and log cut have also been
  moved to the earliest possible sensible location.

ACKs for top commit:
  furszy:
    utACK d16b7b2
  Fuzzbawls:
    ACK d16b7b210bc0d6b83eae666a2ee776cc193043e3

Tree-SHA512: f3f859181499661641df1ccf118fdb583517c3f4104313df4c200471436e2c456bd9d15164215cfde274b235afdd2afe19a186c214d3c06461f0e3a03bd944b8

# Conflicts:
#	src/init.cpp

backports bitcoin@5255aca3f42e44eb02751299e84e2cf122ed9b49
# Conflicts:
#	src/rpcserver.h

Backports bitcoin@4d9950d3bc72d92a0ee9a33ab3b77e097eb77354

backports bitcoin@7fd50c3b70397c0dc39093a7a4ddbf9b36a615cf

… violations.

066a558a194f2f9442fd1d874038bf3cc832d01f [Wallet] Initialize zwalletMain to prevent memory access violations if it's not set. (furszy)

Pull request description:

  Simple enough, last fix needed for CWallet usage in unit test.

  Initializing zwalletMain to null to prevent memory access violations if it's not being set.

ACKs for top commit:
  random-zebra:
    utACK 066a558a194f2f9442fd1d874038bf3cc832d01f
  Fuzzbawls:
    utACK 066a558a194f2f9442fd1d874038bf3cc832d01f

Tree-SHA512: d7e6f0559730a0eacc4c967abbf6285a766d048c488ef48ce10832e12a0f2e28e4ea62080e8a143331c2c8cbbc89f81ee7324624d5e9b32d527e3d265140189a

# Conflicts:
#	src/wallet/wallet.h

ac5cb6bb737f7a389a25764e3c6e4d795a3a891b [Refactor] zerocoin_transactions and wallet_tests moved to WalletTestingSetup. (furszy)
5e1e3c6c55a73b9688f3e72a881bc30a035a5b65 [Test] Back port WalletTestingSetup. (furszy)

Pull request description:

  Created a new testing setup for unit tests that requires the wallet.

  Removing the dependency from the ones that don't need it.

ACKs for top commit:
  random-zebra:
    ACK ac5cb6bb737f7a389a25764e3c6e4d795a3a891b
  Fuzzbawls:
    ACK ac5cb6bb737f7a389a25764e3c6e4d795a3a891b

Tree-SHA512: c3e2b9b751539b5580ee3fb768a7e5de321b2344c80ec9bde4cb18d38c33a4a1b96af0e79511a6bed822fd9714097a9de1dab9f340d598921cea18a1ef2048ca

# Conflicts:
#	src/Makefile.test.include
#	src/test/accounting_tests.cpp
#	src/test/test_vitae.cpp
#	src/test/zerocoin_transactions_tests.cpp
#	src/wallet/test/wallet_tests.cpp

# Conflicts:
#	src/qt/vitae/settings/settingsinformationwidget.cpp

Instead of using default dummy strings and then setting their static
value during runtime object creation, set them in the ui file directly.

# Conflicts:
#	src/qt/clientmodel.h
#	src/qt/rpcconsole.cpp

9b9d5aa30f34fe5fea38b15270276832234341f0 [GUI] Update MNs GUI count every 40 seconds. (furszy)

Pull request description:

  Previously, we were updating the MNs cached count in the GUI every 4 seconds and there is absolutely no need to try to lock the important `cs_main` for a number so rarely used like the masternodes count. 40 seconds looks more like a decent time to check for MNs updates.

  Maybe we should discuss in the future if we really want to continue polling for this number. Could move it to a signal but still, it's a rarely used number. Thinking that it would be just fine to update it when the user request it and done.

ACKs for top commit:
  random-zebra:
    utACK 9b9d5aa30f34fe5fea38b15270276832234341f0
  Fuzzbawls:
    ACK 9b9d5aa30f34fe5fea38b15270276832234341f0

Tree-SHA512: 79a402dfc9ea5df7494413c0917f5579ac3a57394361b6ec085179ba71ddc25447a70f0b6462a872802ce1dceeecb126abdb895eca2dd07e6753330786a2c9c2

f1ee8fb87d181e51fb9a58a698d70652d055e34a [Depends] Include qt-gif plugin. (furszy)

Pull request description:

  Including gif plugin into the depends/gitian deployment fixing the not visible loading dialog animation.

  Peer work with @Fuzzbawls 🍻 .

ACKs for top commit:
  random-zebra:
    Tested ACK f1ee8fb87d181e51fb9a58a698d70652d055e34a
  Fuzzbawls:
    ACK f1ee8fb87d181e51fb9a58a698d70652d055e34a

Tree-SHA512: 5ac3ecd3661c770b7b35a750530b9582288b9f18ef0035c1ebc87f450d441fe4921b3c7a3557302eb44cf35530531765f499c9cf5c173c7cbc49d859c5398c63

4059ed849db54bbbc96bfde9f4153bab61b2ca26 [GUI] Add address-label to sendconfirm-popup (random-zebra)

Pull request description:

  Replaces #1311

ACKs for top commit:
  furszy:
    Nice work, tested ACK 4059ed8
  Fuzzbawls:
    ACK 4059ed849db54bbbc96bfde9f4153bab61b2ca26

Tree-SHA512: d2acfcc4cd5449e535081e5fcd8316f4fb0ab34d73b68bc88d9301afb7a384fc986e6b4cc0a5f02258dda0c1848f547e86f776232a3bc83dc38357e9cdc53836

# Conflicts:
#	src/qt/vitae/forms/sendconfirmdialog.ui