Skip to content

Conversation

@wqking
Copy link
Collaborator

@wqking wqking commented Apr 13, 2020

It builds successfully on Ubuntu, I didn't build on Mac (I don't have Mac machine).

wqking and others added 30 commits March 30, 2020 17:08
bc1fb933b1 gui: Remove QT_VERSION fallbacks for Qt < 5 (Wladimir J. van der Laan)
cd754957c6 build: Build system changes to support only Qt5 (Wladimir J. van der Laan)

Tree-SHA512: 8de2e99190e125285c8e6d69164defa4b4441b761befa3faaf96f77eaae2fa07e345673d28b54784a9c1b0a491a5fcf6260e7583b04eec0970af4fd08cf57d8a

# Conflicts:
#	build-aux/m4/bitcoin_qt.m4
#	src/qt/guiutil.cpp
#	src/qt/openuridialog.cpp
#	src/qt/vitae.cpp
a88b2aa40a [Docu] Add missing automake dependency (Mrs-X)

Tree-SHA512: 95b3d47afeeb52b50f5d0026bf3b7425864b9bc9cb698f5e45bf32770f7a5ca19255a36d8f226af8d86dfe4372c9fa6ac09c2b8e6476a51c1fc1d7f6eeae7465
a993d56e22 [UI] Add address to the payment request history (warrows)

Tree-SHA512: 25e437e7323d57a9c550c89911fd1efb291c18f4778034b436ea6393a4fb6102b76d32e1cda5dc345943c5b75f08d841fd42cafc1caa7129447aa3dbfe288ca1
1d77b186b7 gui change colors for tx labels (random-zebra)

Tree-SHA512: 76185182c0e0997b4bc226e59ff9fd7012e74c50eead81247d5948656ef3f99ac7d8b8dc28c01d796638df3bf9a8d8e97b2755af7d8a1f7c6c4091f1b6f6a607
6cf83ad [Build] Remove stale m4 file (Fuzzbawls)

Tree-SHA512: 89774b3969eb3a7455b71592881a1ee542c75bb21e7b917b1daa67303255e5918772c804d75328d1cde8bc60d20ed48f44463d0e2941857ffba0fb75b9e0d961

# Conflicts:
#	pkg.m4
ef26a15 Remove throw keywords in leveldb function signatures (Fuzzbawls)

Tree-SHA512: 707447ca5895fd13c8e91ab4c37ebe5fac67bf9480ee102e7aed18fe0042bd83d4479c1603de6979d0111e22d7b6174c5301e1131719fc2eb7a4a49451808a13
e5abd29 receivecoinsdialog: add button for Receiving Addresses (random-zebra)

Tree-SHA512: 2b26ebf81f0064d4feeb0d8967ea52c141cd0eb0354033c5ed92a7a0477f24b1dc2670e07bb08884572d50b5e92dcffd6ecd0156c9c3f800c1baa688ad3017b3
…-use

3158a8e [RPC]: Don't allow backupwallet to overwrite the wallet-in-use (Fuzzbawls)

Tree-SHA512: 7d76cfa07af4cec108d2f36859c44344439bb7ad31b83c6a8ef30790db7dbef2bd827eb520d41d7e1dfc47fa1ca41973978c21e7692b34bdb62335fa76b83904
f7cfcf7 Use IN6ADDR_ANY_INIT instead of in6addr_any (Fuzzbawls)
0063c1e GCC-7 and glibc-2.27 compat code (Chun Kuan Lee)

Tree-SHA512: 4a8522fc0c17447221b8515d3b606961279f1e29e41be1239e2b866c0983c0a57f0a76640afa85efcf0e676146ef48fd0d436432ab48cbe50efafde217012414

# Conflicts:
#	configure.ac
#	src/Makefile.am
…rdized + Cleanup in AccPoK and SoK to avoid redundant calculations.

