Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR #174 conflictions fix #193

Merged
merged 111 commits into from
Oct 18, 2021

Commits on Mar 7, 2020

  1. Configuration menu
    Copy the full SHA
    b81eb56 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    d36dbc8 View commit details
    Browse the repository at this point in the history
  3. Ust std threading in sync.{h,cpp}

    Another removal of boost dependency as well as fixing up some
    `-Wthread-safety-analysis` issues.
    Fuzzbawls authored and KolbyML committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    cdf4e2a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    44f8161 View commit details
    Browse the repository at this point in the history
  5. WIN32 Seed Cleanup: Move nLastPerfmon behind win32 ifdef.

    Code to avoid calling Perfmon too often is only needed when perfmon is actually going to get called.
    This is not intended to make any functional difference in the addition of entropy to the random pool.
    21E14 authored and KolbyML committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    bd068e5 View commit details
    Browse the repository at this point in the history
  6. nLastTry is only used for addrman entries

    No need to define it for every CAddress, as it's memory only anyway.
    sipa authored and KolbyML committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    8d24bcb View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2020

  1. [Crypto] Switch from openssl to secp256k1 for consensus

    [Refactoring] Moved and removed some stuff
    -Removed duplicated arith uint files
    -Removed unused variables
    -Move keystore impls to .cpp instead of .h
    -Removed useless function in key.cpp
    [Crypto] fix bip38 compilation for latest libsecp256k1
    [Compilation] Change compilation and some code to use libsec instead of sslcrypto
    [Crypto] Update keys to comply with latest secp256k1 lib
    Warrows authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    d2cdaac View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    002aef4 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3bbebe8 View commit details
    Browse the repository at this point in the history
  4. [Crypto] Add ctx initialisation for bip38

    Warrows authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    7a63c62 View commit details
    Browse the repository at this point in the history
  5. [Refactor] Remove begin/end_ptr functions

    With C++11 these functions are not needed anymore and gracefully
    replaced
    Warrows authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    8e304df View commit details
    Browse the repository at this point in the history
  6. Wipe zerocoin DB on reindex.

    The zerocoin database should be wiped on reindex. If leftover information from a fork is left in the db it can lead to potential validation issues in the future and isolated forks.
    presstab authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    ffb4d90 View commit details
    Browse the repository at this point in the history
  7. [Bug] Fix CMasternodeConfig::read

    rebase from upstream. Windows doesn't initialize CService properly
    during startup before the masternode.conf file is read.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    a819103 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    670ae61 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    ad21d7b View commit details
    Browse the repository at this point in the history
  10. [Build] Remove unnecessary BOOST dependency

    Mrs-X authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    1a9ae7c View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    fbf04f6 View commit details
    Browse the repository at this point in the history
  12. [Build] Make sure Boost headers are included for libzerocoin

    Custom boost locations not using pkg_config can result in a header
    include not being found when compiling the libzerocoin library. This
    quick fix ensures that the `BOOST_CPPFLAGS` are explicitely included.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    9b9ad39 View commit details
    Browse the repository at this point in the history
  13. [Qt] Add Tor service icon to status bar

    Tor Icon is displayed when the client is initialized with a successful
    tor service connection.
    
    Icon is hidden otherwise.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    739e6e4 View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    0d6514c View commit details
    Browse the repository at this point in the history
  15. Configuration menu
    Copy the full SHA
    538fab9 View commit details
    Browse the repository at this point in the history
  16. Configuration menu
    Copy the full SHA
    c6ee535 View commit details
    Browse the repository at this point in the history
  17. Remove boost dependency

    Instead of using boost::lexical_cast we can just use std::to_string
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f5dcf5a View commit details
    Browse the repository at this point in the history
  18. Clean up header includes

    Use proper include ordering and only include the needed QStyle header.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f779b29 View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    6821991 View commit details
    Browse the repository at this point in the history
  20. Remove useless returns

    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    7811144 View commit details
    Browse the repository at this point in the history
  21. Comment/Whitespace/nullptr cleanup

    Also use proper define in header file
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    134eacd View commit details
    Browse the repository at this point in the history
  22. Configuration menu
    Copy the full SHA
    61d6ac9 View commit details
    Browse the repository at this point in the history
  23. Configuration menu
    Copy the full SHA
    5f42959 View commit details
    Browse the repository at this point in the history
  24. [Qt] Fix PIV balances on overview page

    Locked balances were being double counted in the total and available
    values. This fixes the issue once and for all.
    
    fixes PIVX-Project#654
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    fbfafdc View commit details
    Browse the repository at this point in the history
  25. Configuration menu
    Copy the full SHA
    04130df View commit details
    Browse the repository at this point in the history
  26. Fixes for tor

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    adee848 View commit details
    Browse the repository at this point in the history
  27. Fixed bug in multisend

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    50b68f7 View commit details
    Browse the repository at this point in the history
  28. Configuration menu
    Copy the full SHA
    7a730b1 View commit details
    Browse the repository at this point in the history
  29. build: Build system changes to support only Qt5

    (cherry picked from commit bad068a)
    laanwj authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f4a667b View commit details
    Browse the repository at this point in the history
  30. gui: Remove QT_VERSION fallbacks for Qt < 5

    There were surprisingly many `#ifdef` fallbacks for Qt 4.
    
    Removing them simplifies maintenance, as well as adding new GUI
    functionality.
    
    (cherry picked from commit 907f73b)
    laanwj authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    b6a6c58 View commit details
    Browse the repository at this point in the history
  31. [Docu] Add missing automake dependency

    Mrs-X authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    824dfc2 View commit details
    Browse the repository at this point in the history
  32. Configuration menu
    Copy the full SHA
    ce74323 View commit details
    Browse the repository at this point in the history
  33. [Wallet] Avoid autocombine getting stuck

    Fix an edge case where autocombine would get stuck if available
    UTXOs are low in value compared to autocombine threshold
    Warrows authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    3825283 View commit details
    Browse the repository at this point in the history
  34. [Build] Remove stale m4 file

    This file has not been used in quite a while, nuke it from orbit.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    ebc70d7 View commit details
    Browse the repository at this point in the history
  35. [RPC]: Don't allow backupwallet to overwrite the wallet-in-use

    Prevent file access collisions and possible file corruption by refusing
    to overwrite the current wallet in use.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    5b38882 View commit details
    Browse the repository at this point in the history
  36. GCC-7 and glibc-2.27 compat code

    (cherry picked from commit 908c1d7)
    ken2812221 authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    85b685a View commit details
    Browse the repository at this point in the history
  37. Use IN6ADDR_ANY_INIT instead of in6addr_any

    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    d475dc3 View commit details
    Browse the repository at this point in the history
  38. [Refactor] Remove GetCoinAge

    This function is never used, and never will be; Nuke it from orbit.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    6c87548 View commit details
    Browse the repository at this point in the history
  39. [RPC] Fix verifychain

    verifychain only accepts a single (optional) argument instead of two,
    and we need to capture that argument properly.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    d7b5832 View commit details
    Browse the repository at this point in the history
  40. [RPC] Sanitize walletpassphrase timeout argument

    Properly return an error when attempting to use a negative timeout. Also
     sanitize the timeout so as to not cause a value error with libevent on
     MacOS.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    0f71c50 View commit details
    Browse the repository at this point in the history
  41. [RPC] Fix movecmd's help description to include amount

    Even though this command is all but deprecated, it's help output and
    example were incorrect and deserving of an update.
    
    amount is the 3rd paramater, and is required. minconf is the 4th
    paramater, and for all intents and purposes is a "dummy" paramater since
     it is no longer considered in the functional logic.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    4593d89 View commit details
    Browse the repository at this point in the history
  42. [RPC] Error when calling getreceivedbyaddress with non-wallet address

    When calling `getreceivedbyaddress` with a non-wallet address, return a
    proper error code/message instead of `0`
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    244c0d8 View commit details
    Browse the repository at this point in the history
  43. Configuration menu
    Copy the full SHA
    fde8f9a View commit details
    Browse the repository at this point in the history
  44. Configuration menu
    Copy the full SHA
    e84827e View commit details
    Browse the repository at this point in the history
  45. Configuration menu
    Copy the full SHA
    a2a25be View commit details
    Browse the repository at this point in the history
  46. [Utils] Update linters for python3

    check-doc and logprint-scanner were still using python2 conventions.
    This updates the two scripts to use pyhon3 instead and be consistent
    with the rest of our python utility scripts.
    
    Also, use a more widely accessible bash path in lint-whitespace.sh
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    0c0a89b View commit details
    Browse the repository at this point in the history
  47. Configuration menu
    Copy the full SHA
    8f22d1c View commit details
    Browse the repository at this point in the history
  48. Configuration menu
    Copy the full SHA
    2942f52 View commit details
    Browse the repository at this point in the history
  49. Configuration menu
    Copy the full SHA
    a6d34fa View commit details
    Browse the repository at this point in the history
  50. Configuration menu
    Copy the full SHA
    250506d View commit details
    Browse the repository at this point in the history
  51. [Net] Pull uacomment in from upstream

    Used primarialy (for now) in node identification for upcoming regtest
    scripting.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    9601f0d View commit details
    Browse the repository at this point in the history
  52. Configuration menu
    Copy the full SHA
    f11afb9 View commit details
    Browse the repository at this point in the history
  53. [RPC] Add mediantime to getblock/getblockheader output

    Simple addition to the JSON output; mainly used in upcoming functional
    test updates.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    5b38ec4 View commit details
    Browse the repository at this point in the history
  54. [RPC] Show the configured/set txfee in getwalletinfo

    Simple consistency addition. This mimmics the output from `getinfo`.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    a478538 View commit details
    Browse the repository at this point in the history
  55. [Build] Update genbuild.sh script

    - Fix git's rev-list call
    - Add proper copyright headers from upstream
    - Check that the script is in the git tree
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    e0cb565 View commit details
    Browse the repository at this point in the history
  56. [Main] Unify shutdown proceedure in init rather than per-app

    This moves CScheduler and threadGroup to a static declaration in init
    .cpp so as to avoid a potential shutdown deadlock where both are freed
    before the network message handler thread has been completely released.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    50493da View commit details
    Browse the repository at this point in the history
  57. Configuration menu
    Copy the full SHA
    2c4e3ea View commit details
    Browse the repository at this point in the history
  58. Remove Boost dependency from sync.cpp

    use c++11 for loops instead of BOOST_FOREACH
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    49eee10 View commit details
    Browse the repository at this point in the history
  59. Configuration menu
    Copy the full SHA
    5fe6a8f View commit details
    Browse the repository at this point in the history
  60. Remove unused fTry from push_lock

    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    fb9cb1b View commit details
    Browse the repository at this point in the history
  61. Configuration menu
    Copy the full SHA
    73d2fb8 View commit details
    Browse the repository at this point in the history
  62. Finalize cleanup of sync.cpp/h

    - include memory system header for std pointers
    - remove unused MutexName
    - declare single-argument constructors as explicit
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    2fe725f View commit details
    Browse the repository at this point in the history
  63. [Qt] Don't show staking/automint status icons without a wallet

    When running the client with the `-disablewallet` option, the staking
    and automint icons should always be hidden. This adds a check to see if
    `walletFrame` has been set before showing/updating these two icons.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    8c81703 View commit details
    Browse the repository at this point in the history
  64. Configuration menu
    Copy the full SHA
    ed4012a View commit details
    Browse the repository at this point in the history
  65. ionRecord::StakeZPIV

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    7204399 View commit details
    Browse the repository at this point in the history
  66. Depends: Update to most recent version

    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    475c9b8 View commit details
    Browse the repository at this point in the history
  67. Update README.md

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    af123af View commit details
    Browse the repository at this point in the history
  68. Configuration menu
    Copy the full SHA
    0c1a764 View commit details
    Browse the repository at this point in the history
  69. Build: Update coverage build target(s)

    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    9be21de View commit details
    Browse the repository at this point in the history
  70. Configuration menu
    Copy the full SHA
    8d88d67 View commit details
    Browse the repository at this point in the history
  71. Build: Introduce endian and byteswap

    Add Checks for local endian and byteswap support.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    e9007c3 View commit details
    Browse the repository at this point in the history
  72. Configuration menu
    Copy the full SHA
    13a9e24 View commit details
    Browse the repository at this point in the history
  73. Configuration menu
    Copy the full SHA
    3e4248b View commit details
    Browse the repository at this point in the history
  74. Update configure.ac

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    ae2ae12 View commit details
    Browse the repository at this point in the history
  75. Configuration menu
    Copy the full SHA
    4ac5150 View commit details
    Browse the repository at this point in the history
  76. Build: utility test updates

    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    ef75157 View commit details
    Browse the repository at this point in the history
  77. Gitian: remove reference datetime

    Add env prefix to bash scripting
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    1fb9d15 View commit details
    Browse the repository at this point in the history
  78. Gitian: update descriptors for bionic

    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    db850e5 View commit details
    Browse the repository at this point in the history
  79. Contrib: Update macdeployqtplus subdir

    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    8b36eb1 View commit details
    Browse the repository at this point in the history
  80. Update packages.mk

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    4e55e6a View commit details
    Browse the repository at this point in the history
  81. Update protobuf.mk

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    386a52b View commit details
    Browse the repository at this point in the history
  82. fixes for changes

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f78dada View commit details
    Browse the repository at this point in the history
  83. Merge PIVX-Project#783: [Depends] Update QT to 5.9.7

    caea417 Update QT to 5.9.7 (cevap)
    
    Tree-SHA512: 34197e7b92711f3f0392b071de58900592ab8bb2ed3e50cd853cf2da56ba2f6d9b3ee57e4d01f3c2cdce4710ebe0c079bba434263b9af65141363086b9213025
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    c72627f View commit details
    Browse the repository at this point in the history
  84. Fix Missing Explorer Icon

    sicXnull authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    75f2c3b View commit details
    Browse the repository at this point in the history
  85. Merge PIVX-Project#795: [Build] Add support for RISC-V and build it w…

    …ith gitian
    
    f6c1d4a Add check symbols for gitian-linux.yml (cevap)
    4a3d3ea Use pivx in config lines (cevap)
    321f0e0 Update linux descriptor (cevap)
    4e0244b Update symbol check script (cevap)
    c251de5 Update glibc_compat.cpp with risc (cevap)
    fb0bdae Gitian: add risc build (cevap)
    
    Tree-SHA512: f91fa1da9c48e3ccb87cb1ddd825d353a15e439b778bd95eb53f22b8884ecb1ddda954a506553dbb8322e931d1b8b34211e1dc7e4b431eafa107d81bdd8e6faa
    Mrs-X authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    e61f804 View commit details
    Browse the repository at this point in the history
  86. Update qt.mk

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f84aadd View commit details
    Browse the repository at this point in the history
  87. Configuration menu
    Copy the full SHA
    61be3a4 View commit details
    Browse the repository at this point in the history
  88. Update zmq to 4.3.1

    Addresses https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-6250
    
    Signed-off-by: cevap <dev@i2pmail.org>
    rex4539 authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    3a09580 View commit details
    Browse the repository at this point in the history
  89. cleanup, remove trading dialog form

    furszy authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    7922e3c View commit details
    Browse the repository at this point in the history
  90. Configuration menu
    Copy the full SHA
    5663208 View commit details
    Browse the repository at this point in the history
  91. [macOS] Remove DS_Store WindowBounds bytes object

    Github-Pull: PIVX-Project#858
    Rebased-From: 21f5078
    jonasschnelli authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    4bb73fe View commit details
    Browse the repository at this point in the history
  92. Configuration menu
    Copy the full SHA
    e5d8cb7 View commit details
    Browse the repository at this point in the history
  93. [Travis] Add separate job to check doc/logprint/subtree

    Break out a new job to do the basic linting that check-dock.py and
    logprint-scanner.py did.
    
    Also add new scripts to check the sanity of
    any git subtrees and to check that new pull requests don't contain any
    trailing whitespace.
    
    Also, remove the outdated slack notification callback
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    6f3249d View commit details
    Browse the repository at this point in the history
  94. travis: run subtree checks for leveldb

    Also for libsecp256k1 now that it has been updated
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    ffc0a86 View commit details
    Browse the repository at this point in the history
  95. Travis: Update to use docker with Bionic target

    This changes the TravisCI behavior to use docker with a Bionic target.
    Provides consistency with gitian target.
    Fuzzbawls authored and KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    02bbc02 View commit details
    Browse the repository at this point in the history
  96. Configuration menu
    Copy the full SHA
    07eb90f View commit details
    Browse the repository at this point in the history
  97. Update .travis.yml

    KolbyML committed Mar 14, 2020
    Configuration menu
    Copy the full SHA
    f93e697 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2020

  1. Configuration menu
    Copy the full SHA
    ae8b73b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f8de61b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    e55c1df View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    da72b62 View commit details
    Browse the repository at this point in the history
  5. fixes for leveldb and travis

    KolbyML committed Mar 15, 2020
    Configuration menu
    Copy the full SHA
    043e609 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2021

  1. Merge remote-tracking branch 'upstream/airdrop' into pr-174-fix-confl…

    …icts
    
    # Conflicts:
    #	build-aux/m4/bitcoin_qt.m4
    #	configure.ac
    #	depends/packages/qt.mk
    #	src/Makefile.am
    #	src/httpserver.cpp
    #	src/init.cpp
    #	src/kernel.cpp
    #	src/keystore.cpp
    #	src/main.cpp
    #	src/masternodeconfig.cpp
    #	src/phored.cpp
    #	src/qt/macdockiconhandler.mm
    #	src/qt/phore.cpp
    #	src/qt/proposallist.cpp
    #	src/rpc/blockchain.cpp
    #	src/rpc/budget.cpp
    #	src/rpc/client.cpp
    #	src/rpc/masternode-budget.cpp
    #	src/rpc/masternode.cpp
    #	src/rpc/mining.cpp
    #	src/rpc/misc.cpp
    #	src/rpc/net.cpp
    #	src/rpc/protocol.cpp
    #	src/rpc/rawtransaction.cpp
    #	src/rpc/server.cpp
    #	src/rpc/server.h
    #	src/rpcmasternode-budget.cpp
    #	src/script/sigcache.cpp
    #	src/sync.cpp
    #	src/sync.h
    #	src/wallet/wallet.cpp
    wqking committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    a84dd87 View commit details
    Browse the repository at this point in the history
  2. Fixed compile errors

    wqking committed Sep 25, 2021
    Configuration menu
    Copy the full SHA
    433ff62 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2021

  1. Fixed compile warnings

    wqking committed Sep 29, 2021
    Configuration menu
    Copy the full SHA
    ca740e8 View commit details
    Browse the repository at this point in the history