PR #177 conflictions fix#197

Open

wqking wants to merge 133 commits intophoreproject:rel-1.9.0from

wqking-misc:upstream-rel-1.9.0-pr177-fix-conflicts

Commits on May 6, 2020

Cleaned up spacing and got travis working
KolbyML
committed
[DB] Db runtime error cleaning the variable that needs to be logged right before print it.

furszy
authored and
KolbyML
committed
[Build] CMake Improvements

Fuzzbawls
authored and
KolbyML
committed
Allow WSL builds with cmake

Fuzzbawls
authored and
KolbyML
committed
Remove openssl info from init/log and from Qt debug window

jonasschnelli
authored and
KolbyML
committed
[Refactor] Remove unused OpenSSL includes

Warrows
authored and
KolbyML
committed
[Consensus] Remove Old message format in CMasternodeBroadcast

random-zebra
authored and
KolbyML
committed
Always require OS randomness when generating secret keys

sipa
authored and
KolbyML
committed
Don't use assert for catching randomness failures

sipa
authored and
KolbyML
committed
util: Specific GetOSRandom for Linux/FreeBSD/OpenBSD

laanwj
authored and
KolbyML
committed
squashme: comment that NUM_OS_RANDOM_BYTES should not be changed lightly

laanwj
authored and
KolbyML
committed
sanity: Move OS random to sanity check function

laanwj
authored and
KolbyML
committed
random: Add fallback if getrandom syscall not available

laanwj
authored and
KolbyML
committed
Maintain state across GetStrongRandBytes calls

sipa
authored and
KolbyML
committed
Kill insecure_random and associated global state

laanwj
authored and
KolbyML
committed
Add ChaCha20

sipa
authored and
KolbyML
committed
Switch FastRandomContext to ChaCha20

sipa
authored and
KolbyML
committed
Introduce FastRandomContext::randbool()

sipa
authored and
KolbyML
committed
Add a FastRandomContext::randrange and use it

sipa
authored and
KolbyML
committed
Use hardware timestamps in RNG seeding

sipa
authored and
KolbyML
committed
Test that GetPerformanceCounter() increments

sipa
authored and
KolbyML
committed
Use sanity check timestamps as entropy

sipa
authored and
KolbyML
committed
Add internal method to add new random data to our internal RNG state

TheBlueMatt
authored and
KolbyML
committed
Add perf counter data to GetStrongRandBytes state in scheduler

TheBlueMatt
authored and
KolbyML
committed
random: only use getentropy on openbsd

theuni
authored and
KolbyML
committed
[Random] Fix compilation

Warrows
authored and
KolbyML
committed
Add FastRandomContext::rand256() and ::randbytes()

sipa
authored and
KolbyML
committed
Add various insecure_rand wrappers for tests

sipa
authored and
KolbyML
committed
Merge test_random.h into test_bitcoin.h

sipa
authored and
KolbyML
committed
Replace more rand() % NUM by randranges

sipa
authored and
KolbyML
committed
Replace rand() & ((1 << N) - 1) with randbits(N)

sipa
authored and
KolbyML
committed
[Random / tests] scripted-diff: use insecure_rand256/randrange more

Warrows
authored and
KolbyML
committed
Use rdrand as entropy source on supported platforms

sipa
authored and
KolbyML
committed
random: fix crash on some 64bit platforms

theuni
authored and
KolbyML
committed
Use cpuid intrinsics instead of asm code

sipa
authored and
KolbyML
committed
Clarify entropy source

sipa
authored and
KolbyML
committed
[Random / tests] scripted-diff: Use randbits/bool instead of randrange

Warrows
authored and
KolbyML
committed
[Rand/test] scripted-diff: Use new naming style for insecure_rand*

Warrows
authored and
KolbyML
committed
[Tests] Fix compilation

Warrows
authored and
KolbyML
committed
Fix resource leak

Dag Robole
authored and
KolbyML
committed
Add attribute [[noreturn]] (C++11) to functions that will not return

practicalswift
authored and
KolbyML
committed
Check if sys/random.h is required for getentropy on OSX.

jameshilliard
authored and
KolbyML
committed
Bugfix: randbytes should seed when needed (non reachable issue)

sipa
authored and
KolbyML
committed
Do not permit copying FastRandomContexts

sipa
authored and
KolbyML
committed
[Random] Add a missing include