eb73e16 aM_4 times aR stored (furszy)
68dc475 remove useless last loop round vResult serialization (furszy)
62b5f05 AccPoK, avoid do the same calculations many times (furszy)
111eb7e unneccessary mint (furszy)
a0cfc25 import and export zerocoin, private key format standardized (furszy)

Tree-SHA512: 5674108ad54a7ef2e613c28f4c40188bdd843075772dd87d263c2978bd407bd167380016852c737389a2f01831f9b586d33c9aa9f4c42fe2a6896e5e11e5033e
… Accumulator

1524ecf [Zerocoin] Remove explicit copy assignement operator from Accumulator (warrows)

Tree-SHA512: f62cf2cfaf85b6a4aa3848e927d7fe09f31a23de558de709986a1f80803b3528d562aa797ffb548f95fbe7cd178b84de73ea02fce55dea008276b3f5284a6c29
c93bf2b [Refactor] Remove GetCoinAge (Fuzzbawls)

Tree-SHA512: 0a27a423a55e2ee3e5656139c9139fe7f40d659ce8538009ec104856b51c12333125f5a31f948669785be0621b77132c15b8349f2288b407a6899c5db700c98f
e2692dd [RPC] Fix verifychain (Fuzzbawls)

Tree-SHA512: e858d5c0907472eff031ff3de755c0853d9c5fe49346a3fbb76cdebffafb22190b36ca3c24e1bf87523ad7d9e6e1836c3849c4a2800f12a29612bb20b0ef4c7b
916d332 [RPC] Sanitize walletpassphrase timeout argument (Fuzzbawls)

Tree-SHA512: a12dc4bbd42a7e3460272883e8c618e26ecdc2349bac523aa1f1bc6722f393cc4dc89a66b4fbedcd5cff72eab8113b1bec43ba1c28819fb4c2f32a7c7a6f6cd4
db51d53 [UI] Persist receive address through wallet restart (warrows)
5f7929f [UI] Change receive address upon receiving funds (warrows)
b10252b [UI] Add an address field to the receive form (warrows)

Tree-SHA512: f6ab8d1834a3fb5f5f8343395f1e960161a308e6bc5a8c9b8899cb4cf368b5511642dd1c89764a6d47fc0c85ac70a19a82d36fc23476c3fbe3422eb43c92ebbd

# Conflicts:
#	src/qt/forms/receivecoinsdialog.ui
76d17e9 [RPC] Fix movecmd's help description to include amount (Fuzzbawls)

Tree-SHA512: ea74b97641b4fe31d906af7e9488003e348275f52586f6fa4af8915790344a080fb62d81a996950e14c1d425e6831acdfb05db46a7cf8f47e368e8f197058c2c
e3c624d [RPC] Add more verbosity to validateaddress (Fuzzbawls)

Tree-SHA512: 55e9d0766d528d0f4d94729bb2cbf6d2eca52fcfa31ca88520cf2e048fa129eb787b197b0308e399388c281f567b36cd4a541901251f6879c4e8560d5e581b8e

# Conflicts:
#	src/rpcmisc.cpp
…llet address

93b830f [RPC] Error when calling getreceivedbyaddress with non-wallet address (Fuzzbawls)

Tree-SHA512: fe1b5b6b6435690c5a336a108e99995d9bc0d39ed2ecd12d22ff2a4b9f141fba63dd2f8bdf9b09be3739dbbcf382eb3f9e629967566f8c18ac49f2b83c0431fe

# Conflicts:
#	src/rpcwallet.cpp
…mValue

1f56fba [RPC] Ensure that a numeric is being passed to AmmountFromValue (Fuzzbawls)

Tree-SHA512: 3adf9c60ed5f7474b89527054744f55e60584a3a56ddc6977a2e35919119c902e9c2f4a62e841410b871f778530c9586dbe59fc3523747d82d37d27d76e92511
da28a5c [GUI] subclass QTreeWidgetItem for zpivcointrol and coincontrol (random-zebra)
cf9096c [UI] Sort numbers correctly in zPIV control dialog (warrows)

