PR #177 conflictions fix #197

…ight before print it.

This includes some improvements and fixes for the CMake build system. * Use explicit per-target includes instead of global includes for dependencies. * Don't assume the availability of optional dependencies. * Fix Ubuntu build issues relating to endian/byteswap. * Ignore the qt subdir for windows WSL based builds. * Add TravisCI stage to test CMake builds. Windows support is still a work in progress, with the qt subdir being ignored due to an issue with CMake linking against a static Qt library. CMake Builds on TravisCI are allowed to fail for the time being.

Requires VcXsrv for running of resulting builds.

Backport of bitcoin#7605

These are available in sandboxes without access to files or devices. Also [they are safer and more straightforward](https://en.wikipedia.org/wiki/Entropy-supplying_system_calls) to use than `/dev/urandom` as reading from a file has quite a few edge cases: - Linux: `getrandom(buf, buflen, 0)`. [getrandom(2)](http://man7.org/linux/man-pages/man2/getrandom.2.html) was introduced in version 3.17 of the Linux kernel. - OpenBSD: `getentropy(buf, buflen)`. The [getentropy(2)](http://man.openbsd.org/cgi-bin/man.cgi/OpenBSD-current/man2/getentropy.2) function appeared in OpenBSD 5.6. - FreeBSD and NetBSD: `sysctl(KERN_ARND)`. Not sure when this was added but it has existed for quite a while. Alternatives: - Linux has sysctl `CTL_KERN` / `KERN_RANDOM` / `RANDOM_UUID` which gives 16 bytes of randomness. This may be available on older kernels, however [sysctl is deprecated on Linux](https://lwn.net/Articles/605392/) and even removed in some distros so we shouldn't use it. Add tests for `GetOSRand()`: - Test that no error happens (otherwise `RandFailure()` which aborts) - Test that all 32 bytes are overwritten (initialize with zeros, try multiple times) Discussion: - When to use these? Currently they are always used when available. Another option would be to use them only when `/dev/urandom` is not available. But this would mean these code paths receive less testing, and I'm not sure there is any reason to prefer `/dev/urandom`. Closes: bitcoin#9676

Move the OS random test to a sanity check function that is called every time bitcoind is initialized. Keep `src/test/random_tests.cpp` for the case that later random tests are added, and keep a rudimentary test that just calls the sanity check.

If the code was compiled with newer (>=3.17) kernel headers but executed on a system without the system call, every use of random would crash the program. Add a fallback for that case.

There are only a few uses of `insecure_random` outside the tests. This PR replaces uses of insecure_random (and its accompanying global state) in the core code with an FastRandomContext that is automatically seeded on creation. This is meant to be used for inner loops. The FastRandomContext can be in the outer scope, or the class itself, then rand32() is used inside the loop. Useful e.g. for pushing addresses in CNode or the fee rounding, or randomization for coin selection. As a context is created per purpose, thus it gets rid of cross-thread unprotected shared usage of a single set of globals, this should also get rid of the potential race conditions. - I'd say TxMempool::check is not called enough to warrant using a special fast random context, this is switched to GetRand() (open for discussion...) - The use of `insecure_rand` in ConnectThroughProxy has been replaced by an atomic integer counter. The only goal here is to have a different credentials pair for each connection to go on a different Tor circuit, it does not need to be random nor unpredictable. - To avoid having a FastRandomContext on every CNode, the context is passed into PushAddress as appropriate. There remains an insecure_random for test usage in `test_random.h`.

FastRandomContext now provides all functionality that the real Rand* functions provide.

-BEGIN VERIFY SCRIPT- sed -i "s/\<GetRandHash(/insecure_rand256(/" src/test/*_tests.cpp sed -i "s/\<GetRand(/insecure_randrange(/" src/test/*_tests.cpp src/test/test_bitcoin.cpp sed -i 's/\<insecure_rand() % \([0-9]\+\)/insecure_randrange(\1)/g' src/test/*_tests.cpp -END VERIFY SCRIPT-

rbx needs to be stashed in a 64bit register on 64bit platforms. With this crash in particular, it was holding a stack canary which was not properly restored after the cpuid. Split out the x86+PIC case so that x86_64 doesn't have to worry about it.

-BEGIN VERIFY SCRIPT- sed -i 's/insecure_randbits(1)/insecure_randbool()/g' src/test/*_tests.cpp sed -i 's/insecure_randrange(2)/insecure_randbool()/g' src/test/*_tests.cpp sed -i 's/insecure_randrange(4)/insecure_randbits(2)/g' src/test/*_tests.cpp sed -i 's/insecure_randrange(32)/insecure_randbits(5)/g' src/test/*_tests.cpp sed -i 's/insecure_randrange(256)/insecure_randbits(8)/g' src/test/*_tests.cpp -END VERIFY SCRIPT-

functions -BEGIN VERIFY SCRIPT- sed -i 's/\<insecure_randbits(/InsecureRandBits(/g' src/test/*.cpp src/test/*.h src/wallet/test/*.cpp sed -i 's/\<insecure_randbool(/InsecureRandBool(/g' src/test/*.cpp src/test/*.h src/wallet/test/*.cpp sed -i 's/\<insecure_randrange(/InsecureRandRange(/g' src/test/*.cpp src/test/*.h src/wallet/test/*.cpp sed -i 's/\<insecure_randbytes(/InsecureRandBytes(/g' src/test/*.cpp src/test/*.h src/wallet/test/*.cpp sed -i 's/\<insecure_rand256(/InsecureRand256(/g' src/test/*.cpp src/test/*.h src/wallet/test/*.cpp sed -i 's/\<insecure_rand(/InsecureRand32(/g' src/test/*.cpp src/test/*.h src/wallet/test/*.cpp sed -i 's/\<seed_insecure_rand(/SeedInsecureRand(/g' src/test/*.cpp src/test/*.h src/wallet/test/*.cpp -END VERIFY SCRIPT-

Some mistakes where done while backporting bitcoin#10321 Compilation is fixed here

Rationale: * Reduce the number of false positives from static analyzers * Potentially enable additional compiler optimizations

Makes the code shorter and more concise. Might allow for some compiler optimisations.

- move ProcessSpork, GetSporkValue, IsSporkActive, ExecuteSpork and mapSporksActive to CSporkManager - move Sign, CheckSignature, Relay to CSporkMessage - move ReprocessBlocks out of sporks to main.cpp - rename DisconnectBlocksAndReprocess to DisconnectBlocks - bugfix: only set strMasterPrivKey if spork signature produced by that key was verified successfully - few log format changes, cleaned up includes

This also removes the need for SPORK_START/SPORK_END

…sted.

Set the build timeout for the longest job to 21mn 40sec. Set the build timeout for the other jobs back to 33 mn and 20 sec. This should avoid global 50 mn timeout on the longest job and avoid having to restart other jobs needlessly.

* OS memory allocation fail handler. * OS signal handler registration method created to remove code duplication. * AppInitBasicSetup() method created, organizing better the setup step of the wallet initialization.

* Stop loading block indexes on wallet startup if shutdown was requested. * Wallet loading, wallet rescan and block index load time logged in a more understandable way.

…s requested.

Description =========== Enables support for automatic build and release process of pivx snap on snapcraft.io, as well as the ability to create a snap package on launchpad. Build is performed with prebuilding all dependencies for each architecture, current version builds each version on same architecture, it is possible to build for separate architectures on a specific one. Snap builds are in general auto updated and if users stay on a specific channel, with each relaunch latest version of set channel is launched. PIVX Snap build status: https://build.snapcraft.io/user/cevap/PIVX PIVX's public store page: https://snapcraft.io/pivx Getting started: https://docs.snapcraft.io/getting-started/3876 Snap FAQ/Documentation: https://docs.snapcraft.io/ Publishing process: https://docs.snapcraft.io/releasing-your-app/6795 Datafolder and how to launch ============================ PIVX's snap default datafolder: `~/snap/pivx/common/.pivx` launch QT from terminal: - `pivx.qt` - `pivx.qt-testnet`, equals `pivx.qt --testnet` - `pivx.qt-regtest`, equals `pivx.qt --regtest launch daemon from terminal: - `pivx.daemon` - `pivx.daemon-testnet`, equals `pivx.daemon --testnet` - `pivx.daemon-regtest`, equals `pivx.daemon --regtest use cli: - `pivx.cli` - `pivx.cli-testnet`, equals `pivx.cli --testnet` - `pivx.cli-regtest`, equals `pivx.cli --regtest` tx: - pivx.tx tests: - pivx.test - pivx.testqt About snapcraft config ====================== Execution environment for this snap is core18 and strict confinement. For more info about base, confinment ...: https://docs.snapcraft.io/snapcraft-top-level-metadata/8334 Additional fixes and features ============================= - [x] Daemon icons for all networks - [x] QT icons patch (includes patching of icons) - [x] Add workaround for ppc64el and QT - [x] additional patches - [x] add test_pivx and test_pivx-qt - [x] snap has access to several ressources like network or home folder - [x] tests (for now only make check at the end) - [x] customizable script - [x] script in simple, readble manner Installation process ==================== On most installations, you do not need to specify `--channel=`, it can be done by writting channel directly: `--edge` without `channel=`. Official documenation is with --channel and so is this installation guide by that. Install pivx from snap (stable channel): sudo snap install pivx Install pivx from specific channel (example: edge) sudo snap install --channel=edge pivx How to update snap from another channel: sudo snap refresh --channel=edge pivx Uninstall pivx from system (!!!WARNING!!! it removes pivx's snap datafolder) sudo snap remove pivx

Backports bitcoin/bitcoin f8e6fb1

Backports bitcoin/bitcoin 4f87af6

backports bitcoin/bitcoin 5d0434d

Backports bitcoin/bitcoin 4bf631e

Backports bitcoin/bitcoin 1e44169

Backport of bitcoin#6550 Assume that when a wallet transaction has a valid block hash and transaction position in it, the transaction is actually there. We're already trusting wallet data in a much more fundamental way anyway. To prevent backward compatibility issues, a new record is used for storing the block locator in the wallet. Old wallets will see a wallet file synchronized up to the genesis block, and rescan automatically.

mempool Backport of bitcoin#7105 (9ac63d6)

Backport of bitcoin#4805 ( commit 44bc988 )

Backport of bitcoin#6508 This switches the Merkle tree logic for blocks to one that runs in constant (small) space. The old code is moved to tests, and a new test is added that for various combinations of block sizes, transaction positions to compute a branch for, and mutations: * Verifies that the old code and new code agree for the Merkle root. * Verifies that the old code and new code agree for the Merkle branch. * Verifies that the computed Merkle branch is valid. * Verifies that mutations don't change the Merkle root. * Verifies that mutations are correctly detected.

During startup, when adding pending wallet transactions, which spend outputs of other pending wallet transactions, back to the memory pool, and when they are added out of order, it appears as if they are orphans with missing inputs. Those transactions are then rejected and flagged as "conflicting" (= not in the memory pool, not in the block chain). To prevent this, transactions are explicitly sorted.

Unconfirmed transactions that are not in your mempool either due to eviction or other means may be unlikely to be mined. abandontransaction gives the wallet a way to no longer consider as spent the coins that are inputs to such a transaction. All dependent transactions in the wallet will also be marked as abandoned.

No longer consider coins which aren't in our mempool. Add test for regression in abandonconflict.py

Prior to this change, it would mark only the first layer of child transactions abandoned, due to always following the input hashTx rather than the current now tx.

Coinbase and zerocoin transaction can't really be checked for conflicts. Coinbase has no value anyway. Zerocoin transactions are checked for zero knowledge proof, the input hash has no meaning.

Added code to upgrade Masternode Message format Changes seen in Dash PR PIVX-Project#836

Adds new regression testing for the following RPC budget commands: - `preparebudget` - `submitbudget` - `getbudgetinfo`

…emove vchDefaultKey and have better first run detection". [Wallet][Startup][DB][Backport] Don't create any default address

Move the two CMake build tests further up in the test order so we don't have to manually restart them due to caching/timeouts.

to check balances in a reorganization of PoS blocks, and verify that the input of an orphan block's coinstake is spendable after.

…mpool check code cleanup in IsTrusted method. Comes from bitcoin b2b3619

…ady set.

- qualify as constants the arguments of CWallet's functions: IsLockedCoin, LockCoin and UnlockCoin. - Diagnose unsuitable outputs in lockunspent (backports bitcoin/bitcoin bitcoin#11087)

… the tip, preventing possible multi-threading shared resource problem. Remove duplicated tip check.

When the build number (CLIENT_VERSION_BUILD) is non-zero, we want to include that in the package version number so the resulting binaries are named with the correct version.

# Conflicts: # src/Makefile.am # src/crypto/common.h # src/main.cpp # src/masternode.cpp # src/miner.cpp # src/primitives/block.h # src/qt/walletview.cpp # src/rpc/masternode-budget.cpp # src/spork.cpp # src/spork.h # src/test/benchmark_zerocoin.cpp # src/version.h # src/wallet/crypter.cpp

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

PR #177 conflictions fix #197

PR #177 conflictions fix #197

Commits on May 6, 2020

Commits on May 20, 2020

Commits on Nov 11, 2021

PR #177 conflictions fix #197

Are you sure you want to change the base?

PR #177 conflictions fix #197

Commits on May 6, 2020

Commits on May 20, 2020

Commits on Nov 11, 2021