Skip to content

Conversation

@2a5A1Ghu1
Copy link
Contributor

No description provided.

Fuzzbawls and others added 30 commits March 26, 2020 09:08
Also move -backuppath and -zpivbackuppath to more appropriate areas in
the help output.

# Conflicts:
#	src/init.cpp
My log was showing stake orphans getting stuck with the message "Found orphanded mint txid=.....". This is supposed to ignore it for the existing iteration and then clean it up next time ListMints() is called. This was not happening to stake transactions, so logic is added to archive the mint if it is coinstake.
…t repair menu

also fix segfault when permission denied since trying to create directories before checking permissions
53fc2ddc9 [Docs] Update release notes for v3.1.0 (Fuzzbawls)

Tree-SHA512: 2df4411b3376aea24956f8c3e602bece66c92f6f74488bb5a22005bfaa7fab272a93417a76c520aae26a29dd2714270b73f72f3e7922377410a870ee68669c1b

# Conflicts:
#	doc/release-notes.md
e46e49b Update to zPIV staking and Thank you's (Sieres)

Tree-SHA512: 21a43784106ea774e362c2b7d0ca7c1dfb8cb28460a9d7b56057c8becb68599b263510e6f838c441cef13835b722af49c497707b02c80f874432f8c5e7c2e8a6

# Conflicts:
#	doc/release-notes.md
# Conflicts:
#	configure.ac
rebase from upstream. Windows doesn't initialize CService properly
during startup before the masternode.conf file is read.

# Conflicts:
#	src/masternodeconfig.cpp
Bugfix for Windows MN Controllers
43f6f1b4d Add unit test for budget value. (presstab)
9ee7d98fc Update protocol to 70914. (presstab)
ebc452738 [Budget] Fix wrong budget amount (Mrs-X)

Tree-SHA512: 6d813ee5e9cc548ffd8b3c816f669a9b79a6b8118de73941fd3fc6d7be46ae2dbfa935d94d1b62c32c1700165ad5a637f87eeaa8cd36927d4d281193b9c84ada

# Conflicts:
#	src/version.h
one-line change for `listtransactions`, this won't be a full release
with gitian builds, but a tag that exchanges/services can use as a
fixed-point reference if they need `listtransactions` compatibility.
e46e49b Update to zPIV staking and Thank you's (Sieres)

Tree-SHA512: 21a43784106ea774e362c2b7d0ca7c1dfb8cb28460a9d7b56057c8becb68599b263510e6f838c441cef13835b722af49c497707b02c80f874432f8c5e7c2e8a6

# Conflicts:
#	doc/release-notes.md
a810714 [Doc] Change aarch assert sign output folder (Warrows)

Tree-SHA512: 1b454a87f526ec8edf96f28952f4dccce444bbedd7512a21188d155ab5e57e494d8306529eccc0a280417895dc0e4b7718a233b883cfcffd84fd89f5c9d4e280

# Conflicts:
#	doc/release-process.md
3a6b152 [Tests] Fix chain ordering in budget tests (Fuzzbawls)

Tree-SHA512: c94c7511d088bffc9568045b48b5fac8f10cceb4561e1d3a58fda3cb64227aee163280e9ad553157b206bd36257f516c34c697e8df4eeea153ffc8a44753a17a
5d73f63 [Build] Bump master to 3.1.99 (Fuzzbawls)

Tree-SHA512: 7d421685e1f3b90dfc4f536b679436f0d8bbd82614996aa7e76541ff9ad572e729063fb699d70778ea3f4acb2576713ebd3bbb49966d8e82a79945723419b256

# Conflicts:
#	configure.ac
#	contrib/gitian-descriptors/gitian-aarch64.yml
#	contrib/gitian-descriptors/gitian-linux.yml
#	contrib/gitian-descriptors/gitian-osx.yml
#	contrib/gitian-descriptors/gitian-win.yml
b2fdbbf64 [Wallet] Write new transactions to wtxOrdered properly (Fuzzbawls)

