Code

PR #177 conflictions fix#197

Code

Open

wqking 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

+4,240-1,533

Commits

Commits on May 6, 2020

• Cleaned up spacing and got travis working

  KolbyML

  committed
  a07c374

• [DB] Db runtime error cleaning the variable that needs to be logged right before print it.

  

  furszy

  authored and

  KolbyML

  committed
  9875777

• [Build] CMake Improvements

  Show description for 83c2cf7
  

  Fuzzbawls

  authored and

  KolbyML

  committed
  83c2cf7

• Allow WSL builds with cmake

  Show description for 79ece4e
  

  Fuzzbawls

  authored and

  KolbyML

  committed
  79ece4e

• Remove openssl info from init/log and from Qt debug window

  Show description for 0066758
  

  jonasschnelli

  authored and

  KolbyML

  committed
  0066758

• [Refactor] Remove unused OpenSSL includes

  

  Warrows

  authored and

  KolbyML

  committed
  55fd07a

• [Consensus] Remove Old message format in CMasternodeBroadcast

  

  random-zebra

  authored and

  KolbyML

  committed
  53c0de3

• Always require OS randomness when generating secret keys

  

  sipa

  authored and

  KolbyML

  committed
  93f8dfe

• Don't use assert for catching randomness failures

  

  sipa

  authored and

  KolbyML

  committed
  3da089f

• util: Specific GetOSRandom for Linux/FreeBSD/OpenBSD

  Show description for 17a818c
  

  laanwj

  authored and

  KolbyML

  committed
  17a818c

• squashme: comment that NUM_OS_RANDOM_BYTES should not be changed lightly

  

  laanwj

  authored and

  KolbyML

  committed
  c4a4ebc

• sanity: Move OS random to sanity check function

  Show description for 8cf6365
  

  laanwj

  authored and

  KolbyML

  committed
  8cf6365

• random: Add fallback if getrandom syscall not available

  Show description for ac8773c
  

  laanwj

  authored and

  KolbyML

  committed
  ac8773c

• Maintain state across GetStrongRandBytes calls

  

  sipa

  authored and

  KolbyML

  committed
  ca89d95

• Kill insecure_random and associated global state

  Show description for acef286
  

  laanwj

  authored and

  KolbyML

  committed
  acef286

• Add ChaCha20

  

  sipa

  authored and

  KolbyML

  committed
  7bbc2ee

• Switch FastRandomContext to ChaCha20

  

  sipa

  authored and

  KolbyML

  committed
  027dc20

• Introduce FastRandomContext::randbool()

  

  sipa

  authored and

  KolbyML

  committed
  07ac7db

• Add a FastRandomContext::randrange and use it

  

  sipa

  authored and

  KolbyML

  committed
  b769766

• Use hardware timestamps in RNG seeding

  

  sipa

  authored and

  KolbyML

  committed
  9ae9d61

• Test that GetPerformanceCounter() increments

  

  sipa

  authored and

  KolbyML

  committed
  961f49b

• Use sanity check timestamps as entropy

  

  sipa

  authored and

  KolbyML

  committed
  74372d1

• Add internal method to add new random data to our internal RNG state

  

  TheBlueMatt

  authored and

  KolbyML

  committed
  2447d22

• Add perf counter data to GetStrongRandBytes state in scheduler

  

  TheBlueMatt

  authored and

  KolbyML

  committed
  556addc

• random: only use getentropy on openbsd

  

  theuni

  authored and

  KolbyML

  committed
  3eba0f3

• [Random] Fix compilation

  

  Warrows

  authored and

  KolbyML

  committed
  f859bdf

• Add FastRandomContext::rand256() and ::randbytes()

  Show description for 061a21e
  

  sipa

  authored and

  KolbyML

  committed
  061a21e

• Add various insecure_rand wrappers for tests

  

  sipa

  authored and

  KolbyML

  committed
  49e45da

• Merge test_random.h into test_bitcoin.h

  

  sipa

  authored and

  KolbyML

  committed
  6407a40

• Replace more rand() % NUM by randranges

  

  sipa

  authored and

  KolbyML

  committed
  4edb342

• Replace rand() & ((1 << N) - 1) with randbits(N)

  

  sipa

  authored and

  KolbyML

  committed
  6de3ab4

• [Random / tests] scripted-diff: use insecure_rand256/randrange more

  Show description for 6e3ef14
  

  Warrows

  authored and

  KolbyML

  committed
  6e3ef14

• Use rdrand as entropy source on supported platforms

  

  sipa

  authored and

  KolbyML

  committed
  f3f85de