Tree-SHA512: 9fb4edad15b8ba3eeebd8ccd14c5a306b90293c0b6984f8a7d7484a827d4e2d4cce43867d38e02c9e8991f8857058f821d41648e794829c8e00238513d30973d
…ting

eb08890 [RPC] fix typo in 'walletpassphrase' help (random-zebra)
06254d5 fix bug with fWalletUnlockAnonymizeOnly flag setting (random-zebra)

Tree-SHA512: af6eed612d259421e863511b7e0a8906187f613c92b779975e9becc4e43812fa2fdb591dbfab48f9968d3031e9e0bf7539d53d0cf3b5e32c03adcf2fbf13729b
69459a3 [zPIV] Fix bignum overloads when using OpenSSL (Fuzzbawls)

Tree-SHA512: 54aa584ea41524d995fa4ddb63c57f2a5c331f278bf77ccea698ef135d877ac0b3a5695a7430373d194fd87544606e423f588e28cef7603e0e8c4d5b164bd33c

# Conflicts:
#	src/libzerocoin/bignum.h
…teCoinStake

7eea7d0 [Staking] Ensure nCredit is correctly initialized in CreateCoinStake (warrows)

Tree-SHA512: da9f87385f639424ec75ab697487249510a38ff4768703cdee80df063d035d8ac07274d612b195c081c6238a42d9a99f4d829fdf9144775afaa1de8a6b7b8e89
cab33db Stop using dummy strings in clientversion (Fuzzbawls)

Tree-SHA512: 7513fc0580f3eba45c085fffd0bf682b947268773dc0bf440926012768dc30ef70ee1acd63b21a51250a72118ca780a62d22e387af1a5797ada2847638805a71

# Conflicts:
#	src/clientversion.cpp
960137a05a [GUI] Add option to hide orphans in overview and txlist (random-zebra)

Tree-SHA512: d9c6b2cb073d9352b910bef3089a755e8991618b7f427e4e4ddfb48364103d5c63b65197d16f405b58aac7ab5d3ea00a886d51e162965d809346074d065d75ff

# Conflicts:
#	src/qt/optionsmodel.cpp
#	src/qt/optionsmodel.h
e66e20ed18 [Utils] Update linters for python3 (Fuzzbawls)

Tree-SHA512: 8c9bfa3bb8464ba8acbc1a9997dca656ca86f776b9eacc23aad45d2c11c64bd5a611ecd51778bd20d1814b5573d6b9a0d994e7b5105bd5f9a90b4ff5534768ba
Fuzzbawls and others added 26 commits April 10, 2020 16:25
24d72d0f64 [code review] LogPrintf nit change (CaveSpectre11)
019d26ac4c Don't assert if we were beaten to the block (CaveSpectre11)

Tree-SHA512: 9818319df999ba21fb6f89dadf254f76ad02d14b4f35fcae5b8d9a6251a0be5212650f3834a61a90fad2a9e8ce242751a9c09f7325c9cccc60223a59a6b3f22c
45ea523e1a [Build] Fix app name casing in mac deploy related files (Fuzzbawls)

Tree-SHA512: 79fd711f3db52e418f42b7cdcf26a4a68456e6727b1362837745eacfe1797eb8fb33a8a86812158c1e833862fca7fedc5e55ef0fa5d4a2d7eff654c646ea8214

# Conflicts:
#	contrib/macdeploy/detached-sig-create.sh
#	contrib/macdeploy/fancy.plist
55127d1264 [Gitian] Bump gitian build versions (Fuzzbawls)

Tree-SHA512: 29c6681b76adfb69b2f741d9f50575da0f870df8b822cb2886e10f6d364713221db0a94b017de3e89943e6e52d3aa2d7856604f092b73af14caa0ab9dc0b21bc

# Conflicts:
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx-signer.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win-signer.yml
#	contrib/gitian-descriptors/gitian-win.yml
…ustomizable.

46ba7a2b96 [Backport] Max tip age to consider a node in IBD status customizable. Backport from bitcoin##7208. (furszy)