Tree-SHA512: b0bd54c9bd7fb44c18d7d4d84213b96b48dc22b35825c0a0f268b3f99086e8beeea7de5aed07cc575ee7dae0ce095e0438eb7e89454bae54551478ea5f81661d
# Conflicts:
#	src/secp256k1/.gitignore
#	src/secp256k1/.travis.yml
#	src/secp256k1/COPYING
#	src/secp256k1/Makefile.am
#	src/secp256k1/README.md
#	src/secp256k1/TODO
#	src/secp256k1/configure.ac
#	src/secp256k1/include/secp256k1.h
#	src/secp256k1/libsecp256k1.pc.in
#	src/secp256k1/obj/.gitignore
#	src/secp256k1/src/bench_inv.c
#	src/secp256k1/src/bench_sign.c
#	src/secp256k1/src/bench_verify.c
#	src/secp256k1/src/ecdsa.h
#	src/secp256k1/src/ecdsa_impl.h
#	src/secp256k1/src/eckey.h
#	src/secp256k1/src/eckey_impl.h
#	src/secp256k1/src/ecmult.h
#	src/secp256k1/src/ecmult_gen.h
#	src/secp256k1/src/ecmult_gen_impl.h
#	src/secp256k1/src/ecmult_impl.h
#	src/secp256k1/src/field.h
#	src/secp256k1/src/field_10x26.h
#	src/secp256k1/src/field_10x26_impl.h
#	src/secp256k1/src/field_5x52.h
#	src/secp256k1/src/field_5x52_asm.asm
#	src/secp256k1/src/field_5x52_asm_impl.h
#	src/secp256k1/src/field_5x52_impl.h
#	src/secp256k1/src/field_5x52_int128_impl.h
#	src/secp256k1/src/field_gmp.h
#	src/secp256k1/src/field_gmp_impl.h
#	src/secp256k1/src/field_impl.h
#	src/secp256k1/src/group.h
#	src/secp256k1/src/group_impl.h
#	src/secp256k1/src/java/org/bitcoin/NativeSecp256k1.java
#	src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.c
#	src/secp256k1/src/java/org_bitcoin_NativeSecp256k1.h
#	src/secp256k1/src/num.h
#	src/secp256k1/src/num_gmp.h
#	src/secp256k1/src/num_gmp_impl.h
#	src/secp256k1/src/num_impl.h
#	src/secp256k1/src/scalar.h
#	src/secp256k1/src/scalar_4x64.h
#	src/secp256k1/src/scalar_4x64_impl.h
#	src/secp256k1/src/scalar_8x32.h
#	src/secp256k1/src/scalar_8x32_impl.h
#	src/secp256k1/src/scalar_impl.h
#	src/secp256k1/src/secp256k1.c
#	src/secp256k1/src/testrand.h
#	src/secp256k1/src/testrand_impl.h
#	src/secp256k1/src/tests.c
#	src/secp256k1/src/util.h
[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

# Conflicts:
#	src/Makefile.am
#	src/arith_uint256.cpp
#	src/arith_uint256.h
#	src/eccryptoverify.cpp
#	src/eccryptoverify.h
#	src/ecwrapper.cpp
#	src/ecwrapper.h
#	src/key.cpp
#	src/key.h
#	src/pubkey.cpp
#	src/pubkey.h
#	src/uint512.h
Fuzzbawls and others added 28 commits April 5, 2020 08:49
When a range of blocks has already been computed, use that existing data
 instead of erroring out. This is used in the zPoS pipeline where, after
  precomputation, the passed `pindexCheckpoint` is likely to be at a
  block height below the accumulator's tip/end.
Since security level has been removed, this status message needed to be
changed.

Also removed some stale unused code that was left over from when
security level was used.
New debug category "staking" added with some previous `LogPrintf`
messages recategorized to reduce log spam.

Also noted both "staking" and "precompute" in the init help message and
added them to the "pivx" umbrella category.

# Conflicts:
#	src/init.cpp
#	src/util.cpp
7241582ba3 [Net] Increment Protocol Version (Fuzzbawls)

Tree-SHA512: 12f2b784837de572ca0d96167dc51f355d5d0b042c53fb006186112639388ef5bddfe601fc99af64d3c0ab58013aa7add451616d29073f3b8fc6dfb4d29dce7d

# Conflicts:
#	src/version.h
# Conflicts:
#	configure.ac
#	doc/release-notes.md
Github-Pull: #858
Rebased-From: 21f50784c39d2c87776edb7b959d92d63b95b339
When the shutdown process is started, it is possible that the call to
`ValidateAccumulatorCheckpoint()` in `ConnectBlock()` will fail. Instead
 of returning an invalid state, which causes the block to pass through
 `InvalidChainFound()`, just return a stateless error if a shutdown has
 been requested.

Github-Pull: #865
Rebased-From: 8126729c7800d801f0f067d9a2257b8ad74c1a9f
This seems to be causing an issue on macOS, resulting in odd magenta
pinstripes. Instead, just set the WalletFrame's background to solid
white via hexcode.

Github-Pull: #863
Rebased-From: 9a855a8b50a3be548f3d8df7a7fc4f00baef0f73
Github-Pull: #863
Rebased-From: 38e92f3a2678571cae2908d2140bb2f41e339143

# Conflicts:
#	src/qt/res/images/walletFrame.png
#	src/qt/res/images/walletFrame_bg.png
When opening the zPIV coin selection in privacy tab, if the wallet is
locked the message for all mints is that the seed is wrong. This commit
fixes it by replacing the message and stating that the locked wallet
prevents precomputation and spending.

Github-Pull: #852
Rebased-From: 94bea35e5569c323a667d8204bc2d23b15d4dc29
This adds two new checkpoints for mainnet:
 * Block 1679090 - first block with a wrapped serial
 * Block 1686229 - last block that zPIV was active

Also for testnet:
 * Block 1016800 - Arbitrary recent block

Github-Pull: #861
Rebased-From: 9ce73e55db0f0c3013c08bee06648c40b705b86a

# Conflicts:
#	src/chainparams.cpp
When `showProgress()` is passed a `100` int value, the dialog is deleted
. If the function is passed a `100` int value a second time in the same
scope, like what happens at the end of `RecalculateZPIVSpent()` and
`RecalculateZPIVSupply()`, it results in a segfault.

This change standardizes the process by first initializing the progress
dialog with a `0` value, updating to a maximum of a `99` value inside
the loop, and finally closing with a `100` value after the loop has
completed.

Github-Pull: #860
Rebased-From: fa0e1f301cb4c668706a14df8ae6e149c714ef6f
Github-Pull: #866
Rebased-From: 51616cb0d71541326b5060f7f93a51889c61cfc6

# Conflicts:
#	Makefile.am
#	contrib/debian/README.md
#	contrib/debian/changelog
#	contrib/debian/manpages/pivx-qt.1
#	contrib/debian/manpages/pivx.conf.5
#	contrib/debian/manpages/pivxd.1
#	contrib/debian/pivx-qt.desktop
#	contrib/debian/pivx-qt.install
#	contrib/debian/pivxd.bash-completion
#	contrib/debian/pivxd.install
#	contrib/debian/pivxd.manpages
#	share/ui.rc
Github-Pull: #868
Rebased-From: 97720be5b945d1d490f6f6fa940b4620f6bbdb12
# Conflicts:
#	doc/release-notes.md
…he available utxo set for forked chains + split height going one block further than what should be.

[Net] acceptBlock, back to chain split was going one block further if prev was the previous block of the incoming block.

[Net] coins cache view only has the tip view and not forks utxo chain view.

Github-Pull: #880
Rebased-From: 2c76194c757ddd6a9081ee555b191c6dbb326c50
Github-Pull: #880
Rebased-From: 754764be02af58b0b2059f580b40bf5f6380fa4d
This adds two additional checkpoints for known split points

Github-Pull: #884
Rebased-From: af28b90a4ab119102ed995a20614025a55256526

# Conflicts:
#	src/chainparams.cpp
Github-Pull: #887
Rebased-From: a0af2a75257a86f585580152e73de24b331c9264

# Conflicts:
#	src/chainparams.cpp
# Conflicts:
#	doc/release-notes.md
@2a5A1Ghu1 2a5A1Ghu1 merged commit c40ceb2 into update-upstream-v3.2.2 Apr 8, 2020
@2a5A1Ghu1 2a5A1Ghu1 deleted the pr/51 branch April 8, 2020 18:52
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.