• random: fix crash on some 64bit platforms

  Show description for 81774fd
  

  theuni

  authored and

  KolbyML

  committed
  81774fd

• Use cpuid intrinsics instead of asm code

  

  sipa

  authored and

  KolbyML

  committed
  b1f402c

• Clarify entropy source

  

  sipa

  authored and

  KolbyML

  committed
  b9bab59

• [Random / tests] scripted-diff: Use randbits/bool instead of randrange

  Show description for c0653cd
  

  Warrows

  authored and

  KolbyML

  committed
  c0653cd

• [Rand/test] scripted-diff: Use new naming style for insecure_rand*

  Show description for e0b48c3
  

  Warrows

  authored and

  KolbyML

  committed
  e0b48c3

• [Tests] Fix compilation

  Show description for a45ff27
  

  Warrows

  authored and

  KolbyML

  committed
  a45ff27

• Fix resource leak

  

  Dag Robole

  authored and

  KolbyML

  committed
  6d7add2

• Add attribute [[noreturn]] (C++11) to functions that will not return

  Show description for b36d0c9
  

  practicalswift

  authored and

  KolbyML

  committed
  b36d0c9

• Check if sys/random.h is required for getentropy on OSX.

  

  jameshilliard

  authored and

  KolbyML

  committed
  0cb3058

• Bugfix: randbytes should seed when needed (non reachable issue)

  

  sipa

  authored and

  KolbyML

  committed
  7b59944

• Do not permit copying FastRandomContexts

  

  sipa

  authored and

  KolbyML

  committed
  6d83e0e

• [Random] Add a missing include

  

  Warrows

  authored and

  KolbyML

  committed
  28605a3

• [Refactor] Use arrays instead of unic vars in Chacha20

  Show description for 965554f
  

  Warrows

  authored and

  KolbyML

  committed
  965554f

• [Log] Replace a string by the function name in a log

  

  Warrows

  authored and

  KolbyML

  committed
  e5c5183

• Fixes and some clean up

  KolbyML

  committed
  2a620f6

• [Compilation] Pass caught exceptions by reference

  KolbyML

  committed
  9cd8cf0

• [Refactor] Add const qualifier to exception catching

  KolbyML

  committed
  284978f

• Update crypto/common.h functions to use compat endian header

  

  Fuzzbawls

  authored and

  KolbyML

  committed
  79eef0a

• [Refactor] refactor/fix CSporkManager and CSporkMessage classes

  Show description for 9b8d98f
  

  random-zebra

  authored and

  KolbyML

  committed
  9b8d98f

• [Spork] Protect CSporkManager with critical section

  

  random-zebra

  authored and

  KolbyML

  committed
  827d25b

• [Spork] CSporkManager class serialization

  

  random-zebra

  authored and

  KolbyML

  committed
  0fba7c1

• [Spork] Do not accept sporks signed too far into the future

  

  random-zebra

  authored and

  KolbyML

  committed
  12cc972

• [Spork] Remove unused SPORK_7_MASTERNODE_SCANNING

  

  random-zebra

  authored and

  KolbyML

  committed
  03533a4

• [Spork] Remove unused SPORK_11 and SPORK_12

  

  random-zebra

  authored and

  KolbyML

  committed
  6f07229

• [Spork] Define SporkId enum (with its serialization)

  

  random-zebra

  authored and

  KolbyML

  committed
  87dd525

• [Spork] Introduce CSporkDef and remove if/else blocks

  

  random-zebra

  authored and

  KolbyML

  committed
  cadd048

• [Spork] Make CSporkMessage::vchSig private

  

  random-zebra

  authored and

  KolbyML

  committed
  219a1ee

• Fix spork RPC to use new spork defs

  Show description for 1fe8c49
  

  random-zebra

  authored and

  KolbyML

  committed
  1fe8c49

• [Core] ReprocessBlocks: adjust to PIVX blocktime

  

  random-zebra

  authored and

  KolbyML

  committed
  662b4b6

• [Tests] spork functional test: check spork value after node restart

  

  random-zebra

  authored and

  KolbyML

  committed
  f1d7b52

• [Spork] fix CSporkManager maps

  

  random-zebra

  authored and

  KolbyML

  committed
  1e1ecfe

• [Trivial] rename DisconnectBlocks argument for consistency

  

  random-zebra

  authored and

  KolbyML

  committed
  94e04a1

• [Trivial] Align the format of the log messages in kernel.cpp

  

  random-zebra

  authored and

  KolbyML

  committed
  159e92e

• [Startup] Don't continue loading the wallet if the shutdown was requested.

  

  furszy

  authored and

  KolbyML

  committed
  01b248a