Tree-SHA512: 211479d05cc8226d0bdaa3432204467679b465dfdbcdcf58650ec2fcb415c60544f3ae354f8b460adc6cd7e2d56ce6b3a52dd77ac92017eb7f66d98a76051bb2

# Conflicts:
#	src/init.cpp
#	src/main.cpp
d2136e30e0 depends: Update from upstream (Fuzzbawls)

Tree-SHA512: 9ce1b15170113cd207090f8986efd809cc6f4859132140e1c09f573e1015115ff82d961d7fc21375f8a5346de6bea656bb3bfb190ab95c60c080145d8ea67137

# Conflicts:
#	.travis.yml
#	configure.ac
#	depends/Makefile
#	depends/README.md
#	depends/config.site.in
#	depends/packages/expat.mk
#	depends/packages/miniupnpc.mk
#	depends/packages/native_biplist.mk
#	depends/packages/native_mac_alias.mk
#	depends/packages/packages.mk
#	src/Makefile.am
342f0341de Disable known failing regression tests (Fuzzbawls)
a5f887b00e [Travis] Update TravisCI from upstream (Fuzzbawls)

Tree-SHA512: 0cf866696ffb6cff539a1412c95f1f10a6e031629f153aa9a01b5326b77bc7de53912c36d254c859e437d7c3035f466d3b3db79aab26cec4767c75e45e16559a

# Conflicts:
#	.travis.yml
#	.travis/lint_04_install.sh
#	.travis/test_03_before_install.sh
#	.travis/test_04_install.sh
#	.travis/test_06_script_a.sh
9c0329c72b [zerocoin] Free memory from ToString() (warrows)

Tree-SHA512: c04bfcf1af3b9fd95cf6aa653367043d4a973805c37e820b3127a3198efbdb0f83eb82d8084409f17e059e44e7c653666899a5733dd1f272d0829ae0ceee388d
8695fd5fb5 Non-running dns servers removed + warrows dns added. (furszy)

Tree-SHA512: ad98e116255c919d1f0765585578afdb64e0368393faa1954bf23162e705165aa11c8d810ac913bd0c7325a0da096fd99535de5cb66778ad5be15f6a5d81b8c8

# Conflicts:
#	src/chainparams.cpp
d24742cf37 Remove redundant docs (Fuzzbawls)
007cc8c289 Update src/test/README.md (Fuzzbawls)
d2af9593e4 Introduce translation_strings_policy.md (Fuzzbawls)
019b8f4e8c Update contrib/devtools/README.md (Fuzzbawls)
2bc9d1b0f1 Update developer-notes.md (Fuzzbawls)
d1a65fdcaf Update dnsseed-policy.md (Fuzzbawls)
0b5c0c262b Update release-process.md (Fuzzbawls)
9335a103d1 Update test/functional/README.md (Fuzzbawls)
20f251336a Update doc/README.md (Fuzzbawls)
5b4f73def6 Clean up whitespace in Doxyfile.in (Fuzzbawls)
3cea76be03 Update and reformat init.md (Fuzzbawls)
2f5efbd12c Reformat files.md (Fuzzbawls)
df0d2ba1fe Introduce dependencies.md (Fuzzbawls)
785b61cf56 Update zmq.md (Fuzzbawls)
231f28e696 Update translation_process.md (Fuzzbawls)
c5f6822af5 Update tor.md (Fuzzbawls)
b7d0ec7696 Fix markdown in REST-interface.md (Fuzzbawls)
4fa4cc4ff2 Update Contributing guidelines (Fuzzbawls)
a544132207 Update build notes (Fuzzbawls)

Tree-SHA512: ab422791c3e43d6e455d648c9b6b30943c176e03d2a0702135184108c8887bb39e4bb9c51bab9f9a04a130a297f8db879563e3b45f010c6b1f34482122b78681