Warrows
authored and
KolbyML
committed
[Refactor] Use arrays instead of unic vars in Chacha20

Warrows
authored and
KolbyML
committed
[Log] Replace a string by the function name in a log

Warrows
authored and
KolbyML
committed
Fixes and some clean up
KolbyML
committed
[Compilation] Pass caught exceptions by reference
KolbyML
committed
[Refactor] Add const qualifier to exception catching
KolbyML
committed
Update `crypto/common.h` functions to use compat endian header

Fuzzbawls
authored and
KolbyML
committed
[Refactor] refactor/fix CSporkManager and CSporkMessage classes

random-zebra
authored and
KolbyML
committed
[Spork] Protect CSporkManager with critical section

random-zebra
authored and
KolbyML
committed
[Spork] CSporkManager class serialization

random-zebra
authored and
KolbyML
committed
[Spork] Do not accept sporks signed too far into the future

random-zebra
authored and
KolbyML
committed
[Spork] Remove unused SPORK_7_MASTERNODE_SCANNING

random-zebra
authored and
KolbyML
committed
[Spork] Remove unused SPORK_11 and SPORK_12

random-zebra
authored and
KolbyML
committed
[Spork] Define SporkId enum (with its serialization)

random-zebra
authored and
KolbyML
committed
[Spork] Introduce CSporkDef and remove if/else blocks

random-zebra
authored and
KolbyML
committed
[Spork] Make CSporkMessage::vchSig private

random-zebra
authored and
KolbyML
committed
Fix spork RPC to use new spork defs

random-zebra
authored and
KolbyML
committed
[Core] ReprocessBlocks: adjust to PIVX blocktime

random-zebra
authored and
KolbyML
committed
[Tests] spork functional test: check spork value after node restart

random-zebra
authored and
KolbyML
committed
[Spork] fix CSporkManager maps

random-zebra
authored and
KolbyML
committed
[Trivial] rename DisconnectBlocks argument for consistency

random-zebra
authored and
KolbyML
committed
[Trivial] Align the format of the log messages in kernel.cpp

random-zebra
authored and
KolbyML
committed
[Startup] Don't continue loading the wallet if the shutdown was requested.

furszy
authored and
KolbyML
committed
[Trivial] Get rid of compiler warnings

random-zebra
authored and
KolbyML
committed
[Travis] Lower timeout for the full test suite

Warrows
authored and
KolbyML
committed
[Startup][Refactor][Backport]

furszy
authored and
KolbyML
committed
[Logging][Startup]

furszy
authored and
KolbyML
committed
[Startup][Wallet] Don't continue rescanning the wallet if shutdown was requested.

furszy
authored and
KolbyML
committed
[Trivial] Use error() instead of LogPrintf + return false.

furszy
authored and
KolbyML
committed
add snapcraft support to pivx, static build

cevap
authored and
KolbyML
committed
Update for merging

Fuzzbawls
authored and
KolbyML
committed
[Script] Introduce constant for maximum CScript length

random-zebra
authored and
KolbyML
committed
[Script] Treat overly long scriptPubKeys as unspendable

random-zebra
authored and
KolbyML
committed
[Bug] Fix OOM when deserializing UTXO entries with invalid length

random-zebra
authored and
KolbyML
committed
CDataStream::ignore Throw exception instead of assert on negative nSize

random-zebra
authored and
KolbyML
committed
[Tests] Add tests for CCoins deserialization

random-zebra
authored and
KolbyML
committed
[Wallet] Do not store Merkle branches in the wallet

Warrows
authored and
KolbyML
committed
Fixes and some clean up
KolbyML
committed
[Refactor] Move wallet functions out of header
KolbyML
committed
[Wallet] Keep track of explicit wallet conflicts instead of using

Warrows
authored and
KolbyML
committed
[Wallet] Do not flush the wallet in AddToWalletIfInvolvingMe(..)

Warrows
authored and
KolbyML
committed
[Wallet] Switch to a constant-space Merkle root/branch algorithm

Warrows
authored and
KolbyML
committed
[Wallet] sort pending wallet transactions before reaccepting

dexX7
authored and
KolbyML
committed
Make sure conflicted wallet tx's update balances

morcos
authored and
KolbyML
committed
Make wallet descendant searching more efficient

morcos
authored and
KolbyML
committed
Add new rpc call: abandontransaction

