[Backport] 5.0 backports #2078
Merged
[Backport] 5.0 backports #2078
Conversation
This file contains 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
Without the framework include, CMake isn't able to find the CFBundleGetMainBundle and relative classes/functions. Github-Pull: PIVX-Project#2041 Rebased-From: 9afec2e
Github-Pull: PIVX-Project#2042 Rebased-From: 54c15e7
…ecrementally instead of incrementally. Github-Pull: PIVX-Project#2046 Rebased-From: a1025e5
Github-Pull: PIVX-Project#2045 Rebased-From: 9213f07
Avoids an upgrade warning from being triggered after 100 v8 blocks are on chain. Moved the network upgrade consensus check further up. Github-Pull: PIVX-Project#2052 Rebased-From: 710f480
Github-Pull: PIVX-Project#2047 Rebased-From: c1785d2
Github-Pull: PIVX-Project#2049 Rebased-From: e55a089
Github-Pull: PIVX-Project#2049 Rebased-From: e489677
…g the wallet feature version. Github-Pull: PIVX-Project#2048 Rebased-From: 1325cea
also test that 64 bit integers are properly handled Github-Pull: PIVX-Project#2059 Rebased-From: e0ba82b
Github-Pull: PIVX-Project#2055 Rebased-From: 711af22
…essarily scary. * The "ERROR" was printed far too often during normal operation for what was not an error. Coming from btc@00678bdb0aeb296456501f818faaa012a75ce18e Github-Pull: PIVX-Project#2054 Rebased-From: 097322c
They were too noisy and not necessary for normal operation. Coming from btc@0d9af79e5084dc2fb6a73abd9dd113dda4e993b4 Github-Pull: PIVX-Project#2054 Rebased-From: 2027d66
Before: ERROR: Error reading proxy response Coming from btc@94fd1d8d53adceb80e5a41cc6438c7704aeac0f7 Github-Pull: PIVX-Project#2054 Rebased-From: fdec2e3
Coming from btc@bf9266e017b286c36e08fd09b91d9e39f14b2cf3 Github-Pull: PIVX-Project#2054 Rebased-From: a1b0017
Coming from btc@10ae7a7b2316f8052ec58ef237ce6dd987300900 Github-Pull: PIVX-Project#2054 Rebased-From: f62d152
Prior to this commit the value stored to `s` at initialization was never read (in the case of STRERROR_R_CHAR_P). Coming from btc@58446094519151e2e203944267e592eec2470643 Github-Pull: PIVX-Project#2054 Rebased-From: d46b369
Github-Pull: PIVX-Project#2056 Rebased-From: 0a519bb
…ping. We are already caching it. Github-Pull: PIVX-Project#2056 Rebased-From: c456202
…d budget vote. We are already caching it. [Masternode] CMasternodePayments::ProcessBlock, stop parsing the masternode private key string. Stop parsing strMasterNodePrivKey when we already have it parsed in mnfinalbudget and mnbudgetvote Github-Pull: PIVX-Project#2056 Rebased-From: 329e6ef
Github-Pull: PIVX-Project#2056 Rebased-From: 9e18f86
… bool. Github-Pull: PIVX-Project#2056 Rebased-From: 89cc583
Github-Pull: PIVX-Project#2058 Rebased-From: c406568
Github-Pull: PIVX-Project#2058 Rebased-From: 544b6bc
Github-Pull: PIVX-Project#2058 Rebased-From: ca3a1e6
Github-Pull: PIVX-Project#2060 Rebased-From: cf6ef9b
Github-Pull: PIVX-Project#2060 Rebased-From: ae86d5b
Github-Pull: PIVX-Project#2060 Rebased-From: d2edcb7
Github-Pull: PIVX-Project#2050 Rebased-From: 46fe147
Github-Pull: PIVX-Project#2050 Rebased-From: 774c544
Github-Pull: PIVX-Project#2069 Rebased-From: cb1f9a0
Github-Pull: PIVX-Project#2069 Rebased-From: b05ed1c
(ZC_V2 upgrade activated with POS at block 201) Github-Pull: PIVX-Project#2069 Rebased-From: 2ebb986
Github-Pull: PIVX-Project#2069 Rebased-From: ff82174
The combobox shouldn't get hide when there are transactions in the wallet, independently on the selected filter. If the user selects a type that it isn't in the wallet, the filter combobox will disappear, leaving the tx list empty and not allowing any other movement. Github-Pull: PIVX-Project#2073 Rebased-From: 6dbe9ad
Github-Pull: PIVX-Project#2071 Rebased-From: 2e6f856
Github-Pull: PIVX-Project#2071 Rebased-From: 2fc2d8f
(including delegated). This way, delegations are reflected under "Pending balance" in the GUI (owner-side), before being included in a block. Github-Pull: PIVX-Project#2080 Rebased-From: d1f30ff
- no need to check "spendable" utxos (as we are not dealing with watch-only). - no need to catch `bad-txns-inputs-spent` exception with sendrawtransaction (as we are not dealing with zPIVs anymore) - double check that the double-spend is not on chain/mempool with getrawtransaction Github-Pull: PIVX-Project#2081 Rebased-From: 5546422
Verifier: (`CheckBlock` --> `IsBlockPayeeValid` --> `IsBudgetPaymentBlock`) expects a payment to a budget even with the case of N<20 active masternodes on the network, provided that all N voted on the finalized budget (the threshold is N-1). Also remove the extra call to `IsBudgetPaymentBlock` directly from `FillBlockPayee` (it is already called by `CBudgetManager::FillBlockPayee` --> `GetPayeeAndAmount`). Github-Pull: PIVX-Project#2084 Rebased-From: 16455e0
We adopted a global `.h` header file extension convention from bitcoin, this renames a number of header files coming from ZCash's sapling base to conform to that convention. Github-Pull: PIVX-Project#2087 Rebased-From: 47ce226
Github-Pull: PIVX-Project#2088 Rebased-From: 87c12e5
This command has been disabled since v4.1.0, don't bother registering it anymore so that the runtime error message isn't shown when using the `help` RPC command Github-Pull: PIVX-Project#2088 Rebased-From: 2dd232d
Github-Pull: PIVX-Project#2088 Rebased-From: fd5843e
>>> backports bitcoin/bitcoin@f0e7aa7 This prepares for a series of two additional commits which optimize prevector performance. Github-Pull: PIVX-Project#2083 Rebased-From: e6741d0
>>> based on bitcoin/bitcoin@e46be25 (updated with more recent changes) In prevector.h, the code which like item_ptr(size()) apears in the loop. Both item_ptr() and size() judge whether values are held directly or indirectly, but in most cases it is sufficient to make that judgement once outside the loop. This PR adds 2 private function fill() which has the loop to initialize by specified value (or iterator of the other prevector's element), but don't call item_ptr() in their loop. Other functions(assign(), constructor, operator=(), insert()) that has similar loop, call fill() instead of original loop. Also, resize() was changed like fill(), but it calls the default constructor for that element each time. Github-Pull: PIVX-Project#2083 Rebased-From: c412d5f
It's now only referenced from the bench, so leave it there. This allows us to drop the associated includes as well. Github-Pull: PIVX-Project#2083 Rebased-From: 4cb188e
Problem: - IS_TRIVIALLY_CONSTRUCTIBLE macro does not work correctly resulting in `memset()` usage to set a non-trivial type to 0 when `nontrivial_t` is passed in from the tests. - Warning reported by GCC when compiling with `--enable-werror`. Solution: - Use the standard algorithm `std::fill_n()` and let the compiler determine the optimal way of looping or using `memset()`. Github-Pull: PIVX-Project#2083 Rebased-From: d856989
Github-Pull: PIVX-Project#2070 Rebased-From: fe4f556
The count isn't updated on every widget show, only via the event. Github-Pull: PIVX-Project#2075 Rebased-From: 164d6aa
Drop the "ed" suffix in the RPC scope, changes commands like `getnewshieldedaddress` to `getnewshieldaddress`. Also in blockchain informational calls; `shielded_pool_value` and `shieldedsupply` become `shield_pool_value` and `shieldsupply` respectively. Github-Pull: PIVX-Project#2086 Rebased-From: b38077a
Github-Pull: PIVX-Project#2086 Rebased-From: 51db288
Github-Pull: PIVX-Project#2091 Rebased-From: 2523f81
furszy
approved these changes
Dec 21, 2020
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.
backports the following PRs from master to the 5.0 branch:
#2041
#2042
#2046
#2045
#2052
#2047
#2049
#2048
#2059
#2055
#2054
#2056
#2058
#2060
#2050
#2061
#2062
#2033
#2064
#2063
#2067
#2051
#2065
#2066
#2068
#2069
#2073
#2071
#2080
#2081
#2084
#2087
#2088
#2083
#2070
#2075
#2086
#2091