# Conflicts:
#	CONTRIBUTING.md
#	contrib/devtools/README.md
#	doc/Doxyfile.in
#	doc/README.md
#	doc/README_osx.md
#	doc/REST-interface.md
#	doc/bootstrap.md
#	doc/build-osx.md
#	doc/build-unix.md
#	doc/build-windows.md
#	doc/developer-notes.md
#	doc/dnsseed-policy.md
#	doc/files.md
#	doc/guide-startmany.md
#	doc/init.md
#	doc/masternode-budget.md
#	doc/masternode_conf.md
#	doc/multiwallet-qt.md
#	doc/release-process.md
#	doc/swifttx.md
#	doc/tor.md
#	doc/translation_process.md
#	doc/unit-tests.md
#	doc/zmq.md
#	src/test/README.md
#	test/functional/README.md
0608b9ca95 Misc updates (Fuzzbawls)
616b1d531c Introduce clang-format-diff.py (Fuzzbawls)
0367807d49 Introduce commit-script-check.sh (Fuzzbawls)
28bd93359a Update gitian-build.py (Fuzzbawls)
b0d7d07512 Update github-merge.py (Fuzzbawls)
fe7bf507d4 Introduce gen-manpages.sh (Fuzzbawls)
035dda7458 Introduce circular-dependencies.py (Fuzzbawls)
70721b47ac Migrate update-translations.py to python3 (Fuzzbawls)
1558ff775e Update install_db4.sh (Fuzzbawls)
5c92f16656 Add multi-purpose copyright header script (Fuzzbawls)

Tree-SHA512: 3cc0637288fe059c340bbaee8e5eda794df985280b739d8a976e6eaa7938bb24eb2bf554c4d1552cc5f45adcd1f1380e4ea390029ed9024f97bf80071918b9f4

# Conflicts:
#	contrib/devtools/security-check.py
#	contrib/gitian-build.py
#	contrib/install_db4.sh
eea9915361 [RPC] fix locking strategy (random-zebra)
49ef846774 [RPC] fix help texts (random-zebra)
26b1f0ca33 [RPC] 'getblockindexstats': count public spends separately (random-zebra)
7980f23c0c [RPC] fix fee calculation in 'getblockindexstats' and 'getfeeinfo' (random-zebra)
689ac23f62 [RPC] add 'getblockindexstats' function (random-zebra)

Pull request description:

  This introduces a new RPC method `getblockindexstats` to get aggregated BlockIndex data for a range of blocks:
  - transaction count
  - transaction count (including coinbase/coinstake txes)
  - zPIV per-denom mint count
  - zPIV per-denom spend count
  - total transaction bytes
  - total fees in block range
  - average fee per kB

  Since it expands the functionality of `getfeeinfo`, this method has been redirected to call `getblockindexstats` (over the **last** N blocks).

  To avoid code duplication with `getserials` and `getmintsinblocks`, the initial validation of the input params has been refactored in the function `validaterange()`.
  This also contains a fix to prevent the wallet from crashing when calling these functions over out-of-range blocks.

ACKs for commit eea991:
  Fuzzbawls:
    ACK eea9915
  Warrows:
    ACK eea9915

Tree-SHA512: fd424d27b09133f8e1b646044f6e48cb7be8e7b7f6bbe51797b229e7e1c5d721226022915876d3810b38e7c2eb6bb089a7e3b8df2b0487ac251bde405e1f964a
88705a6099 [Consensus] Guard time checks changes (warrows)
105ee5fd07 [Consensus] Readd checks removed in 3b778f56fe2b5e5b363c8c6d794a848a84d630d1 (warrows)
2621b7f3f7 [Refactoring] Move ContextualCheckZerocoinStake() to kernel.cpp (warrows)

Pull request description:

  Two checks on the age of a transaction used to stake were removed by mistake in 3b778f5. We reintroduce them here.
  2621b7f is a bit of refactoring
  105ee5f is the real change
  88705a6 avoid checking blocks already in the blockchain

ACKs for commit 88705a:
  furszy:
    ACK 👌  [88705a6](PIVX-Project/PIVX@88705a6)
  Fuzzbawls:
    ACK 88705a6