morcos
authored and
KolbyML
committed
[Wallet] Call notification signal when a transaction is abandoned

jonasschnelli
authored and
KolbyML
committed
Flush wallet after abandontransaction

morcos
authored and
KolbyML
committed
Remove stale wallet transactions on initial load.

presstab
authored and
KolbyML
committed
Fix calculation of balances and available coins.

morcos
authored and
KolbyML
committed
Fix that CWallet::AbandonTransaction would only traverse one level

Empact
authored and
KolbyML
committed
[Tests] Enable abandonconflict functional test

Warrows
authored and
KolbyML
committed
[Wallet] Fix an error in tx depth computation

Warrows
authored and
KolbyML
committed
[Wallet] Ignore coinbase and zc tx "conflicts"

Warrows
authored and
KolbyML
committed
[Build] Add new merkle files to CMake lists

Warrows
authored and
KolbyML
committed
Fixes and clean up
KolbyML
committed
[Tests] Add RPC budget regression tests

Fuzzbawls
authored and
KolbyML
committed
[Wallet][Startup][DB][Backport] #10952 BTC back port. Named "Remove vchDefaultKey and have better first run detection".

furszy
authored and
KolbyML
committed
[Wallet] Fix inconsistencies with GetDepthInMainChain

random-zebra
authored and
KolbyML
committed
[TravisCI] Run CMake Tests earlier

Fuzzbawls
authored and
KolbyML
committed
Ensure we're building the GUI for all CI tests

Fuzzbawls
authored and
KolbyML
committed
Update .travis.yml

Warrows
authored and
KolbyML
committed
[Core][Tests] REGTEST: fix nStakeModifier=0

random-zebra
authored and
KolbyML
committed
[Tests] Add wallet_reorg-stake functional test

random-zebra
authored and
KolbyML
committed
[Wallet] Fix bug with coinstake inputs wrongly marked as spent

random-zebra
authored and
KolbyML
committed
[Tests] Add wallet_reorg-stake functional test to test_runner.py

random-zebra
authored and
KolbyML
committed
[Core] Prevent coinstakes from overpaying masternodes

random-zebra
authored and
KolbyML
committed
[CMake] Fix macOS Boost detection

Fuzzbawls
authored and
KolbyML
committed
[Wallet] Transaction IsEquivalentTo method backported + Duplicated mempool check code cleanup in IsTrusted method.

furszy
authored and
KolbyML
committed
[UI] TransactionFilter, do not invalidate the filter if range is already set.

furszy
authored and
KolbyML
committed
[Spork] Guard chainActive.Tip() and chainActive.Height() methods call.

furszy
authored and
KolbyML
committed
[Wallet][RPC] Lock/UnlockCoin const argument + checks in lockunspent

random-zebra
authored and
KolbyML
committed
wallet: Unlock spent outputs

promag
authored and
KolbyML
committed
[Masterndoes] Masternodes sync, try locking cs_main when it looks for the tip, preventing possible multi-threading shared resource problem.

furszy
authored and
KolbyML
committed
[Masternodes] Reset mn sync process if it's sleep.

furszy
authored and
KolbyML
committed
gui: explicitly disable "Dark Mode" appearance on macOS

fanquake
authored and
KolbyML
committed
build: if VERSION_BUILD is non-zero, include it in the package version

achow101
authored and
KolbyML
committed
build: include rc number in version number

achow101
authored and
KolbyML
committed
Update release-process.md to include RC version bumping

achow101
authored and
KolbyML
committed
build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString

fanquake
authored and
KolbyML
committed
build: use full version string in setup.exe

MarcoFalke
authored and
KolbyML
committed
Some fixes
KolbyML
committed

PR #177 conflictions fix#197wqking wants to merge 133 commits intophoreproject:rel-1.9.0phoreproject/Phore:rel-1.9.0from wqking-misc:upstream-rel-1.9.0-pr177-fix-conflictswqking-misc/Phore:upstream-rel-1.9.0-pr177-fix-conflictsCopy head branch name to clipboard

Commits

Commits on May 6, 2020

Commits on May 20, 2020

Commits on Nov 11, 2021

PR #177 conflictions fix#197
wqking wants to merge 133 commits intophoreproject:rel-1.9.0from
wqking-misc:upstream-rel-1.9.0-pr177-fix-conflicts