• [Trivial] Get rid of compiler warnings

  

  random-zebra

  authored and

  KolbyML

  committed
  a5adc16

• [Travis] Lower timeout for the full test suite

  Show description for 4619005
  

  Warrows

  authored and

  KolbyML

  committed
  4619005

• [Startup][Refactor][Backport]

  Show description for d644f6c
  

  furszy

  authored and

  KolbyML

  committed
  d644f6c

• [Logging][Startup]

  Show description for b0fdf4f
  

  furszy

  authored and

  KolbyML

  committed
  b0fdf4f

• [Startup][Wallet] Don't continue rescanning the wallet if shutdown was requested.

  

  furszy

  authored and

  KolbyML

  committed
  8b0283e

• [Trivial] Use error() instead of LogPrintf + return false.

  

  furszy

  authored and

  KolbyML

  committed
  5187ee4

• add snapcraft support to pivx, static build

  Show description for 9fcb920
  

  cevap

  authored and

  KolbyML

  committed
  9fcb920

• Update for merging

  

  Fuzzbawls

  authored and

  KolbyML

  committed
  543578a

• [Script] Introduce constant for maximum CScript length

  Show description for 214e931
  

  random-zebra

  authored and

  KolbyML

  committed
  214e931

• [Script] Treat overly long scriptPubKeys as unspendable

  Show description for c46e22b
  

  random-zebra

  authored and

  KolbyML

  committed
  c46e22b

• [Bug] Fix OOM when deserializing UTXO entries with invalid length

  Show description for 789a117
  

  random-zebra

  authored and

  KolbyML

  committed
  789a117

• CDataStream::ignore Throw exception instead of assert on negative nSize

  Show description for 01f8c1c
  

  random-zebra

  authored and

  KolbyML

  committed
  01f8c1c

• [Tests] Add tests for CCoins deserialization

  Show description for f522a5b
  

  random-zebra

  authored and

  KolbyML

  committed
  f522a5b

• [Wallet] Do not store Merkle branches in the wallet

  Show description for 1f787a5
  

  Warrows

  authored and

  KolbyML

  committed
  1f787a5

• Fixes and some clean up

  KolbyML

  committed
  658050b

• [Refactor] Move wallet functions out of header

  KolbyML

  committed
  7fd7295

• [Wallet] Keep track of explicit wallet conflicts instead of using

  Show description for b76e854
  

  Warrows

  authored and

  KolbyML

  committed
  b76e854

• [Wallet] Do not flush the wallet in AddToWalletIfInvolvingMe(..)

  Show description for 4728b29
  

  Warrows

  authored and

  KolbyML

  committed
  4728b29

• [Wallet] Switch to a constant-space Merkle root/branch algorithm

  Show description for 2c9fcc4
  

  Warrows

  authored and

  KolbyML

  committed
  2c9fcc4

• [Wallet] sort pending wallet transactions before reaccepting

  Show description for e27638c
  

  dexX7

  authored and

  KolbyML

  committed
  e27638c

• Make sure conflicted wallet tx's update balances

  

  morcos

  authored and

  KolbyML

  committed
  6a0dd8e

• Make wallet descendant searching more efficient

  

  morcos

  authored and

  KolbyML

  committed
  62aaf72

• Add new rpc call: abandontransaction

  Show description for e23e5e4
  

  morcos

  authored and

  KolbyML

  committed
  e23e5e4

• [Wallet] Call notification signal when a transaction is abandoned

  

  jonasschnelli

  authored and

  KolbyML

  committed
  172b90e

• Flush wallet after abandontransaction

  

  morcos

  authored and

  KolbyML

  committed
  cd11f5d

• Remove stale wallet transactions on initial load.

  

  presstab

  authored and

  KolbyML

  committed
  a0c5ead

• Fix calculation of balances and available coins.

  Show description for 2fe6da3
  

  morcos

  authored and

  KolbyML

  committed
  2fe6da3

• Fix that CWallet::AbandonTransaction would only traverse one level

  Show description for 9d8415f
  

  Empact

  authored and

  KolbyML

  committed
  9d8415f

• [Tests] Enable abandonconflict functional test

  

  Warrows

  authored and

  KolbyML

  committed
  d56c844

• [Wallet] Fix an error in tx depth computation

  

  Warrows

  authored and

  KolbyML

  committed
  5fc8a59

• [Wallet] Ignore coinbase and zc tx "conflicts"

  Show description for 18f8c7a
  

  Warrows

  authored and

  KolbyML

  committed
  18f8c7a

