Cherry-pick upstream changes. #33
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
binarysculptor
pushed a commit
that referenced
this pull request
Dec 30, 2018
binarysculptor
pushed a commit
that referenced
this pull request
Dec 30, 2018
binarysculptor
pushed a commit
that referenced
this pull request
Dec 30, 2018
binarysculptor
pushed a commit
that referenced
this pull request
Dec 30, 2018
binarysculptor
pushed a commit
that referenced
this pull request
Dec 31, 2018
Merge #688: [Zerocoin] RPC import/export zerocoins private key standardized + 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 Merge #730: [Wallet] fix bug with fWalletUnlockAnonymizeOnly flag setting eb08890 [RPC] fix typo in 'walletpassphrase' help (random-zebra) 06254d5 fix bug with fWalletUnlockAnonymizeOnly flag setting (random-zebra) Tree-SHA512: af6eed612d259421e863511b7e0a8906187f613c92b779975e9becc4e43812fa2fdb591dbfab48f9968d3031e9e0bf7539d53d0cf3b5e32c03adcf2fbf13729b Merge #725: [UI] Sort numbers correctly in zPIV and coin control dialogs da28a5c [GUI] subclass QTreeWidgetItem for zpivcointrol and coincontrol (random-zebra) cf9096c [UI] Sort numbers correctly in zPIV control dialog (warrows) Tree-SHA512: 9fb4edad15b8ba3eeebd8ccd14c5a306b90293c0b6984f8a7d7484a827d4e2d4cce43867d38e02c9e8991f8857058f821d41648e794829c8e00238513d30973d Merge #724: [RPC] Ensure that a numeric is being passed to AmmountFromValue 1f56fba [RPC] Ensure that a numeric is being passed to AmmountFromValue (Fuzzbawls) Tree-SHA512: 3adf9c60ed5f7474b89527054744f55e60584a3a56ddc6977a2e35919119c902e9c2f4a62e841410b871f778530c9586dbe59fc3523747d82d37d27d76e92511 Merge #731: [zPIV] Fix bignum overloads when using OpenSSL 69459a3 [zPIV] Fix bignum overloads when using OpenSSL (Fuzzbawls) Tree-SHA512: 54aa584ea41524d995fa4ddb63c57f2a5c331f278bf77ccea698ef135d877ac0b3a5695a7430373d194fd87544606e423f588e28cef7603e0e8c4d5b164bd33c Merge #733: [GUI] Hide orphans 960137a [GUI] Add option to hide orphans in overview and txlist (random-zebra) Tree-SHA512: d9c6b2cb073d9352b910bef3089a755e8991618b7f427e4e4ddfb48364103d5c63b65197d16f405b58aac7ab5d3ea00a886d51e162965d809346074d065d75ff Merge #736: [Utils] Update linters for python3 e66e20e [Utils] Update linters for python3 (Fuzzbawls) Tree-SHA512: 8c9bfa3bb8464ba8acbc1a9997dca656ca86f776b9eacc23aad45d2c11c64bd5a611ecd51778bd20d1814b5573d6b9a0d994e7b5105bd5f9a90b4ff5534768ba Merge #726: [RPC] include mints metadata in 'listmintedzerocoins' output 864aef8 [RPC] include mints metadata in 'listmintedzerocoins' output (random-zebra) Tree-SHA512: bc19fbf7af754d4616f658668e1b4ad351e8e97b29038ab02134de4f589222e3f30f5b2ccf8b69efa00a6da56f02e5f87eb12f9ca71afc8047040c6bde70d843 Merge #727: [RPC] Add 'spendzerocoinmints' RPC call f8ec8e0 [RPC] add 'spendzerocoinmints' RPC call (random-zebra) Tree-SHA512: 95933d5f4a2de70cf9b0b29b3ed922c39b12059f08a66cd7ddfd60a8f21274fc3ef3f76b6fc70c87768b137b78fccd0f59d22b99a99b53c3d77fc20a6045384f Merge #729: [RPC] Fix RPCTimerInterface 0053876 [RPC]: Fix RPCTimerInterface ordering issue (bitcoin/bitcoin#7317) (random-zebra) Tree-SHA512: 0e3b5ea32d48d824e37fff701c420e835c1da011cfe10302d47773341ca303ad680b85b2e6d505cda6d29be3e1c0964ee5880f66a67b1aed07aa510ba6fdc312 Merge #737: [Refactor] Remove 'boost::lexical_cast<>' a1a8fb9 Replace 'boost::lexical_cast<std::int>' with 'std::stoi' (random-zebra) 6c7b8ae Replace 'const boost::bad_lexical_cast' with 'std::invalid_argument' (random-zebra) e89923f Replace 'boost::lexical_cast<std::string>' with 'std::to_string' (random-zebra) Tree-SHA512: 37900a8cadacab61d31872d55c8cb1a654a4f395ffd51292a370d9fb15f313c86bbb5c15f3278394a59ae523341b94a0d091167283e4e87d5d41287502917373 Merge #740: [Net] Pull uacomment in from upstream ec8f69a [Net] Pull uacomment in from upstream (Fuzzbawls) Tree-SHA512: b6f30a711967af188dd4aab42338d161c5ee587eb36a2a3625be81c32c8b61ce03a19f5485b3b3cbc945f903b2eb32db6a3b081c2ef3e9561aa538583cb4713a Merge #741: [GUI] Sort by 'data' in zPIV and coin control dialogs 8b87ad3 [GUI] introduce CCoinCointrolWidgetItem and CZPivControlWidgetItem (random-zebra) Tree-SHA512: 59f8fc92c454ad3fa07f49f8bd1b3313e60b60eff413723ae16d6a12b440416a7db89d5f9f20a8813f9d23574eeeaba635f84bb9863457aae5dc0818d9971512 Merge #742: [RPC] Add masternode's pubkey to listmasternodes RPC 132166e Add masternode's pubkey to listmasternodes RPC (presstab) Tree-SHA512: c8d7a50aa275b0da845c86f942fe49f2e1974983bf9a9553cef6897760b737c07950ba828196ebaa36f6992593085695fe814923b39b7bbf410533eb51ebe9cd Merge #743: [Refactor] remove CPubKey::GetHex 63daf40 [Refactor] remove CPubKey::GetHex (random-zebra) Tree-SHA512: 360902e7e54c296c73de233f2fdb3b057916141c54d12f594a9a0c84e75cc8d554cef16c2119c2c2e886448f83bdf37bdb8bda39156040e4f6afab962aa9cc0d Merge #750: [RPC] Add mediantime to getblock/getblockheader output 14c2d6a [RPC] Add mediantime to getblock/getblockheader output (Fuzzbawls) Tree-SHA512: a950428f78eb027b9ea0570504d61983962374e0668514233528bba549da3156d173356a46d05a6ca786aae422d1b10f256be38bccba078f5d272d4d455a0916 Merge #751: [RPC] Show the configured/set txfee in getwalletinfo 02f330a [RPC] Show the configured/set txfee in getwalletinfo (Fuzzbawls) Tree-SHA512: bb6e56c2d2b72d84e9fee9da817368368f5b46622566019d3e8ca95762db82718ef88136955ba285c63a7ff8f4d8259762f8b42f608222ff0c473304ccabca70 Merge #749: [Build] Update genbuild.sh script 3eef1b9 [Build] Update genbuild.sh script (Fuzzbawls) Tree-SHA512: b94abc47dd8effbefd40c933d33053ff7a0ec7ca86b17fb98c0ea9c7a09afee7c6a9facf59e57d0f89245f09d3312b301178404e18c30ec651308be23ddbaad6 Merge #760: [RPC] Show BIP65 soft-fork progress in getblockchaininfo e723d969c2 [RPC] Show BIP65 soft-fork progress in getblockchaininfo (Fuzzbawls) Tree-SHA512: e8a214bd48f567e16d6eb3f0634ff7907802a7935ee60e89ffea59f4a00a445fa2735246048ed762e488d31bc5b030c50b6ecab9bde855247b858f12b8be6ce6 Merge #752: [Build] Fix Thread Safety Analysis Warnings db478c0 Ust std threading in sync.{h,cpp} (Fuzzbawls) 19ac6d8 Remove Boost dependency from the httpserver (Fuzzbawls) 3e22c85 Miner: use std methods instead of boost for timing conditions (Fuzzbawls) Tree-SHA512: f6ba63f8885791cc7a5bc0bf1feb88acba6b1e1832005d76191c2ab98cdce1819becf2941af9e01537be189aa81cddefe1637dde2225fcf9deedca7d661553ca
binarysculptor
pushed a commit
that referenced
this pull request
Dec 31, 2018
Merge #688: [Zerocoin] RPC import/export zerocoins private key standardized + 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 Merge #730: [Wallet] fix bug with fWalletUnlockAnonymizeOnly flag setting eb08890 [RPC] fix typo in 'walletpassphrase' help (random-zebra) 06254d5 fix bug with fWalletUnlockAnonymizeOnly flag setting (random-zebra) Tree-SHA512: af6eed612d259421e863511b7e0a8906187f613c92b779975e9becc4e43812fa2fdb591dbfab48f9968d3031e9e0bf7539d53d0cf3b5e32c03adcf2fbf13729b Merge #725: [UI] Sort numbers correctly in zPIV and coin control dialogs da28a5c [GUI] subclass QTreeWidgetItem for zpivcointrol and coincontrol (random-zebra) cf9096c [UI] Sort numbers correctly in zPIV control dialog (warrows) Tree-SHA512: 9fb4edad15b8ba3eeebd8ccd14c5a306b90293c0b6984f8a7d7484a827d4e2d4cce43867d38e02c9e8991f8857058f821d41648e794829c8e00238513d30973d Merge #724: [RPC] Ensure that a numeric is being passed to AmmountFromValue 1f56fba [RPC] Ensure that a numeric is being passed to AmmountFromValue (Fuzzbawls) Tree-SHA512: 3adf9c60ed5f7474b89527054744f55e60584a3a56ddc6977a2e35919119c902e9c2f4a62e841410b871f778530c9586dbe59fc3523747d82d37d27d76e92511 Merge #731: [zPIV] Fix bignum overloads when using OpenSSL 69459a3 [zPIV] Fix bignum overloads when using OpenSSL (Fuzzbawls) Tree-SHA512: 54aa584ea41524d995fa4ddb63c57f2a5c331f278bf77ccea698ef135d877ac0b3a5695a7430373d194fd87544606e423f588e28cef7603e0e8c4d5b164bd33c Merge #733: [GUI] Hide orphans 960137a [GUI] Add option to hide orphans in overview and txlist (random-zebra) Tree-SHA512: d9c6b2cb073d9352b910bef3089a755e8991618b7f427e4e4ddfb48364103d5c63b65197d16f405b58aac7ab5d3ea00a886d51e162965d809346074d065d75ff Merge #736: [Utils] Update linters for python3 e66e20e [Utils] Update linters for python3 (Fuzzbawls) Tree-SHA512: 8c9bfa3bb8464ba8acbc1a9997dca656ca86f776b9eacc23aad45d2c11c64bd5a611ecd51778bd20d1814b5573d6b9a0d994e7b5105bd5f9a90b4ff5534768ba Merge #726: [RPC] include mints metadata in 'listmintedzerocoins' output 864aef8 [RPC] include mints metadata in 'listmintedzerocoins' output (random-zebra) Tree-SHA512: bc19fbf7af754d4616f658668e1b4ad351e8e97b29038ab02134de4f589222e3f30f5b2ccf8b69efa00a6da56f02e5f87eb12f9ca71afc8047040c6bde70d843 Merge #727: [RPC] Add 'spendzerocoinmints' RPC call f8ec8e0 [RPC] add 'spendzerocoinmints' RPC call (random-zebra) Tree-SHA512: 95933d5f4a2de70cf9b0b29b3ed922c39b12059f08a66cd7ddfd60a8f21274fc3ef3f76b6fc70c87768b137b78fccd0f59d22b99a99b53c3d77fc20a6045384f Merge #729: [RPC] Fix RPCTimerInterface 0053876 [RPC]: Fix RPCTimerInterface ordering issue (bitcoin/bitcoin#7317) (random-zebra) Tree-SHA512: 0e3b5ea32d48d824e37fff701c420e835c1da011cfe10302d47773341ca303ad680b85b2e6d505cda6d29be3e1c0964ee5880f66a67b1aed07aa510ba6fdc312 Merge #737: [Refactor] Remove 'boost::lexical_cast<>' a1a8fb9 Replace 'boost::lexical_cast<std::int>' with 'std::stoi' (random-zebra) 6c7b8ae Replace 'const boost::bad_lexical_cast' with 'std::invalid_argument' (random-zebra) e89923f Replace 'boost::lexical_cast<std::string>' with 'std::to_string' (random-zebra) Tree-SHA512: 37900a8cadacab61d31872d55c8cb1a654a4f395ffd51292a370d9fb15f313c86bbb5c15f3278394a59ae523341b94a0d091167283e4e87d5d41287502917373 Merge #740: [Net] Pull uacomment in from upstream ec8f69a [Net] Pull uacomment in from upstream (Fuzzbawls) Tree-SHA512: b6f30a711967af188dd4aab42338d161c5ee587eb36a2a3625be81c32c8b61ce03a19f5485b3b3cbc945f903b2eb32db6a3b081c2ef3e9561aa538583cb4713a Merge #741: [GUI] Sort by 'data' in zPIV and coin control dialogs 8b87ad3 [GUI] introduce CCoinCointrolWidgetItem and CZPivControlWidgetItem (random-zebra) Tree-SHA512: 59f8fc92c454ad3fa07f49f8bd1b3313e60b60eff413723ae16d6a12b440416a7db89d5f9f20a8813f9d23574eeeaba635f84bb9863457aae5dc0818d9971512 Merge #742: [RPC] Add masternode's pubkey to listmasternodes RPC 132166e Add masternode's pubkey to listmasternodes RPC (presstab) Tree-SHA512: c8d7a50aa275b0da845c86f942fe49f2e1974983bf9a9553cef6897760b737c07950ba828196ebaa36f6992593085695fe814923b39b7bbf410533eb51ebe9cd Merge #743: [Refactor] remove CPubKey::GetHex 63daf40 [Refactor] remove CPubKey::GetHex (random-zebra) Tree-SHA512: 360902e7e54c296c73de233f2fdb3b057916141c54d12f594a9a0c84e75cc8d554cef16c2119c2c2e886448f83bdf37bdb8bda39156040e4f6afab962aa9cc0d Merge #750: [RPC] Add mediantime to getblock/getblockheader output 14c2d6a [RPC] Add mediantime to getblock/getblockheader output (Fuzzbawls) Tree-SHA512: a950428f78eb027b9ea0570504d61983962374e0668514233528bba549da3156d173356a46d05a6ca786aae422d1b10f256be38bccba078f5d272d4d455a0916 Merge #751: [RPC] Show the configured/set txfee in getwalletinfo 02f330a [RPC] Show the configured/set txfee in getwalletinfo (Fuzzbawls) Tree-SHA512: bb6e56c2d2b72d84e9fee9da817368368f5b46622566019d3e8ca95762db82718ef88136955ba285c63a7ff8f4d8259762f8b42f608222ff0c473304ccabca70 Merge #749: [Build] Update genbuild.sh script 3eef1b9 [Build] Update genbuild.sh script (Fuzzbawls) Tree-SHA512: b94abc47dd8effbefd40c933d33053ff7a0ec7ca86b17fb98c0ea9c7a09afee7c6a9facf59e57d0f89245f09d3312b301178404e18c30ec651308be23ddbaad6 Merge #760: [RPC] Show BIP65 soft-fork progress in getblockchaininfo e723d969c2 [RPC] Show BIP65 soft-fork progress in getblockchaininfo (Fuzzbawls) Tree-SHA512: e8a214bd48f567e16d6eb3f0634ff7907802a7935ee60e89ffea59f4a00a445fa2735246048ed762e488d31bc5b030c50b6ecab9bde855247b858f12b8be6ce6 Merge #752: [Build] Fix Thread Safety Analysis Warnings db478c0 Ust std threading in sync.{h,cpp} (Fuzzbawls) 19ac6d8 Remove Boost dependency from the httpserver (Fuzzbawls) 3e22c85 Miner: use std methods instead of boost for timing conditions (Fuzzbawls) Tree-SHA512: f6ba63f8885791cc7a5bc0bf1feb88acba6b1e1832005d76191c2ab98cdce1819becf2941af9e01537be189aa81cddefe1637dde2225fcf9deedca7d661553ca
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.