Tree-SHA512: 13397aac35b1d8c6680993ba90a1266113baf25bd16410f408d7d16f9eaa93f7cd0f665224959c64dfac5725bdacc25bead9d65cd8d9bdcd5570b9434ebd851a

# Conflicts:
#	src/kernel.cpp
#	src/main.cpp
fe67706fd2 Remove more useless obfuscation code (Fuzzbawls)
eed0a1d34e Remove more useless obfuscation code (Fuzzbawls)
3bb5c768bf Remove unused functions in wallet.cpp (Fuzzbawls)
166b2d31c8 Remove nAnonymizePivxAmount and nLiquidityProvider (Fuzzbawls)
886d806f58 Remove unused code in DoAutomaticDenominating (Fuzzbawls)
742a7b187c [Qt] Remove unused obfuscationconfig (Fuzzbawls)

Pull request description:

  Removal of "dead" code surrounding the defunct obfuscation feature.

  Obfuscation as a usable feature was removed in November 2017, but much of it's underlaying code remained. This PR aims to clean up and remove the now unnecessary code.

  Marking as [WIP] for the time being.

ACKs for commit fe6770:
  random-zebra:
    ACK PIVX-Project/PIVX@fe67706

Tree-SHA512: 46ab7d035aa899677d1337c6a58def25e452c24db038b769e9e6f980ac43e03a34af968114facadcd62ec93eacf41de0a385f60d91630a0ac8425cd385d9a513

# Conflicts:
#	src/init.cpp
#	src/obfuscation.cpp
#	src/obfuscation.h
#	src/qt/obfuscationconfig.cpp
#	src/qt/obfuscationconfig.h
#	src/qt/optionsmodel.cpp
#	src/util.cpp
#	src/util.h
#	src/wallet.cpp
ab441f3728 [Net] Add a couple new testnet checkpoints (Fuzzbawls)

Pull request description:

  1. `1106100` height that zc public spends became available
  2. `1112700` random recent testnet block that meets criteria

ACKs for commit ab441f:

Tree-SHA512: c138a71939e66a0a9ac598a25f6984c4f05f846533ded2a90f0430c7d71608baf81e48e8bd3ca71206794f3212c2f9e3e8ed5cd282f9c9d02a38db61f7585e85
cd11699936 [Doc] 3.3.0 Notable Changes (Fuzzbawls)

Pull request description:

  Notable changes for 3.3.0

  #ci-skip

ACKs for commit cd1169:

Tree-SHA512: 6cb841dd65873c1c3cc7c7b03ab672ae17e0945e9872b3f53a4accf6b919f46aab9fbdc95753fd159cda88db86f2fcc087a15a3e1605fda170a99b6c50e0f7e9

# Conflicts:
#	doc/release-notes.md
c447aecc1b [Net] Update hard-coded seeds (Fuzzbawls)

Pull request description:

  Updated hard-coded seeds based on uptime and availability from primary
  DNS seeder.

ACKs for commit c447ae:

Tree-SHA512: 4ca56e41e277092093eead76fbc229a130bb786790c784a91e0d78a724f35a6e6594c4daa82a9dda88f7ed2eae441bc371fa2b4ab3d50d203d518d667ecbd2a9

# Conflicts:
#	src/chainparamsseeds.h
# Conflicts:
#	configure.ac
#	doc/release-notes.md
Let's see if this works :)
Copy link
Contributor

@2a5A1Ghu1 2a5A1Ghu1 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Travis did not like this either... Need help with this one

@2a5A1Ghu1
Copy link
Contributor

Compiles with Openssl 1.1 on mac perfectly... Travis still needs fixing once we go full release.

@2a5A1Ghu1 2a5A1Ghu1 merged commit 9f38b59 into VitaeTeam:update-upstream-v3.3.0 Apr 20, 2020
@2a5A1Ghu1 2a5A1Ghu1 mentioned this pull request Apr 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.