• [Build] Add new merkle files to CMake lists

  

  Warrows

  authored and

  KolbyML

  committed
  1f3df05

• Fixes and clean up

  Show description for 1b610e6
  KolbyML

  committed
  1b610e6

• [Tests] Add RPC budget regression tests

  Show description for 01d28e1
  

  Fuzzbawls

  authored and

  KolbyML

  committed
  01d28e1

• [Wallet][Startup][DB][Backport] bitcoin#10952 BTC back port. Named "Remove vchDefaultKey and have better first run detection".

  Show description for 413caac
  

  furszy

  authored and

  KolbyML

  committed
  413caac

• [Wallet] Fix inconsistencies with GetDepthInMainChain

  

  random-zebra

  authored and

  KolbyML

  committed
  b2df72b

• [TravisCI] Run CMake Tests earlier

  Show description for 4921c7d
  

  Fuzzbawls

  authored and

  KolbyML

  committed
  4921c7d

• Ensure we're building the GUI for all CI tests

  

  Fuzzbawls

  authored and

  KolbyML

  committed
  1e98729

• Update .travis.yml

  

  Warrows

  authored and

  KolbyML

  committed
  de63967

• [Core][Tests] REGTEST: fix nStakeModifier=0

  

  random-zebra

  authored and

  KolbyML

  committed
  28d36d5

• [Tests] Add wallet_reorg-stake functional test

  Show description for cf7e253
  

  random-zebra

  authored and

  KolbyML

  committed
  cf7e253

• [Wallet] Fix bug with coinstake inputs wrongly marked as spent

  

  random-zebra

  authored and

  KolbyML

  committed
  464b101

• [Tests] Add wallet_reorg-stake functional test to test_runner.py

  

  random-zebra

  authored and

  KolbyML

  committed
  1cbe3fa

• [Core] Prevent coinstakes from overpaying masternodes

  

  random-zebra

  authored and

  KolbyML

  committed
  9396f69

• [CMake] Fix macOS Boost detection

  

  Fuzzbawls

  authored and

  KolbyML

  committed
  8a2cdec

• [Wallet] Transaction IsEquivalentTo method backported + Duplicated mempool check code cleanup in IsTrusted method.

  Show description for 12360ca
  

  furszy

  authored and

  KolbyML

  committed
  12360ca

• [UI] TransactionFilter, do not invalidate the filter if range is already set.

  

  furszy

  authored and

  KolbyML

  committed
  5d5e9e0

• [Spork] Guard chainActive.Tip() and chainActive.Height() methods call.

  

  furszy

  authored and

  KolbyML

  committed
  ae5743f

• [Wallet][RPC] Lock/UnlockCoin const argument + checks in lockunspent

  Show description for d613a12
  

  random-zebra

  authored and

  KolbyML

  committed
  d613a12

• wallet: Unlock spent outputs

  

  promag

  authored and

  KolbyML

  committed
  334d851

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

  Show description for e5002d5
  

  furszy

  authored and

  KolbyML

  committed
  e5002d5

• [Masternodes] Reset mn sync process if it's sleep.

  

  furszy

  authored and

  KolbyML

  committed
  22949e2

• gui: explicitly disable "Dark Mode" appearance on macOS

  

  fanquake

  authored and

  KolbyML

  committed
  00ff68d

• build: if VERSION_BUILD is non-zero, include it in the package version

  Show description for 487f264
  

  achow101

  authored and

  KolbyML

  committed
  487f264

• build: include rc number in version number

  

  achow101

  authored and

  KolbyML

  committed
  c98f3e4

• Update release-process.md to include RC version bumping

  

  achow101

  authored and

  KolbyML

  committed
  792e542

• build: Add CLIENT_VERSION_BUILD to CFBundleGetInfoString

  

  fanquake

  authored and

  KolbyML

  committed
  3227c93

• build: use full version string in setup.exe

  

  MarcoFalke

  authored and

  KolbyML

  committed
  738635f

• Some fixes

  KolbyML

  committed
  713eb6d

Commits on May 20, 2020

• Update init.cpp

  KolbyML

  committed
  545338d

• Update benchmark_zerocoin.cpp

  KolbyML

  committed
  fb5c45d

• Update masternode-budget.cpp

  KolbyML

  committed
  75e50c3

• Update optionsmodel.cpp

  KolbyML

  committed
  bb34701

• f

  KolbyML

  committed
  aed099e

Commits on Nov 11, 2021

• Merge branch 'pr177' into upstream-rel-1.9.0-pr175-fix-conflicts

  Show description for 0967b2a
  wqking

  committed
  0967b2a

• Fixed compile errors

  wqking

  committed
  799f191