Skip to content
Permalink
Browse files

obsr core upgrade

Squashed update of following commits:

From 6e7cdd5a072fdc69e49670dc99626f51163e9972 Mon Sep 17 00:00:00 2001
From: observerdev <dev@obsr.org>
Date: Tue, 2 Jul 2019 01:15:00 +0200
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 924ec4f6ddb35209f732d00288c80f9eff61a800
Merge: 92aa6c2da e515b1e9f
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Tue Jun 25 22:52:54 2019 +0200

    Merge #932: [Node] Do all block index writes in a batch

    e515b1e [Node] Do all block index writes in a batch (Pieter Wuille)

    Pull request description:

      Backport from bitcoin https://github.com/bitcoin/bitcoin/pull/5367

    ACKs for commit e515b1:
      Mrs-X:
        ACK https://github.com/OBSR-Project/OBSR/pull/932/commits/e515b1e9f2309d27efea69beae6569ee92178d88
      furszy:
        ACK [e515b1e](https://github.com/OBSR-Project/OBSR/pull/932/commits/e515b1e9f2309d27efea69beae6569ee92178d88)

    Tree-SHA512: 8eff741bcbe357b7f6af0d1aea627f77498543efd117173ab2b4c325c3bc3ef3e761b6f4ad7cf70379b55daf68724bed2e10fe22a273b0fc1c3009fac8008a60

commit 92aa6c2daa3a0c10d15587a67bdb4e3f2e6d8367
Merge: 7e8855d91 7b4680a88
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Tue Jun 25 22:46:08 2019 +0200

    Merge #934: [Build] Bump master to 3.3.99 (pre-3.4)

    7b4680a [Build] Bump master to 3.3.99 (pre-3.4) (Fuzzbawls)

    Pull request description:

      Now that 3.3 has been branched off, bump master to 3.3.99 (pre-3.4).
      Gitian descriptors reflect this as well.

    ACKs for commit 7b4680:
      Mrs-X:
        utACK https://github.com/OBSR-Project/OBSR/pull/934/commits/7b4680a881dcaddba82bddbd3161506358c99ac7

    Tree-SHA512: b582d3f9ede816d28902991e8b891a8e56261dcf9a857cdbc5af1787add52c402a66c0eebf1cfc8197dee7dc295a3410406f2e4e347e078232e9f4d2036459bb

commit 7b4680a881dcaddba82bddbd3161506358c99ac7
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 22 15:12:35 2019 -0700

    [Build] Bump master to 3.3.99 (pre-3.4)

    Now that 3.3 has been branched off, bump master to 3.3.99 (pre-3.4).
    Gitian descriptors reflect this as well.

commit e515b1e9f2309d27efea69beae6569ee92178d88
Author: Pieter Wuille <pieter.wuille@gmail.com>
Date:   Tue Nov 25 16:26:20 2014 +0100

    [Node] Do all block index writes in a batch

    Backport from bitcoin https://github.com/bitcoin/bitcoin/pull/5367

commit 7e8855d910f89ce478698a6dbcc5499dfc836cf1
Merge: 2482572f8 c447aecc1
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 18 03:00:40 2019 -0700

    Merge #929: [Net] Update hard-coded seeds

    c447aecc1b [Net] Update hard-coded seeds (Fuzzbawls)

    Pull request description:

      Updated hard-coded seeds based on uptime and availability from primary
      DNS seeder.

    ACKs for commit c447ae:

    Tree-SHA512: 4ca56e41e277092093eead76fbc229a130bb786790c784a91e0d78a724f35a6e6594c4daa82a9dda88f7ed2eae441bc371fa2b4ab3d50d203d518d667ecbd2a9

commit 2482572f89a3ac3854c6365e7fbef0e1a3480ca2
Merge: 49a69b893 6d642ba5d
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 18 03:00:01 2019 -0700

    Merge #928: [Qt] Update Translations

    6d642ba5d9 Update translations from Transifex (Fuzzbawls)
    d1b54b69b4 make translate (Fuzzbawls)

    Pull request description:

      Updates the source strings as well as pulls any new translations from Transifex

    ACKs for commit 6d642b:

    Tree-SHA512: ccde28ab2ec914a412dc004a13fb7a93a5e0476dab1d65d3d35b362b62cf8e95b73164be48618e4d884a0e0e439a1a43fdf9351567b09ffb46bee004d8149567

commit 49a69b89317ce166e30054ce52b52ef4a50ad658
Merge: 5061b486c cd1169993
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 18 02:59:18 2019 -0700

    Merge #926: [Doc] 3.3.0 Notable Changes

    cd11699936 [Doc] 3.3.0 Notable Changes (Fuzzbawls)

    Pull request description:

      Notable changes for 3.3.0

      #ci-skip

    ACKs for commit cd1169:

    Tree-SHA512: 6cb841dd65873c1c3cc7c7b03ab672ae17e0945e9872b3f53a4accf6b919f46aab9fbdc95753fd159cda88db86f2fcc087a15a3e1605fda170a99b6c50e0f7e9

commit 5061b486c2472d8dfdca54b082c6463d1a7db8e3
Merge: 048d1295d ab441f372
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 18 02:55:41 2019 -0700

    Merge #930: [Net] Add a couple new testnet checkpoints

    ab441f3728 [Net] Add a couple new testnet checkpoints (Fuzzbawls)

    Pull request description:

      1. `1106100` height that zc public spends became available
      2. `1112700` random recent testnet block that meets criteria

    ACKs for commit ab441f:

    Tree-SHA512: c138a71939e66a0a9ac598a25f6984c4f05f846533ded2a90f0430c7d71608baf81e48e8bd3ca71206794f3212c2f9e3e8ed5cd282f9c9d02a38db61f7585e85

commit 048d1295dcca447bb033d04465a298b9d409e6cf
Merge: 3323f2684 ef8df80d7
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 18 02:50:14 2019 -0700

    Merge #927: [Trivial] Update header copyright years

    ef8df80d78 [Trivial] Update header copyright years (Fuzzbawls)

    Pull request description:

      This updates the PIVX copyright year in file headers to the year that
      they were last updated.

    ACKs for commit ef8df8:

    Tree-SHA512: 7a343e6a0727962e5f3fb404e388f844c355c6318b4eb777562553744e54f0f475d1c7955c22158da21f2e660c286d5dc08a95296f9a7aa9ca2e2705892f6a6e

commit cd11699936c3c7c776c3deed9a39e984d17b2543
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 17:11:59 2019 -0700

    [Doc] 3.3.0 Notable Changes

commit ab441f3728652cb53bfc003795790abd0fbc2fb4
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 18 01:20:56 2019 -0700

    [Net] Add a couple new testnet checkpoints

    1. `1106100` height that zc public spends became available
    2. `1112700` random recent testnet block that meets criteria

commit 6d642ba5d92164b7e547ea8da9721bb426475e86
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 18 00:21:44 2019 -0700

    Update translations from Transifex

commit c447aecc1b84e3e7679c9d4a3c4395a22c17817c
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 18 00:36:08 2019 -0700

    [Net] Update hard-coded seeds

    Updated hard-coded seeds based on uptime and availability from primary
    DNS seeder.

commit ef8df80d783b4d4871bc74c658693ac1b670a84e
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 23:46:50 2019 -0700

    [Trivial] Update header copyright years

    This updates the PIVX copyright year in file headers to the year that
    they were last updated.

commit d1b54b69b4e8dc325fabb52019e281e2276d837e
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 23:34:54 2019 -0700

    make translate

commit 3323f26848d02bad4e6592d0440dfa106d51a88b
Merge: a9827a0e6 fe67706fd
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 23:25:16 2019 -0700

    Merge #824: [Refactor] Remove stale obfuscation code

    fe67706fd2 Remove more useless obfuscation code (Fuzzbawls)
    eed0a1d34e Remove more useless obfuscation code (Fuzzbawls)
    3bb5c768bf Remove unused functions in wallet.cpp (Fuzzbawls)
    166b2d31c8 Remove nAnonymizeObsrAmount and nLiquidityProvider (Fuzzbawls)
    886d806f58 Remove unused code in DoAutomaticDenominating (Fuzzbawls)
    742a7b187c [Qt] Remove unused obfuscationconfig (Fuzzbawls)

    Pull request description:

      Removal of "dead" code surrounding the defunct obfuscation feature.

      Obfuscation as a usable feature was removed in November 2017, but much of it's underlaying code remained. This PR aims to clean up and remove the now unnecessary code.

      Marking as [WIP] for the time being.

    ACKs for commit fe6770:
      random-zebra:
        ACK https://github.com/OBSR-Project/OBSR/commit/fe67706fd222168e4bb6a387566a48dbd667638c

    Tree-SHA512: 46ab7d035aa899677d1337c6a58def25e452c24db038b769e9e6f980ac43e03a34af968114facadcd62ec93eacf41de0a385f60d91630a0ac8425cd385d9a513

commit a9827a0e638910e582e02fd78f1d91b928dc4402
Merge: 484c070b2 88705a609
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 23:15:11 2019 -0700

    Merge #925: [Consensus] Time checks

    88705a6099 [Consensus] Guard time checks changes (warrows)
    105ee5fd07 [Consensus] Readd checks removed in 3b778f56fe2b5e5b363c8c6d794a848a84d630d1 (warrows)
    2621b7f3f7 [Refactoring] Move ContextualCheckZerocoinStake() to kernel.cpp (warrows)

    Pull request description:

      Two checks on the age of a transaction used to stake were removed by mistake in 3b778f5. We reintroduce them here.
      2621b7f is a bit of refactoring
      105ee5f is the real change
      88705a6 avoid checking blocks already in the blockchain

    ACKs for commit 88705a:
      furszy:
        ACK 👌  [88705a6](https://github.com/OBSR-Project/OBSR/pull/925/commits/88705a6099f0c42d122c5717fccd08f6485f0b0a)
      Fuzzbawls:
        ACK 88705a6

    Tree-SHA512: 13397aac35b1d8c6680993ba90a1266113baf25bd16410f408d7d16f9eaa93f7cd0f665224959c64dfac5725bdacc25bead9d65cd8d9bdcd5570b9434ebd851a

commit 484c070b229d3be0fad1a4a05c424ce5712a6187
Merge: 893183339 eea991536
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 23:09:35 2019 -0700

    Merge #911: [RPC] add 'getblockindexstats' function

    eea9915361 [RPC] fix locking strategy (random-zebra)
    49ef846774 [RPC] fix help texts (random-zebra)
    26b1f0ca33 [RPC] 'getblockindexstats': count public spends separately (random-zebra)
    7980f23c0c [RPC] fix fee calculation in 'getblockindexstats' and 'getfeeinfo' (random-zebra)
    689ac23f62 [RPC] add 'getblockindexstats' function (random-zebra)

    Pull request description:

      This introduces a new RPC method `getblockindexstats` to get aggregated BlockIndex data for a range of blocks:
      - transaction count
      - transaction count (including coinbase/coinstake txes)
      - zOBSR per-denom mint count
      - zOBSR per-denom spend count
      - total transaction bytes
      - total fees in block range
      - average fee per kB

      Since it expands the functionality of `getfeeinfo`, this method has been redirected to call `getblockindexstats` (over the **last** N blocks).

      To avoid code duplication with `getserials` and `getmintsinblocks`, the initial validation of the input params has been refactored in the function `validaterange()`.
      This also contains a fix to prevent the wallet from crashing when calling these functions over out-of-range blocks.

    ACKs for commit eea991:
      Fuzzbawls:
        ACK eea9915
      Warrows:
        ACK eea9915

    Tree-SHA512: fd424d27b09133f8e1b646044f6e48cb7be8e7b7f6bbe51797b229e7e1c5d721226022915876d3810b38e7c2eb6bb089a7e3b8df2b0487ac251bde405e1f964a

commit 893183339ec09e338ccb2b80bec7797d14eb25d8
Merge: a56cc2948 0608b9ca9
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 23:07:14 2019 -0700

    Merge #921: [Scripts] Overhaul supplemental python/shell scripts

    0608b9ca95 Misc updates (Fuzzbawls)
    616b1d531c Introduce clang-format-diff.py (Fuzzbawls)
    0367807d49 Introduce commit-script-check.sh (Fuzzbawls)
    28bd93359a Update gitian-build.py (Fuzzbawls)
    b0d7d07512 Update github-merge.py (Fuzzbawls)
    fe7bf507d4 Introduce gen-manpages.sh (Fuzzbawls)
    035dda7458 Introduce circular-dependencies.py (Fuzzbawls)
    70721b47ac Migrate update-translations.py to python3 (Fuzzbawls)
    1558ff775e Update install_db4.sh (Fuzzbawls)
    5c92f16656 Add multi-purpose copyright header script (Fuzzbawls)

    Tree-SHA512: 3cc0637288fe059c340bbaee8e5eda794df985280b739d8a976e6eaa7938bb24eb2bf554c4d1552cc5f45adcd1f1380e4ea390029ed9024f97bf80071918b9f4

commit a56cc2948d4a80b5698da90c4d15c417e697e8db
Merge: 95b584eff d24742cf3
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 23:01:48 2019 -0700

    Merge #920: [Docs] Overhaul documentation files

    d24742cf37 Remove redundant docs (Fuzzbawls)
    007cc8c289 Update src/test/README.md (Fuzzbawls)
    d2af9593e4 Introduce translation_strings_policy.md (Fuzzbawls)
    019b8f4e8c Update contrib/devtools/README.md (Fuzzbawls)
    2bc9d1b0f1 Update developer-notes.md (Fuzzbawls)
    d1a65fdcaf Update dnsseed-policy.md (Fuzzbawls)
    0b5c0c262b Update release-process.md (Fuzzbawls)
    9335a103d1 Update test/functional/README.md (Fuzzbawls)
    20f251336a Update doc/README.md (Fuzzbawls)
    5b4f73def6 Clean up whitespace in Doxyfile.in (Fuzzbawls)
    3cea76be03 Update and reformat init.md (Fuzzbawls)
    2f5efbd12c Reformat files.md (Fuzzbawls)
    df0d2ba1fe Introduce dependencies.md (Fuzzbawls)
    785b61cf56 Update zmq.md (Fuzzbawls)
    231f28e696 Update translation_process.md (Fuzzbawls)
    c5f6822af5 Update tor.md (Fuzzbawls)
    b7d0ec7696 Fix markdown in REST-interface.md (Fuzzbawls)
    4fa4cc4ff2 Update Contributing guidelines (Fuzzbawls)
    a544132207 Update build notes (Fuzzbawls)

    Tree-SHA512: ab422791c3e43d6e455d648c9b6b30943c176e03d2a0702135184108c8887bb39e4bb9c51bab9f9a04a130a297f8db879563e3b45f010c6b1f34482122b78681

commit 95b584effd1f090c3c44372e8a8f902ab1ca332d
Merge: 6f597629d 8695fd5fb
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 22:46:21 2019 -0700

    Merge #908: [NET] Non-running dns servers removed from chainParams.

    8695fd5fb5 Non-running dns servers removed + warrows dns added. (furszy)

    Tree-SHA512: ad98e116255c919d1f0765585578afdb64e0368393faa1954bf23162e705165aa11c8d810ac913bd0c7325a0da096fd99535de5cb66778ad5be15f6a5d81b8c8

commit 6f597629d80874dc95a73c08a5c2e7f488e78968
Merge: b38ef0483 9c0329c72
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 21:12:52 2019 -0700

    Merge #904: [zOBSR] Free memory from ToString()

    9c0329c72b [zerocoin] Free memory from ToString() (warrows)

    Tree-SHA512: c04bfcf1af3b9fd95cf6aa653367043d4a973805c37e820b3127a3198efbdb0f83eb82d8084409f17e059e44e7c653666899a5733dd1f272d0829ae0ceee388d

commit b38ef048389c6ba57d07c334fcc1cd7d0a8b4971
Merge: 473976c61 342f0341d
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 17:14:48 2019 -0700

    Merge #917: [Build] TravisCI Update

    342f0341de Disable known failing regression tests (Fuzzbawls)
    a5f887b00e [Travis] Update TravisCI from upstream (Fuzzbawls)

    Tree-SHA512: 0cf866696ffb6cff539a1412c95f1f10a6e031629f153aa9a01b5326b77bc7de53912c36d254c859e437d7c3035f466d3b3db79aab26cec4767c75e45e16559a

commit 473976c61925fd374e1964401bf0d9038a3be60c
Merge: 988b33dab d2136e30e
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 17:12:42 2019 -0700

    Merge #913: [Depends] Update from upstream

    d2136e30e0 depends: Update from upstream (Fuzzbawls)

    Tree-SHA512: 9ce1b15170113cd207090f8986efd809cc6f4859132140e1c09f573e1015115ff82d961d7fc21375f8a5346de6bea656bb3bfb190ab95c60c080145d8ea67137

commit 88705a6099f0c42d122c5717fccd08f6485f0b0a
Author: warrows <warrows@gamer666.fr>
Date:   Mon May 20 12:46:51 2019 +0200

    [Consensus] Guard time checks changes

    Guard these changes against the protocol version change enforcement

commit 105ee5fd078cf20854a18a4ec879adcfdda9970d
Author: warrows <warrows@gamer666.fr>
Date:   Tue Apr 23 16:54:10 2019 +0200

    [Consensus] Readd checks removed in 3b778f56fe2b5e5b363c8c6d794a848a84d630d1

    Two importants checks were removed while refactoring to add zOBSR
    staking. Their equivalents were added to zOBSR staking but missing for
    simple OBSR staking. We add them back with this commit.

commit 2621b7f3f7da1516472320255fa5b243ac40b750
Author: warrows <warrows@gamer666.fr>
Date:   Tue Apr 23 16:33:35 2019 +0200

    [Refactoring] Move ContextualCheckZerocoinStake() to kernel.cpp

    And call it in CheckProofOfStake() which is called by AcceptBlock()
    instead of calling it directly from AcceptBlock().

commit 0608b9ca95e96b0f34d02a9523cc0bdf05f3a1a9
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 03:57:17 2019 -0700

    Misc updates

commit 616b1d531ca907d9c2667b46920c4e686497289a
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 03:57:03 2019 -0700

    Introduce clang-format-diff.py

    This script can be used to format a diff to adhere to clang-format

commit 0367807d49ec9618725b31c5817501f51b751bf9
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 03:56:26 2019 -0700

    Introduce commit-script-check.sh

    This script can be used to verify scripted diff commits

commit 28bd93359abd5ed71b897cdf44e0bbfd48fe186f
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 03:55:34 2019 -0700

    Update gitian-build.py

    latest version from upstream, OBSRified

commit b0d7d07512ca2a27051699d06be206e0556f1fca
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 02:50:53 2019 -0700

    Update github-merge.py

commit fe7bf507d4c6b641033af0717c1156e32423cb15
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 02:47:33 2019 -0700

    Introduce gen-manpages.sh

    Script to update the man files in `doc/man/`

commit 035dda7458dc619b57bad4d0f501687b21b7c3e8
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 02:46:46 2019 -0700

    Introduce circular-dependencies.py

    This script can be used to find circular include dependencies in the
    code base. These should eventually be weeded out.

commit 70721b47acc89156c07bbec1f8779bb393ddd8c0
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 02:45:15 2019 -0700

    Migrate update-translations.py to python3

commit 1558ff775eb60bc416a1e443a74ea6210729bd93
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 02:44:34 2019 -0700

    Update install_db4.sh

commit 5c92f166568a3e7929c530ffac2fd3605ddbfa37
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 02:43:39 2019 -0700

    Add multi-purpose copyright header script

    This script includes options for reporting, adding, and updating
    copyright headers.

commit d24742cf372fd2c1e2ce9c01d276bfa4b6ffe302
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 02:11:16 2019 -0700

    Remove redundant docs

    These doc files are either completely redundant (documentation exists
    in-wallet/in-rpc, or more comprehensive guides elsewhere), or were left
    over fragments from when the code fork was done.

commit 007cc8c2893cbc5363abdbabd782b1e7b1fa2c8e
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:55:01 2019 -0700

    Update src/test/README.md

    Update the in-tree README.md with the contents of `doc/unit-tests.md`,
    and delete the redundant doc file.

commit d2af9593e4eef9d2e54c74a9f215ad05a2bc1280
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:43:48 2019 -0700

    Introduce translation_strings_policy.md

    Adds guidelines for adding new translation strings in the code

commit 019b8f4e8c36d58947beac66b12f4ea9eab9fe5d
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:38:04 2019 -0700

    Update contrib/devtools/README.md

    Prep for new/renamed scripts

commit 2bc9d1b0f1721a2e260a3b6569fe59d71bb45b4f
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:37:16 2019 -0700

    Update developer-notes.md

    Add TOC and expand on style guidelines as well as better describe
    testing cases.

commit d1a65fdcafe0fad1ea80af18ad1caa501830e013
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:35:18 2019 -0700

    Update dnsseed-policy.md

    grammatical fixes

commit 0b5c0c262b5f1b9a4aff4353885f179fc9766fbf
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:34:01 2019 -0700

    Update release-process.md

    Minor formatting and grammatical changes. Remove stale reference to the
    aarch64 gitian descriptor.

commit 9335a103d11a013e72cd51eba0c5c88b2cdfac8d
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:26:03 2019 -0700

    Update test/functional/README.md

    Added more details regarding the purpose, writing, and use of the
    regression test suite.

commit 20f251336a0e8af25147e1d03d39f3af45e97f28
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:24:22 2019 -0700

    Update doc/README.md

    Fix namings, outdated links, and sample commands

commit 5b4f73def60b63c5b1a80d7ea454d846a3322c4a
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:21:28 2019 -0700

    Clean up whitespace in Doxyfile.in

commit 3cea76be03aae8cd23d5b076ad187929a418f484
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:13:45 2019 -0700

    Update and reformat init.md

commit 2f5efbd12c2e427aa3b5f4738ed1a5d03985f756
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:12:11 2019 -0700

    Reformat files.md

    Changed to markdown table layout for ease of reading. Removed old
    bitcoin-only information for older versions that we never used.

commit df0d2ba1fe0bf61522236c6cd03d0c94010926e8
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:11:11 2019 -0700

    Introduce dependencies.md

    This file contains explicit dependency information used for release
    builds (version, link, etc).

commit 785b61cf5643f98113d4acbce7683bd11316e48b
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:07:34 2019 -0700

    Update zmq.md

    Typo fixes and update python to python3 in sample commands

commit 231f28e6964980580646a020215345f1c15cc14a
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:06:34 2019 -0700

    Update translation_process.md

    Fix some typos and refresh with more current information.

commit c5f6822af58e4312fdc97ec6e2d2264117cc27e9
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:05:22 2019 -0700

    Update tor.md

    Updated to consider more recent versions and features of the tor router
    (automatic hidden service creation/deletion).

commit b7d0ec7696f2f059cb78846af42e75c8d3675e1c
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:03:42 2019 -0700

    Fix markdown in REST-interface.md

commit 4fa4cc4ff25693306534495e2121b603f444542a
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:02:29 2019 -0700

    Update Contributing guidelines

    Mainly punctuation and styling changes. Added a section about rebasing
    pull requests.

commit a544132207c1386d9098a9aa8962d04dabfe5f09
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 01:01:09 2019 -0700

    Update build notes

    Also, remove the now redundant README_osx.md file

commit 988b33dab8d82d8a2c9cd77ac8c8e0665bf962c2
Merge: 5a43ea790 46ba7a2b9
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 17 03:28:39 2019 -0700

    Merge #924: [Backport] Max tip age to consider a node in IBD status customizable.

    46ba7a2b96 [Backport] Max tip age to consider a node in IBD status customizable. Backport from bitcoin##7208. (furszy)

    Tree-SHA512: 211479d05cc8226d0bdaa3432204467679b465dfdbcdcf58650ec2fcb415c60544f3ae354f8b460adc6cd7e2d56ce6b3a52dd77ac92017eb7f66d98a76051bb2

commit 8695fd5fb567251f10f65cb10ca1f6b104bcf57c
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed Jun 5 01:58:12 2019 +0200

    Non-running dns servers removed + warrows dns added.

    dns servers cleanup

    dns servers, add warrows servers

commit 5a43ea790ac6e772d6e1c3b7f485ff88e3c1995a
Merge: 0f98fd4d3 55127d126
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sun Jun 16 21:23:04 2019 -0700

    Merge #914: [Gitian] Bump gitian build versions

    55127d1264 [Gitian] Bump gitian build versions (Fuzzbawls)

    Tree-SHA512: 29c6681b76adfb69b2f741d9f50575da0f870df8b822cb2886e10f6d364713221db0a94b017de3e89943e6e52d3aa2d7856604f092b73af14caa0ab9dc0b21bc

commit eea9915361800081de7c27c0ba546766fca56732
Author: random-zebra <random.zebra@protonmail.com>
Date:   Mon Jun 17 02:30:42 2019 +0200

    [RPC] fix locking strategy

    - validaterange
    - getfeeinfo
    - geblockindexstats
    - getmintsinblocks
    - getserials

commit 0f98fd4d3fd5b0aa1287eb5763e7f97d344e962a
Merge: a4f02ed94 45ea523e1
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sun Jun 16 16:01:52 2019 -0700

    Merge #922: [Build] Fix app name casing in mac deploy related files

    45ea523e1a [Build] Fix app name casing in mac deploy related files (Fuzzbawls)

    Tree-SHA512: 79fd711f3db52e418f42b7cdcf26a4a68456e6727b1362837745eacfe1797eb8fb33a8a86812158c1e833862fca7fedc5e55ef0fa5d4a2d7eff654c646ea8214

commit a4f02ed94624c184318ca58e37e42d90c35cff37
Merge: c0233e4af 24d72d0f6
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sun Jun 16 00:37:29 2019 -0700

    Merge #916: [Staking] Don't assert if we were beaten to the block

    24d72d0f64 [code review] LogPrintf nit change (CaveSpectre11)
    019d26ac4c Don't assert if we were beaten to the block (CaveSpectre11)

    Tree-SHA512: 9818319df999ba21fb6f89dadf254f76ad02d14b4f35fcae5b8d9a6251a0be5212650f3834a61a90fad2a9e8ce242751a9c09f7325c9cccc60223a59a6b3f22c

commit 46ba7a2b963d861a374077fa613bab60def6e447
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Sun Jun 16 01:43:42 2019 +0200

    [Backport] Max tip age to consider a node in IBD status customizable. Backport from bitcoin##7208.

commit 45ea523e1a1d2f9ec9ba6fc9a4b73ba9c30d4ae3
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 14:53:19 2019 -0700

    [Build] Fix app name casing in mac deploy related files

    The app bundle's filename is `OBSR-Qt.app`, not `Obsr-Qt.app`.

commit c0233e4af6a4b9e6432904dad97e9798aae54fa7
Merge: 0417d52ef addeb0ac0
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 15 04:13:10 2019 -0700

    Merge #919: [zOBSR] Debug missing jump line.

    addeb0ac06 Update accumulators.cpp (Matias Furszyfer)

    Tree-SHA512: 56de08723ba12cb2b7f96b66ed5d6ee2c3912be6397ef1eb56b16d8c805425415b288d9b176981b8e720c6f195acdbfc1156bed5f7c31dcd9547a790cb585a52

commit 49ef846774e88698879f30ea1286da9cac66ccbd
Author: random-zebra <random.zebra@protonmail.com>
Date:   Sat Jun 15 11:46:52 2019 +0200

    [RPC] fix help texts

    - getblockindexstats
    - getmintsinblocks
    - getserials

commit 24d72d0f64eb7c4aff220e0e9401e31390b98737
Author: CaveSpectre11 <36988814+CaveSpectre11@users.noreply.github.com>
Date:   Fri Jun 14 19:45:55 2019 -0400

    [code review] LogPrintf nit change

commit addeb0ac0619d55c869eb346865b47dfea6cd1aa
Author: Matias Furszyfer <matiasfurszyfer@protonmail.com>
Date:   Fri Jun 14 15:12:33 2019 +0200

    Update accumulators.cpp

commit 0417d52ef9645fee98270277ea1a2ad508f835e9
Merge: 07c8fb8f8 c424f0f24
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Jun 13 22:50:00 2019 -0700

    Merge #895: [QT] Options UI cleanup

    c424f0f244 Fix margins (Alko89)
    2d052155ff Hide zobsr related options. (Alko89)

    Tree-SHA512: 2944f28e4d2b4baa901a5c1a4bb991eb07bb81d33c285ec32971fa9485522320a6f583f5346c7fadceb2ab0e484f0cba521dc436cfa1586f75bfa05f13eeac9a

commit 07c8fb8f8896dcbb58e6084fb4867d8b1164bab5
Merge: 8a47747b5 b75d8bc0b
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Jun 13 19:32:06 2019 -0700

    Merge #910: [Build] Clean all coverage files during make clean

    b75d8bc0bb [Build] Clean all coverage files during make clean (Fuzzbawls)

    Tree-SHA512: 5f0e0a4795ea770cabf326c91aea24094de9193684a295f82aa38b42840b0ea38f1a119ba30c6c20eedd1862f22133b66e606912da0f93b420e9ca0549704f41

commit 8a47747b596e113b673ccd2f11cd0da7714b575b
Merge: 8adeeb972 ca2fd101b
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Jun 13 18:01:05 2019 -0700

    Merge #906: [Build] Add CMake Support

    ca2fd101ba use non-Cellar OpenSSL path for macOS (Fuzzbawls)
    69b0032749 fix config.h include file name (Fuzzbawls)
    d413496b01 [Build] Initial CMake support (Fuzzbawls)

    Tree-SHA512: 459d881a6128027c1b1fe6df13b0dce5fe484af377afece74ccc135a5e5ea320496165ffbdef70d806bd879be7cad39d4bfc3cdffbacfc2a61d0c8e53265b0ab

commit 8adeeb9727f0ecf13a4f5290dede8cefd014270a
Merge: be3aab4a0 c84e0e83b
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Jun 13 16:24:34 2019 -0700

    Merge #902: [Tests] Add tests for CAddrMan

    c84e0e83ba [Code Style] Remove std namespace in test file (warrows)
    3355c86cce Increase test coverage for addrman and addrinfo (Ethan Heilman)
    d4da01588b Creates unittests for addrman, makes addrman testable. (EthanHeilman)

    Tree-SHA512: cd960109d8f3bdc46dfd58da2136a748aa8ecb1b3bacfa031af0a1544bd90514fe71b8fc63650e61c5872c7a42febc986616252550a71c510bdc7f9e1ab87e0f

commit be3aab4a00d56529abd8c69dc4076bbc5e5c0caa
Merge: 5f167c2c7 f3308f404
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 11 15:48:09 2019 -0700

    Merge #901: [RPC] Fix typos and oversights in listunspent

    f3308f404d Fix typos and oversights in listunspent (CaveSpectre11)

    Tree-SHA512: b6a4651b5ee27cf757e9effa1d692020823d7c4bbd66a56c990252fc80f7f3333abb1313b37a01f5d444f333c0d4782d4607ca5e4179cf4bac6db5a86cc15f78

commit 5f167c2c7efb59f8c2d2a5946fd1cad1d42b1fd2
Merge: 68c81c407 f912182d2
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue Jun 11 15:45:46 2019 -0700

    Merge #912: [Cleanup] compiler warnings in coinSpend object.

    f912182d27 [Cleanup] clang compiler warnings in coinSpend and publicCoinSpend fixed. (furszy)

    Tree-SHA512: 58dbe73519a8eece2a824a19f37b5219c1e189e395afc61f9fcfa54f195befd9f7a49500c4147684a9b58e96fa7ff7906fa956ae8ac249dc7094faaa6cd4a4b6

commit 342f0341de1fad3822a492073c2bba8daf41abff
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Jun 10 22:46:50 2019 -0700

    Disable known failing regression tests

commit a5f887b00e7fd1d9625d869a5b39717200160241
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sun Jun 9 16:18:27 2019 -0700

    [Travis] Update TravisCI from upstream

    Most notable change here is the introduction of two breakpoints that
    will store the current cache and stop if the previous step took a long
    time. This is intended to avoid hitting the global time limit of 50
    minutes for builds that would need to rebuild the depends cache.

commit 26b1f0ca330901403ee456953943be17e7731578
Author: random-zebra <random.zebra@protonmail.com>
Date:   Tue Jun 11 17:33:01 2019 +0200

    [RPC] 'getblockindexstats': count public spends separately

commit 7980f23c0c1a99120908ca969b22daaf7ea5dccb
Author: random-zebra <random.zebra@protonmail.com>
Date:   Tue Jun 11 17:16:27 2019 +0200

    [RPC] fix fee calculation in 'getblockindexstats' and 'getfeeinfo'

commit 019d26ac4cdcdfdeacb2ab685562cbbb0df56380
Author: CaveSpectre11 <36988814+CaveSpectre11@users.noreply.github.com>
Date:   Mon Jun 10 12:19:55 2019 -0400

    Don't assert if we were beaten to the block

    A timing window exists where a wallet could be creating a new block from within the miner thread when a new block is received to the wallet.  This window will create a situation where TestBlockValidity() fails because the chain tip has changed between the time it created the new block and the time it tested the validity of the block.

    This situation would result in the wallet being asserted; however this is a little overkill.  rather than asserting if the tip has changed, it is better to throw the block away.

    This problem was revealed during a testnet test of an altcoin, and very prevalent when multiple wallet existed with the exact same number of staking coins received in the same transaction; or when multiple wallets were staking the same coins via import private key.  The problem happens significantly less in more normal circumstances, but was still observed in a testing environment with fast blocks.

    It is likely that this scenario has been encountered but never determined to be root cause, as a crashed wallet could be restarted, re-indexed and never investigated further.

commit 55127d126459b98a125a3ff1110a8ca7b7074350
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sun Jun 9 20:13:24 2019 -0700

    [Gitian] Bump gitian build versions

    Bumps the gitian build versions to 3.3, which should have been done
    right after 3.2 was branched off.

    At the same time, update to python3 explicitly and allow for some better
     error reporting.

commit ca2fd101ba951f268cf1a6102085fca28979b879
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sun Jun 9 18:30:00 2019 -0700

    use non-Cellar OpenSSL path for macOS

    removes the dependency on a specific version, as long as the installed
    version is 1.0.x. Also set the appropriate environment flags for OpenSSL
     on macOS.

    Note: the setting of these two environment variables would be better
    suited to a user's `~/.bash_profile` rather than being done within
    CMake, as doing it here is destructive.

commit d2136e30e09add2c120a717c02221ebff9b3331f
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Sat Jun 8 03:28:54 2019 -0700

    depends: Update from upstream

commit f912182d27e143e168ae6567f31aee4b26d2ca49
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Sun Jun 9 22:24:13 2019 +0200

    [Cleanup] clang compiler warnings in coinSpend and publicCoinSpend fixed.

commit 68c81c407a06aa87f7baddfb640dfb1419359bda
Merge: 458b08c8f 93bc03763
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Fri Jun 7 16:34:18 2019 -0700

    Merge #903: [Log] Handle errors during log message formatting

    93bc03763b [Log] Handle errors during log message formatting (warrows)

    Tree-SHA512: 55acc54247ad0980a4ed28ff167d35bae5d437e6484bd5ebb8c9cf948e47751d2e7dc4e9c338d7a6d22301f85448b4e6b8c4f6dbf97d68168939d13bdecb310b

commit 689ac23f62b8dbfd4de99497085a4b068af70dc2
Author: random-zebra <random.zebra@protonmail.com>
Date:   Fri Jun 7 18:51:51 2019 +0200

    [RPC] add 'getblockindexstats' function

commit 69b0032749705dfb8ca425e2b40446dd4cc1b4e4
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon May 27 00:32:30 2019 -0700

    fix config.h include file name

commit d413496b01e527470742b3964594ec96b8ce994c
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu May 2 23:14:24 2019 -0700

    [Build] Initial CMake support

commit 458b08c8f230e808ac4e6505b67fb6350e112cdb
Merge: 4b22a0902 39f37c5c5
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Fri Jun 7 00:07:32 2019 -0700

    Merge #909: [Consensus] Mainnet public spend enforcement height set.

    39f37c5c52 mainnet public spend enforcement height set (furszy)

    Tree-SHA512: 41adff5fa6ed7458ef3dcbb33979716996168bff7eccc4759931e8231184462a75020485430d91f88373b6cd3d298d3c0d61a9758aab4e0da3e6ea64d84e3594

commit b75d8bc0bbae0decc572e37495c56368fbc2ec80
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Fri Jun 7 00:01:35 2019 -0700

    [Build] Clean all coverage files during make clean

    This adds extra paths that were left out and ensures that `.gcda` and `
    .gcno` files are properly cleaned up.

commit 39f37c5c52ad9c2b0c9e248fbb7c196658de2e89
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Fri Jun 7 08:24:23 2019 +0200

    mainnet public spend enforcement height set

commit 4b22a090248da20ddfa5ce5ca1c74487863d0b67
Merge: 65bd78894 a789d2163
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Jun 6 21:50:12 2019 -0700

    Merge #899: [zOBSR] Disable zOBSR staking

    a789d21635 [zOBSR] Disable zerocoins inclusion in 'SelectStakeCoins' (random-zebra)

    Tree-SHA512: 92da55ee6efe3090ad1b279e3ad4d1f757ca70d0a4b1f820a36b4d5d6dcef126002fc6c2402b2b8d34618f212a192d8dc7505f98a0050691d152ba5a17fb1821

commit 65bd788945de04f8e5d54935ce4d70d5b30ac375
Merge: 855408c2c 834cbeb1c
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Jun 6 21:43:26 2019 -0700

    Merge #897: [zOBSR] Disable zerocoin minting

    834cbeb1cc [RPC] enable mint only for regtest (random-zebra)
    dcc74f8815 [zOBSR][Consensus] fix 'Zerocoin_Block_Public_Spend_Enabled()' enforcement (random-zebra)
    3555f430d2 [Wallet] Disable automint (random-zebra)
    2708b6f3bd [Consensus] Disable zerocoin minting in contextual check (random-zebra)
    9f3fa2add4 [RPC] Disable zerocoin minting (random-zebra)
    fda5fff154 [GUI] Disable zerocoin minting (random-zebra)

    Tree-SHA512: a950267f03e570f01c17030ae5b6f1a71e8d1016589a7a03c03a0495463099e9ddf0dc36b83f0918ae1c02cd6686f9bf9d3df7924ca4ec514da21be203bfc3cf

commit 855408c2c3e7d67f3b0b0021661cbcaba07f5f4a
Merge: 3d496cc74 d6149cc12
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Jun 6 21:35:18 2019 -0700

    Merge #891: [ZOBSR] Zerocoin public coin spend.

    d6149cc12e [Consensus] Testnet enforcement height. (furszy)
    28afbd2981 [zOBSR] v1 serials modulus fix + isStandardTx fix for publicSpends. (furszy)
    ddc3f15562 [Consensus] spork 15 activation + protocol version bump. (furszy)
    216a3174af [zOBSR] testnet publicSpend enforcement height set. (furszy)
    0393227b65 [Tests] add test reorg for public spend (random-zebra)
    2f750e5011 [RPC] add 'createrawzerocoinpublicspend' method (random-zebra)
    b5e2526da8 [zOBSR] publicCoinSpend version field included in the serialization for any future change. (furszy)
    46e453b8bc [zOBSR] reject priv coin spends on tx mempool acceptance. (furszy)
    afdb9d492c [RPC] Parse public spend on getserials rpc command. (furszy)
    88cdfc60ea [FUNCTIONAL TEST] old coinSpend transaction rejected. (furszy)
    3d0893ae81 [RPC] spendzerocoin command can now create old zc spends, only for regression tests (furszy)
    f46b80ed5e [FUNCTIONAL TEST][zOBSR] double spent serial validation. (furszy)
    fdfd999d10 [zOBSR[Unit Test] Possible redundant denomination validation. (furszy)
    507f7c8f5a [FUNCTIONAL TESTS] valid PublicCoinSpend transaction test. (furszy)
    262d5e7fce [zOBSR] mints coin control dialog min accumulation mature text removed + re mint change checkbox not visible anymore. (furszy)
    a8ce6717db [zOBSR] use new limit Zerocoin_MaxPublicSpendsPerTransaction for max num of inputs (random-zebra)
    e0decb1541 [zOBSR] prevent v1 zerocoins from being selected for PublicSpends (random-zebra)
    44398690d1 [zOBSR][Consensus] reject V1 serials spends. (furszy)
    cb4ffa16cb [zOBSR] remove enforcement from 'CreateZerocoinSpendTransaction' fixing the unit tests (random-zebra)
    657bb41293 [zOBSR][Cleanup] PublicSpend rebase onto IsZerocoin (random-zebra)
    3c74d6d2f1 [zOBSR] new protocol enforcement height added. Height not final, just randomly selected and tested on regtest. (furszy)
    f93001663b [zOBSR] rebase problems fixed. (Needs more testing) (furszy)
    e7dada8d62 [zOBSR] publicCoinSpend signature hash relevant data inclusion. (furszy)
    c8d519eb5d [zOBSR] zOBSR Maturity --> Minimum amount of coins accumulated no needed anymore. (furszy)
    0e8d0f90e4 [Wallet] public coin spend creation connected + first mem pool validation. (furszy)
    1db7c59847 [UNIT TEST] publicCoinSpend valid input creation and verification. (furszy)
    ca86660e7e [Zeroocoin] public coin spend script creation, validation and un/serialization. (furszy)

    Tree-SHA512: d333dbbf5dba407cf3766adcf42867e2af84951ca381df03c77c01b552ad6ed0721d1eea7ae312595c264196a409603823f36f06e97d377c61c2b7d983880245

commit 834cbeb1cc8af1c6b98104180f1736f4bd1c17a9
Author: random-zebra <random.zebra@protonmail.com>
Date:   Tue May 21 16:00:15 2019 +0200

    [RPC] enable mint only for regtest

commit dcc74f8815707346c9c5d42a061c56432760f043
Author: random-zebra <random.zebra@protonmail.com>
Date:   Wed May 15 01:28:02 2019 +0200

    [zOBSR][Consensus] fix 'Zerocoin_Block_Public_Spend_Enabled()' enforcement

commit 3555f430d2c250492d7362a77379a23c9a3b0116
Author: random-zebra <random.zebra@protonmail.com>
Date:   Thu May 2 11:18:29 2019 +0200

    [Wallet] Disable automint

commit 2708b6f3bdd8b28bdd20423fec2fc2df366ea413
Author: random-zebra <random.zebra@protonmail.com>
Date:   Tue Apr 30 11:54:20 2019 +0200

    [Consensus] Disable zerocoin minting in contextual check

commit 9f3fa2add468148c0791b75d99c8458a261fe3be
Author: random-zebra <random.zebra@protonmail.com>
Date:   Tue Apr 30 11:37:12 2019 +0200

    [RPC] Disable zerocoin minting

    disabling also remint of change of a zc spend

commit fda5fff1541c134a06994c8a823485253eb15fce
Author: random-zebra <random.zebra@protonmail.com>
Date:   Tue Apr 30 11:33:10 2019 +0200

    [GUI] Disable zerocoin minting

commit d6149cc12e883d0cf827da1d5ad76edd5629b01a
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Tue Jun 4 23:36:48 2019 +0200

    [Consensus] Testnet enforcement height.

commit 28afbd29814cd3fc92d9a1b4761919bcc72cd97f
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Tue May 21 15:27:22 2019 +0200

    [zOBSR] v1 serials modulus fix + isStandardTx fix for publicSpends.

    cleanup, publicCoinSpend object leftover removed + minor log added to CheckProofOfStake.

commit ddc3f15562c5df7e1627768cd573aa49b0a861d2
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Mon May 20 11:01:10 2019 +0200

    [Consensus] spork 15 activation + protocol version bump.

    [Consensus] spork 15 + min prev protocol version. (squash this later)

commit 216a3174affd4ba1ae7817af258d29ff722c7335
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Mon May 20 10:49:21 2019 +0200

    [zOBSR] testnet publicSpend enforcement height set.

    [zOBSR] v1 serials validation was not checked against the publicSpend height.

commit 0393227b6588c783f01edf1fc8bd8f128ab90ea2
Author: random-zebra <random.zebra@protonmail.com>
Date:   Sun May 19 23:14:04 2019 +0200

    [Tests] add test reorg for public spend

    [Unit Test] zc public spend test up-to-date with master.

commit 2f750e50116b403ac202f6683279b59a82dfdc33
Author: random-zebra <random.zebra@protonmail.com>
Date:   Sun May 19 23:13:30 2019 +0200

    [RPC] add 'createrawzerocoinpublicspend' method

commit b5e2526da8abc34f3d0a40913818c71bef817a26
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Fri May 17 01:37:25 2019 +0200

    [zOBSR] publicCoinSpend version field included in the serialization for any future change.

commit 46e453b8bc71645de706a64dbd196ebce5a7db80
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Thu May 16 20:24:11 2019 +0200

    [zOBSR] reject priv coin spends on tx mempool acceptance.

commit afdb9d492c7e666a82b85ebb22fb9416ef61aed2
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Thu May 16 19:08:59 2019 +0200

    [RPC] Parse public spend on getserials rpc command.

    [Cleanup] non used variable commented.

commit c84e0e83ba9ba556bd66ae50d6e4eb6a6b243bab
Author: warrows <warrows@gamer666.fr>
Date:   Mon May 20 16:47:23 2019 +0200

    [Code Style] Remove std namespace in test file

commit 3355c86ccedc7bf8b83eed2455c046d27cb56685
Author: Ethan Heilman <Ethan.R.Heilman@gmail.com>
Date:   Sat Dec 12 22:34:08 2015 -0500

    Increase test coverage for addrman and addrinfo

    Adds several unittests for CAddrMan and CAddrInfo.
    Increases the accuracy of addrman tests.
    Removes non-determinism in tests by overriding the random number generator.
    Extracts testing code from addrman class to test class.

commit d4da01588bda9a98ad21323663a9b8a78e3c59ee
Author: EthanHeilman <ethan.r.heilman@gmail.com>
Date:   Tue Sep 22 15:24:16 2015 -0400

    Creates unittests for addrman, makes addrman testable.

    Adds several unittests for addrman to verify it works as expected.
    Makes small modifications to addrman to allow deterministic and targeted tests.

commit 93bc03763be673bdac0edff86fffc0022a3e7a8b
Author: warrows <warrows@gamer666.fr>
Date:   Mon May 20 23:54:17 2019 +0200

    [Log] Handle errors during log message formatting

commit 9c0329c72b96af50a4bd8e971a31726346835d2d
Author: warrows <warrows@gamer666.fr>
Date:   Sun May 19 19:09:30 2019 +0200

    [zerocoin] Free memory from ToString()

    Simple fix for a minor memory leak

commit 88cdfc60ea88ac784718c11094e76c903b1ffe52
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 15 19:21:05 2019 +0200

    [FUNCTIONAL TEST] old coinSpend transaction rejected.

commit 3d0893ae81b134a8033d80d54133d9899731b48d
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 15 18:43:14 2019 +0200

    [RPC] spendzerocoin command can now create old zc spends, only for regression tests

commit f46b80ed5e86ce46e79367a755f11d143d7a1908
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 15 18:01:38 2019 +0200

    [FUNCTIONAL TEST][zOBSR] double spent serial validation.

commit fdfd999d10bfda638fcc45fc4768c8f40032db8a
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 15 17:40:51 2019 +0200

    [zOBSR[Unit Test] Possible redundant denomination validation.

commit 507f7c8f5a38155ebac9e2719474149c036f9dbe
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 15 17:24:10 2019 +0200

    [FUNCTIONAL TESTS] valid PublicCoinSpend transaction test.

commit 262d5e7fce41890943847c3ece65b0e77eb7ec1e
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 15 15:40:55 2019 +0200

    [zOBSR] mints coin control dialog min accumulation mature text removed + re mint change checkbox not visible anymore.

commit a8ce6717dba4202e7d5df1bf5182c3bd0225b2e4
Author: random-zebra <random.zebra@protonmail.com>
Date:   Wed May 15 06:38:29 2019 +0200

    [zOBSR] use new limit Zerocoin_MaxPublicSpendsPerTransaction for max num of inputs

commit e0decb154128a03b89ea363419770c704c607bf9
Author: random-zebra <random.zebra@protonmail.com>
Date:   Wed May 15 03:10:01 2019 +0200

    [zOBSR] prevent v1 zerocoins from being selected for PublicSpends

commit 44398690d1d4c3f63b9fefc88b9f7ae589f4c8a0
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 15 01:13:52 2019 +0200

    [zOBSR][Consensus] reject V1 serials spends.

commit cb4ffa16cbb53475e4cdc0e6d898911456a4ea5c
Author: random-zebra <random.zebra@protonmail.com>
Date:   Tue May 14 23:22:41 2019 +0200

    [zOBSR] remove enforcement from 'CreateZerocoinSpendTransaction' fixing the unit tests

commit 657bb41293adf08fa3cb0502fdeca06361420f87
Author: random-zebra <random.zebra@protonmail.com>
Date:   Tue May 14 23:22:13 2019 +0200

    [zOBSR][Cleanup] PublicSpend rebase onto IsZerocoin

commit 3c74d6d2f116d6a45bc665ba4af9bb827dad21b6
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Tue May 14 17:23:15 2019 +0200

    [zOBSR] new protocol enforcement height added. Height not final, just randomly selected and tested on regtest.

commit f93001663b999259dfbce2035e131caa7348850f
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Tue May 14 15:50:45 2019 +0200

    [zOBSR] rebase problems fixed. (Needs more testing)

commit e7dada8d621d51b400e8e3b7da339166747f2c27
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Mon May 13 21:45:21 2019 +0200

    [zOBSR] publicCoinSpend signature hash relevant data inclusion.

commit c8d519eb5d72f4ccdc53e0ad30ae56e0840eaf48
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Mon May 13 20:52:30 2019 +0200

    [zOBSR] zOBSR Maturity --> Minimum amount of coins accumulated no needed anymore.

commit 0e8d0f90e49566a82aedcb3da9db4a903c5c4a25
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 1 11:47:18 2019 +0200

    [Wallet] public coin spend creation connected + first mem pool validation.

    [Zerocoin] public coin spend improvements.

    [Zerocoin] publicCoinSpend validations connected to the accept txes flow.

    [Zerocoin] public spends not checked as regular inputs.

    [Zerocoin] publicCoinSpend validation as regular spends.

    non good solution for the coinSpend pointer inheritance issue but at least working

    [Zerocoin] ParseZerocoinPublicSpend moved into zobsrmodule file.

    cleanup unused field.

commit 1db7c59847d90f9a341bbbb66ead6ab4a9b2bbd0
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 1 11:44:58 2019 +0200

    [UNIT TEST] publicCoinSpend valid input creation and verification.

    [UNIT TEST] publicCoinSpend creation + validation completed.

commit ca86660e7ec2f9e66af7830517925e4dd539047c
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Wed May 1 11:44:26 2019 +0200

    [Zeroocoin] public coin spend script creation, validation and un/serialization.

commit 3d496cc74665a4e6ba8f3632d04842adf07ef657
Merge: 5f7559bc7 4e8f46a37
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue May 21 14:57:45 2019 -0700

    Merge #898: [Qt] Fixup duplicate label names

    4e8f46a376 [Qt] Fixup duplicate label names (Fuzzbawls)

    Tree-SHA512: 6cee761fae0d6d387523d286ddbc8fa6f61ef702ec406aa9108dedaccb1b8a0f343b7c01778f9d86be7e76e437d390e468c2593f2514c47350415da696744609

commit 5f7559bc7b9e9b6193fcbe2b12054a31708d1477
Merge: a99c2dd3b a4205f21b
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Sat May 18 09:28:15 2019 +0200

    Merge #900: [UI] Fix improperly parented walletView and segmentation fault on QT 5.10

    a4205f2 [UI] Fix improperly parented walletView. (Julian Meyer)

    Tree-SHA512: ba523274a9e336a884f097dcff5a0e47e294517254350287dd0c2572c63010e63a33734707bcdca753f454f85c4bbe052817172b719e7ac66bcdbdef71d151a2

commit a99c2dd3bb2026279d279d9ef72df3bb63fc0a13
Merge: fc6b5a191 253c63eda
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Fri May 17 15:15:12 2019 +0200

    Merge #875:  [Zerocoin] GMP BigNum: Fix limits for random number generators

    253c63e [Zerocoin] include 0 in randBignum() range (random-zebra)
    daeb752 [Test] Add tests for bignum random generators (random-zebra)
    5627807 [Zerocoin] Fix limits for random number generators in GMP bignum implementation (random-zebra)

    Tree-SHA512: c88ab99912683736a886065ecfbfd52aeb419357ee0e7eb6e3c1a09c22c3c316884bf8606f44d13e0f0fcb4de4137fb52339b556eb6e1a134b7aafff36c1d414

commit fc6b5a191dda9dc71ca841cbbdf74868bd4d76fb
Merge: a373fee90 c5054e4f7
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Fri May 17 15:09:20 2019 +0200

    Merge #806: [Test] Create new per-test fixtures

    c5054e4 tests: add a BasicTestingSetup and apply to all tests (Wladimir J. van der Laan)
    962a1bc Reinitialize state in between individual unit tests. (Pieter Wuille)

    Tree-SHA512: 47bab117a394de5f7dc9079f940969df6e3369f96128c1009c55005d30adb1dbc048900f04649caae2976518cad1065419f1d91baebffe0c3f3c2d9897450c08

commit 253c63edad3bc75107ab5cf1c5e187569327e082
Author: random-zebra <random.zebra@protonmail.com>
Date:   Fri May 17 12:46:22 2019 +0200

    [Zerocoin] include 0 in randBignum() range

commit c5054e4f729b7c82c8768b688e66909d266b017f
Author: Wladimir J. van der Laan <laanwj@gmail.com>
Date:   Thu Mar 12 09:34:42 2015 +0100

    tests: add a BasicTestingSetup and apply to all tests

    Make sure that chainparams and logging is properly initialized. Doing
    this for every test may be overkill, but this initialization is so
    simple that that does not matter.

    This should fix the travis issues.

commit 962a1bca0aea4ab37032d1ef13323f85280e62a9
Author: Pieter Wuille <pieter.wuille@gmail.com>
Date:   Tue Mar 3 07:49:12 2015 -0800

    Reinitialize state in between individual unit tests.

    This changes the TestingSetup fixture to be per-unit-test rather than global.
    Most tests don't need it, so it's only invoked in a few.

commit f3308f404d18f9ff42c83e496dd8081de13c3c86
Author: CaveSpectre11 <36988814+CaveSpectre11@users.noreply.github.com>
Date:   Thu May 16 08:41:13 2019 -0400

    Fix typos and oversights in listunspent

commit a373fee908d0128c545dc4fcc96089feb7a8c8b5
Merge: 81038da4f 2fdc74b28
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu May 16 01:41:17 2019 -0700

    Merge #810: [Depends] Fix archs (fixes s390x and ppc64el builds on snap)

    2fdc74b280 update qt.mk with arch fix (see previous commit) (cevap)
    b22610c6f1 add QT patch for s390x, mips, powerpc and sparc (cevap)
    1a756e0066 Fix qt for m68k and alpha (cevap)
    f52a72ef0f Fix openssl for m68k and alpha (cevap)
    e12b4493fb Fix boost for m68k and alpha (cevap)
    32f2684b9e Fix openssl for sparc64 (cevap)
    5de083f1d6 Fix qt for sparc64 (cevap)
    f1e537e05d Fix boost for sparc64 (cevap)
    188d0ea7a4 Fix qt for powerpc/ppc64el (cevap)
    c590d072ab Fix openssl for powerpc/ppc64el (cevap)
    def4374308 Fix qt for s390x (cevap)
    ed61951516 Fix openssl for s390x (cevap)
    d1489c8985 Fix boost for s390x (cevap)

    Tree-SHA512: 90add202dde7c3252bdc92974936fa50daf66a34e29cfbbee3222771ea89d061466e39300d3449b5e8b43fd1d8b8828b694ad83624c959c7cc331463a7aef7f8

commit a4205f21b52876a642e9c68d7eac84430483202e
Author: Julian Meyer <julianmeyer2000@gmail.com>
Date:   Wed May 15 12:10:23 2019 -0700

    [UI] Fix improperly parented walletView.

    Fixes #789.

commit fe67706fd222168e4bb6a387566a48dbd667638c
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Feb 28 12:23:36 2019 -0800

    Remove more useless obfuscation code

commit eed0a1d34ebc6b4fd43619d9296e2cfe1dbf5d43
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Feb 28 01:38:15 2019 -0800

    Remove more useless obfuscation code

commit 3bb5c768bf8d40716843216155353fe18d4d451e
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Wed Feb 27 20:34:03 2019 -0800

    Remove unused functions in wallet.cpp

    these functions were used back when obfuscation existed and are no
    longer called anywhere in the source tree.

commit 166b2d31c8f438d17937335706b51df35856d98d
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Wed Feb 27 15:14:00 2019 -0800

    Remove nAnonymizeObsrAmount and nLiquidityProvider

    These two variables have been meaningless since zOBSR's introduction...

    Nuke them from orbit!

commit 886d806f58e692cb125a2b247b096a9b15cf1987
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Wed Feb 27 15:02:51 2019 -0800

    Remove unused code in DoAutomaticDenominating

    This function statically returns `false`, no need to have anything else
    here.

commit 742a7b187ca374e70dd6f6aaffc83b68badcfb7f
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Wed Feb 27 14:56:40 2019 -0800

    [Qt] Remove unused obfuscationconfig

    obfuscationconfig(.h/.cpp) are unused and not needed at all anymore.

commit 81038da4f8eb73c1a9a29a84b6cc62a21c8151f4
Merge: 0c071c3fd 4f6cd20b0
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue May 14 20:56:00 2019 -0700

    Merge #830: [Refactor] Remove BOOST_FOREACH

    4f6cd20b0d Cleanup clang's range loop analysis warnings (Fuzzbawls)
    e1c549e8a7 [Refactor] Remove useless BOOST includes and readd where needed (warrows)
    4d44c9781a [Refactoring] Replace BOOST FOREACH with for : (warrows)

    Tree-SHA512: a61e8968a28c86f33f753b693559a58a632e01b6408b7f0653772206fa9f20fb2df83e432ed74e33d1bed29a302ff4b98c30bbe53111faf1f50ed3acf8888190

commit a789d21635d02eefa5a5485b8c812fc249ce3a63
Author: random-zebra <random.zebra@protonmail.com>
Date:   Wed May 15 05:29:22 2019 +0200

    [zOBSR] Disable zerocoins inclusion in 'SelectStakeCoins'

commit 4f6cd20b0dcafd30e3b5bc9e61278b83dd411102
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue May 14 00:47:13 2019 -0700

    Cleanup clang's range loop analysis warnings

commit e1c549e8a798d0c818b49bb6089337ba61aaf3ed
Author: warrows <warrows@gamer666.fr>
Date:   Wed Mar 6 20:45:45 2019 +0100

    [Refactor] Remove useless BOOST includes and readd where needed

commit 4d44c9781a95bb80e81f48e551e791a1eeb8cb66
Author: warrows <warrows@gamer666.fr>
Date:   Wed Mar 6 20:05:20 2019 +0100

    [Refactoring] Replace BOOST FOREACH with for :

    Done using following script:

    -BEGIN VERIFY SCRIPT-
    sed -i 's/BOOST_FOREACH *(\(.*\),/for (\1 :/' ./src/*.h ./src/*.cpp
    ./src/*/*.h ./src/*/*.cpp ./src/*/*/*.h ./src/*/*/*.cpp ;
    -END VERIFY SCRIPT-

commit 4e8f46a376335ea271b5ac480644a013da0d4b47
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue May 14 16:24:29 2019 -0700

    [Qt] Fixup duplicate label names

    resolves compiler warnings about a label's name having been already used
    .

commit 0c071c3fd0d6d47cb9d03bc0abae7a98a6ccade4
Merge: b2fcefee9 f14569faa
Author: random-zebra <random.zebra@protonmail.com>
Date:   Wed May 15 00:23:19 2019 +0200

    Merge #888: [Zerocoin] remove CTransaction::IsZerocoinSpend/IsZerocoinMint

    f14569faa [Zerocoin] remove CTransaction::IsZerocoinSpend and CTransaction::IsZerocoinMint (random-zebra)

    Tree-SHA512: 0e7ab5ee37215454af1b09d25454bedaf8f92baf0ca598d5c639bb1b6f642ca93d21a8d2707af3c4cece06d7b6cd98a019e8b4c16712d774f23b5b41ee059a57

commit b2fcefee93cb0f3a088528018b59a7fdbf73c903
Merge: fddac44ea d7afebb47
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Tue May 14 22:15:24 2019 +0200

    Merge #896: [UI] Simplify Qt margins.

    d7afebb [UI] Simplify Qt margins. No functional change. (warrows)

    Tree-SHA512: c29c1d416d81ccda15d90c26fcadc9b67dcd27b8b7bdbd55c951e0ddd6c809b0cc7cc0dfc3590dc45fa2fb4f0e5218d9da2a424cb3a953d9b542de34ab7b693c

commit c424f0f244b92b800a354b06e9d24935d539e99b
Author: Alko89 <alefer89@gmail.com>
Date:   Tue May 14 16:47:27 2019 +0200

    Fix margins

commit 2d052155ffcb7325546a118738f9cc3aa3a15cea
Author: Alko89 <alefer89@gmail.com>
Date:   Tue May 14 11:48:14 2019 +0200

    Hide zobsr related options.

commit d7afebb4795163e4904135c7f3b69379a9a57010
Author: warrows <warrows@gamer666.fr>
Date:   Tue May 14 15:39:31 2019 +0200

    [UI] Simplify Qt margins. No functional change.

commit fddac44eab2774bc19c50154e5eb1b290d1ad7fe
Merge: ec7993eac b5a525767
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon May 13 23:56:30 2019 -0700

    Merge #890: [Refactor] Remove unused setStakeSeen variable

    b5a525767a [Refactor] Remove unused setStakeSeen variable (warrows)

    Tree-SHA512: c5244b3cf269d3b6171a5b241265b98bffcfbf580cecbf9cc2741ea2b3374deb558459a8764f1931080331b11456a8d129dbcc3b6e59955f15bc184333e23ca8

commit b5a525767ae62a39f0a691a9345439b457f661b8
Author: warrows <warrows@gamer666.fr>
Date:   Wed May 8 17:58:57 2019 +0200

    [Refactor] Remove unused setStakeSeen variable

commit f14569faab4cee1130b68a29932dcde7b35899b2
Author: random-zebra <random.zebra@protonmail.com>
Date:   Wed May 8 16:08:20 2019 +0200

    [Zerocoin] remove CTransaction::IsZerocoinSpend and CTransaction::IsZerocoinMint

    - uniform IsZerocoinSpend/IsZerocoinMint CScript functions
    - refactor CTxIn::IsZerocoinSpend / CTxOut::IsZerocoinMint encapsulating CScript methods
    - add CTransaction methods: HasZerocoinMintOutputs / HasZerocoinSpendInputs
    - refactor CTransaction::ContainsZerocoins from previous 'HasZerocoin' functions
    - fix implementation of CTransaction::GetZerocoinMinted (from CTxOut)
    - remove extra checks for empty scripts (as those are done in CScript functions)

commit ec7993eac8d50fa54133807165f1ddb0597ef635
Merge: 013676df0 a0af2a752
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue May 7 23:39:07 2019 -0700

    Merge #887: [Net] Fix incorrect last checkpoint timestamp

    a0af2a7525 Fix incorrect last checkpoint timestamp (Fuzzbawls)

    Tree-SHA512: a34786fa8dbe777ed0d2d1a880c1d9d603c6771aba7619b912100f5a732bb5b1f98459afb26be7aab8c3ade60ff4501accb69e65f74186b0ae41057d03c68866

commit a0af2a75257a86f585580152e73de24b331c9264
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue May 7 23:29:39 2019 -0700

    Fix incorrect last checkpoint timestamp

commit 013676df00d3ebc7886ac655bd234bd45637021f
Merge: a890dc97c af28b90a4
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue May 7 16:55:57 2019 -0700

    Merge #884: [Net] Add additional checkpoints

    af28b90a4a [Net] Add additional checkpoints (Fuzzbawls)

    Tree-SHA512: c19201cd9999fb295c81f375182a685615ec5d117d74b175e4573f4cb5f32fc1c56c9871c3898cfd09c423fbdb6eddb1a4a1e95ec66894ec80765a4849fd83bf

commit af28b90a4ab119102ed995a20614025a55256526
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Tue May 7 15:58:05 2019 -0700

    [Net] Add additional checkpoints

    This adds two additional checkpoints for known split points

commit a890dc97cdbc7392273be204d7a09435e720eb77
Merge: 5f0d72659 754764be0
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Tue May 7 22:25:22 2019 +0200

    Merge #880: [NET] Valid forked blocks rejected fix.

    754764b [Net] AcceptBlock, first prev block loaded from disk. (furszy)
    2c76194 [Net] Valid blocks from forks badly rejected due an invalid view of the available utxo set for forked chains + split height going one block further than what should be. (furszy)

    Tree-SHA512: 3ab04609b58686d38bd0238f7059f67d9bca326e9758aff57a0b0e02c79e1be4649eaaeebd0b35b020c8aa249805a56e57531dfae178fb532ceac67803730455

commit 754764be02af58b0b2059f580b40bf5f6380fa4d
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Tue May 7 11:19:54 2019 +0200

    [Net] AcceptBlock, first prev block loaded from disk.

commit 2c76194c757ddd6a9081ee555b191c6dbb326c50
Author: furszy <matiasfurszyfer@protonmail.com>
Date:   Sat May 4 11:10:22 2019 +0200

    [Net] Valid blocks from forks badly rejected due an invalid view of the 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.

commit 5f0d72659c0dafc049e4b70678d14c3a2c475025
Merge: 54c8832d8 997116917
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Thu May 2 22:57:05 2019 +0200

    Merge #879: [Refactor] Rename ui_interface.h file

    9971169 [Refactor] Rename ui_interface.h file (Fuzzbawls)

    Tree-SHA512: db41888a01d588c19888330f0333ee0ab34f5aabe2a7f139772ac540a02532bc75874667917cc163cde592124d5368704c169cd51ffdec4f494a033ab28e5eb9

commit 997116917c4278221c4e2693dcb570148d2f8340
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Apr 29 01:14:36 2019 -0700

    [Refactor] Rename ui_interface.h file

    This file's naming convention is not in line with what is used
    everywhere else. Additionally, the `ui_` prefix is typically reserved
    for QMake's UIC pre-processor to generate compiler-compatible code from
    Qt's `.ui` files.

    Renaming this file opens the door to adding CMake build support
    **without** needing to hackishly work around this one file's name, and
    it becomes more in-line with the naming conventions used for every other
     source file.

commit 54c8832d80367f7862e4d9adb6ca73f7eb16ceda
Merge: 7e52f58b8 b079abfeb
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Mon Apr 29 23:07:26 2019 +0200

    Merge #877: [RPC] Remove deprecated masternode/budget RPC commands

    b079abf [RPC] Remove deprecated masternode/budget RPC commands (Fuzzbawls)

    Tree-SHA512: da88e8746e09ab8617e6210e17d7305f95c4bd596d6d9502954ebf41dc9bba5675d6300b9166cb4b7ae697b3c997975b4750797c8227fab5e2f684867ab94711

commit daeb7520c195107f4253b0ef2672b1faa142fdaa
Author: random-zebra <random.zebra@protonmail.com>
Date:   Fri Apr 26 23:15:16 2019 +0200

    [Test] Add tests for bignum random generators

commit 56278072678ed6f15bdb4e6fe41d688c4010a029
Author: random-zebra <random.zebra@protonmail.com>
Date:   Fri Apr 26 03:39:48 2019 +0200

    [Zerocoin] Fix limits for random number generators in GMP bignum implementation

commit 7e52f58b82bfbdc4c76dd76b9451e57248026f31
Merge: 23f17ce02 4e4975b69
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Mon Apr 29 02:04:14 2019 -0700

    Merge #744: [Refactor] Refactor bignum header file into several files

    4e4975b699 [Refactor] Refactor bignum header file into several files (warrows)

    Tree-SHA512: 52f0ad549bfd03731ac388ad8f07ae59d960549f49ac1f73c228ce14b1ef227f34408efce6198997754a230f8fae879939cbcfb75ffc16045a774849129242b4

commit 23f17ce021938dc975cc73c09edfb8a8189a4cf2
Merge: cfa309252 6e4849052
Author: Mrs-X <Mrs-X@users.noreply.github.com>
Date:   Fri Apr 26 23:22:36 2019 +0200

    Merge #874: [Qt] Add new budget colors

    6e48490 [Budget] Guard against chainactive tip clash (warrows)
    3601d00 [Qt] Print the actual number of MN used for voting (warrows)
    89ce7ff [Qt] Add new colors for proposals (warrows)
    bda0322 [Refactoring] Add IsPassing function to CBudgetProposal (warrows)
    3ec04f7 [Refactor] Refactor CBudgetProposal::IsEstablished() (warrows)

    Tree-SHA512: 4508a378d5404a47d7e1a3bba1d163eb427a3980d6d1f73687c55ff7b8eaf7f9e85b704f495597e34dc393603cae843796ccea7ae4056a476caf94eaad9dbfe1

commit 6e484905295d59ef566ef35b371f4797796daf24
Author: warrows <warrows@gamer666.fr>
Date:   Tue Apr 23 13:23:01 2019 +0200

    [Budget] Guard against chainactive tip clash

commit 3601d0020c30487ae3c940126a685343318a3eef
Author: warrows <warrows@gamer666.fr>
Date:   Tue Apr 23 12:32:10 2019 +0200

    [Qt] Print the actual number of MN used for voting

commit 89ce7fff847d0fbfbbcd2bb153627ee3e30593c5
Author: warrows <warrows@gamer666.fr>
Date:   Tue Apr 23 11:37:02 2019 +0200

    [Qt] Add new colors for proposals

    Show passing (enough votes and whatnot) but unfunded (lack of funds in the budget)
    proposals in yellow and unestablished proposals (less than 24 hours
    since submission) in blue

commit bda03227cc1ca5e83da3d7d9e62d5d49fcc0f1d2
Author: warrows <warrows@gamer666.fr>
Date:   Tue Apr 23 12:53:42 2019 +0200

    [Refactoring] Add IsPassing function to CBudgetProposal

    Makes the code easier to read and allows for reusing of this functions
    in other places.

commit b079abfebd179fca33cc91728f4168e3b9b879c2
Author: Fuzzbawls <fuzzbawls@gmail.com>
Date:   Thu Apr 25 22:36:48 2019 -0700

    [RPC] Remove deprecated masternode/budget RPC commands

    The old `masternode` and `mnbudget` commands have been deprecated for
    quite some time now, and have had a note in their help descriptions
    stating as much. So, time to finally remove them for good.

commit 3ec04f7069a0127c88dc29ce8d388ae16ba160f0
Author: warrows <warrows@gamer666.fr>
Date:   Tue Apr 23 12:40:28 2019 +0200

    [Refactor] Refactor CBudgetProposal::IsEstablished()

    -Move IsEstablished function to cpp file
    -Use GetAdjustedTime() instead of GetTime() to avoid lack of consensus
    -Remove magic numbers and…
  • Loading branch information
observerdev committed Jul 2, 2019
1 parent ed51e74 commit b8005b4ef2a790bb13f1f8de8d554c28606ce0ca
Showing with 2,282 additions and 4,083 deletions.
  1. +1 −0 .python-version
  2. +97 −37 .travis.yml
  3. +7 −1 .travis/lint_04_install.sh
  4. +2 −0 .travis/test_03_before_install.sh
  5. +3 −1 .travis/test_04_install.sh
  6. +4 −21 .travis/{test_06_script.sh → test_06_script_a.sh}
  7. +21 −0 .travis/test_06_script_b.sh
  8. +73 −24 CONTRIBUTING.md
  9. BIN share/pixmaps/{bitcoin-bc.ico → obsr-bc.ico}
  10. BIN share/pixmaps/{bitcoin.ico → obsr.ico}
  11. BIN share/pixmaps/{bitcoin128.png → obsr128.png}
  12. 0 share/pixmaps/{bitcoin128.xpm → obsr128.xpm}
  13. BIN share/pixmaps/{bitcoin16.png → obsr16.png}
  14. 0 share/pixmaps/{bitcoin16.xpm → obsr16.xpm}
  15. BIN share/pixmaps/{bitcoin256.png → obsr256.png}
  16. 0 share/pixmaps/{bitcoin256.xpm → obsr256.xpm}
  17. BIN share/pixmaps/{bitcoin32.png → obsr32.png}
  18. 0 share/pixmaps/{bitcoin32.xpm → obsr32.xpm}
  19. BIN share/pixmaps/{bitcoin64.png → obsr64.png}
  20. 0 share/pixmaps/{bitcoin64.xpm → obsr64.xpm}
  21. +1 −1 share/setup.nsi.in
  22. +7 −7 src/activemasternode.cpp
  23. +2 −2 src/activemasternode.h
  24. +19 −12 src/addrman.cpp
  25. +17 −13 src/addrman.h
  26. +4 −5 src/alert.cpp
  27. +1 −1 src/alert.h
  28. +1 −1 src/amount.cpp
  29. +1 −1 src/amount.h
  30. +1 −1 src/base58.cpp
  31. +1 −1 src/base58.h
  32. +1 −1 src/bip38.cpp
  33. +2 −2 src/blocksignature.cpp
  34. +1 −1 src/blocksignature.h
  35. +3 −4 src/bloom.cpp
  36. +1 −1 src/bloom.h
  37. +1 −1 src/chain.cpp
  38. +7 −8 src/chain.h
  39. +16 −2 src/chainparams.cpp
  40. +11 −1 src/chainparams.h
  41. +1 −1 src/chainparamsbase.cpp
  42. +1 −1 src/chainparamsbase.h
  43. +1 −1 src/checkpoints.h
  44. +2 −3 src/checkqueue.h
  45. +1 −1 src/clientversion.cpp
  46. +3 −3 src/coins.cpp
  47. +4 −5 src/coins.h
  48. +1 −1 src/compat/byteswap.h
  49. +1 −1 src/compat/endian.h
  50. +1 −1 src/compat/glibc_compat.cpp
  51. +1 −1 src/compat/glibc_sanity.cpp
  52. +1 −1 src/compressor.cpp
  53. +1 −1 src/compressor.h
  54. +1 −1 src/core_io.h
  55. +2 −3 src/core_write.cpp
  56. +3 −4 src/crypter.cpp
  57. +1 −1 src/hash.cpp
  58. +2 −2 src/httprpc.cpp
  59. +2 −2 src/httpserver.cpp
  60. +20 −38 src/init.cpp
  61. +1 −1 src/init.h
  62. +49 −13 src/kernel.cpp
  63. +5 −2 src/kernel.h
  64. +1 −2 src/keystore.cpp
  65. +1 −2 src/lightzobsrthread.h
  66. +442 −270 src/main.cpp
  67. +12 −5 src/main.h
  68. +70 −49 src/masternode-budget.cpp
  69. +3 −12 src/masternode-budget.h
  70. +8 −7 src/masternode-payments.cpp
  71. +4 −4 src/masternode-payments.h
  72. +3 −3 src/masternode-sync.cpp
  73. +2 −2 src/masternodeconfig.cpp
  74. +1 −1 src/masternodeconfig.h
  75. +24 −24 src/masternodeman.cpp
  76. +1 −1 src/merkleblock.h
  77. +31 −15 src/miner.cpp
  78. +1 −1 src/miner.h
  79. +37 −38 src/net.cpp
  80. +4 −5 src/net.h
  81. +1 −1 src/netbase.cpp
  82. +1 −1 src/netbase.h
  83. +2 −2 src/noui.cpp
  84. +111 −1,733 src/obfuscation.cpp
  85. +4 −145 src/obfuscation.h
  86. +3 −3 src/obsr-tx.cpp
  87. +2 −2 src/obsrd.cpp
  88. +1 −1 src/pow.cpp
  89. +1 −1 src/pow.h
  90. +3 −3 src/primitives/block.cpp
  91. +1 −1 src/primitives/block.h
  92. +60 −15 src/primitives/transaction.cpp
  93. +10 −18 src/primitives/transaction.h
  94. +1 −1 src/protocol.h
  95. +4 −4 src/rest.cpp
  96. +1 −1 src/reverse_iterate.h
  97. +1 −1 src/reverselock.h
  98. +288 −112 src/rpc/blockchain.cpp
  99. +17 −119 src/rpc/budget.cpp
  100. +5 −6 src/rpc/client.cpp
  101. +1 −1 src/rpc/client.h
  102. +10 −151 src/rpc/masternode.cpp
  103. +6 −5 src/rpc/mining.cpp
  104. +4 −4 src/rpc/misc.cpp
  105. +13 −14 src/rpc/net.cpp
  106. +1 −1 src/rpc/protocol.cpp
  107. +1 −1 src/rpc/protocol.h
  108. +79 −13 src/rpc/rawtransaction.cpp
  109. +7 −8 src/rpc/server.cpp
  110. +6 −5 src/rpc/server.h
  111. +1 −1 src/scheduler.cpp
  112. +1 −1 src/scheduler.h
  113. +5 −4 src/script/interpreter.cpp
  114. +13 −7 src/script/script.cpp
  115. +4 −1 src/script/script.h
  116. +5 −6 src/script/sign.cpp
  117. +1 −1 src/script/sign.h
  118. +4 −5 src/script/standard.cpp
  119. +1 −1 src/script/standard.h
  120. +1 −1 src/serialize.h
  121. +2 −2 src/stakeinput.cpp
  122. +1 −1 src/streams.h
  123. +12 −11 src/swifttx.cpp
  124. +4 −4 src/ui_interface.h
  125. +193 −880 src/{ → wallet}/wallet.cpp
  126. +21 −41 src/{ → wallet}/wallet.h
  127. +2 −3 src/{ → wallet}/wallet_ismine.cpp
  128. +18 −19 src/{ → wallet}/walletdb.cpp
  129. +2 −2 src/{ → wallet}/walletdb.h
  130. +1 −1 src/wallet_ismine.h
  131. +12 −6 src/zobsr/accumulators.cpp
  132. +1 −2 src/zobsr/accumulators.h
  133. +5 −0 src/zobsr/witness.cpp
  134. +5 −0 src/zobsr/witness.h
  135. +5 −2 src/zobsr/zerocoin.h
  136. +129 −0 src/zobsr/zobsrmodule.cpp
  137. +92 −0 src/zobsr/zobsrmodule.h
  138. +5 −4 src/zobsr/zobsrtracker.cpp
  139. +2 −3 src/zobsr/zobsrtracker.h
  140. +4 −5 src/zobsr/zobsrwallet.cpp
  141. +29 −17 src/zobsrchain.cpp
@@ -0,0 +1 @@
3.5.6
@@ -1,13 +1,39 @@
sudo: required
dist: trusty
# The test build matrix (stage: test) is constructed to test a wide range of
# configurations, rather than a single pass/fail. This helps to catch build
# failures and logic errors that present on platforms other than the ones the
# author has tested.
#
# Some builders use the dependency-generator in `./depends`, rather than using
# apt-get to install build dependencies. This guarantees that the tester is
# using the same versions as Gitian, so the build results are nearly identical
# to what would be found in a final release.
#
# In order to avoid rebuilding all dependencies for each build, the binaries
# are cached and re-used when possible. Changes in the dependency-generator
# will trigger cache-invalidation and rebuilds as necessary.
#
# These caches can be manually removed if necessary. This is one of the very
# few manual operations that is possible with Travis, and it can be done by a
# OBSR GitHub member via the Travis web interface [0].
#
# Travis CI uploads the cache after the script phase of the build [1].
# However, the build is terminated without saving the chache if it takes over
# 50 minutes [2]. Thus, if we spent too much time in early build stages, fail
# with an error and save the cache.
#
# [0] https://travis-ci.org/obsr-project/obsr/caches
# [1] https://docs.travis-ci.com/user/caching/#build-phases
# [2] https://docs.travis-ci.com/user/customizing-the-build#build-timeouts

dist: xenial
os: linux
language: minimal
cache:
ccache: true
directories:
- depends/built
- depends/sdk-sources
- $HOME/.ccache
- depends/built
- depends/sdk-sources
- $HOME/.ccache
stages:
- lint
- test
@@ -27,123 +53,157 @@ env:
- SDK_URL=https://bitcoincore.org/depends-sources/sdks
- WINEDEBUG=fixme-all
- DOCKER_PACKAGES="build-essential libtool autotools-dev automake pkg-config bsdmainutils curl git ca-certificates ccache"

- CACHE_ERR_MSG="Error! Initial build successful, but not enough time remains to run later build stages and tests. Please manually re-run this job by using the travis restart button or asking a bitcoin maintainer to restart. The next run should not time out because the build cache has been saved."
before_install:
- set -o errexit; source .travis/test_03_before_install.sh
install:
- set -o errexit; source .travis/test_04_install.sh
before_script:
- set -o errexit; source .travis/test_05_before_script.sh
script:
- set -o errexit; source .travis/test_06_script.sh
- export CONTINUE=1
- if [ $SECONDS -gt 1200 ]; then export CONTINUE=0; fi # Likely the depends build took very long
- if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_a.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
- if [ $SECONDS -gt 2000 ]; then export CONTINUE=0; fi # Likely the build took very long; The tests take about 1000s, so we should abort if we have less than 50*60-1000=2000s left
- if [ $CONTINUE = "1" ]; then set -o errexit; source .travis/test_06_script_b.sh; else set +o errexit; echo "$CACHE_ERR_MSG"; false; fi
after_script:
- echo $TRAVIS_COMMIT_RANGE
- echo $TRAVIS_COMMIT_LOG

- echo $TRAVIS_COMMIT_RANGE
- echo $TRAVIS_COMMIT_LOG
jobs:
include:
# lint stage

- stage: lint
name: 'lint'
env:
sudo: false
cache: false
language: python
python: '3.6'
python: '3.5' # Oldest supported version according to doc/dependencies.md
install:
- set -o errexit; source .travis/lint_04_install.sh
before_script:
- set -o errexit; source .travis/lint_05_before_script.sh
script:
- set -o errexit; source .travis/lint_06_script.sh
# ARM

- stage: test
name: 'ARM 32-bit [GOAL: install] [no unit or functional tests]'
env: >-
HOST=arm-linux-gnueabihf
PACKAGES="python3 g++-arm-linux-gnueabihf"
DEP_OPTS="NO_QT=1"
RUN_UNIT_TESTS=false
RUN_FUNCTIONAL_TESTS=false
GOAL="install"
# -Wno-psabi is to disable ABI warnings: "note: parameter passing for argument of type ... changed in GCC 7.1"
# This could be removed once the ABI change warning does not show up by default
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports CXXFLAGS=-Wno-psabi"
# AArch64
- stage: test
name: 'ARM 64-bit [GOAL:install] [no unit or functional tests]'
env: >-
HOST=aarch64-linux-gnu
PACKAGES="python3 g++-aarch64-linux-gnu"
DEP_OPTS="NO_QT=1"
RUN_UNIT_TESTS=false
RUN_FUNCTIONAL_TESTS=false
GOAL="install"
BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
# Win32
- stage: test
name: 'Win32 [GOAL: deploy] [no functional tests]'
env: >-
HOST=i686-w64-mingw32
DPKG_ADD_ARCH="i386"
DEP_OPTS="NO_QT=1"
PACKAGES="python3 nsis g++-mingw-w64-i686 wine-binfmt wine32"
GOAL="install"
RUN_FUNCTIONAL_TESTS=false
GOAL="deploy"
BITCOIN_CONFIG="--enable-reduce-exports"
# Win64
- stage: test
name: 'Win64 [GOAL: deploy] [no functional tests]'
env: >-
HOST=x86_64-w64-mingw32
DEP_OPTS="NO_QT=1"
PACKAGES="python3 nsis g++-mingw-w64-x86-64 wine-binfmt wine64"
GOAL="install"
RUN_FUNCTIONAL_TESTS=false
GOAL="deploy"
BITCOIN_CONFIG="--enable-reduce-exports"
# 32-bit + dash
- stage: test
name: '32-bit + dash [GOAL: install] [no gui]'
env: >-
HOST=i686-pc-linux-gnu
PACKAGES="g++-multilib python3-zmq"
DEP_OPTS="NO_QT=1"
GOAL="install"
BITCOIN_CONFIG="--enable-zmq --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports LDFLAGS=-static-libstdc++"
CONFIG_SHELL="/bin/dash"
# x86_64 Linux (uses qt5 dev package instead of depends Qt to speed up build and avoid timeout)
- stage: test
name: 'x86_64 Linux [GOAL: install] [bionic] [uses qt5 dev package instead of depends Qt to speed up build and avoid timeout]'
env: >-
HOST=x86_64-unknown-linux-gnu
PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools protobuf-compiler libdbus-1-dev libharfbuzz-dev libprotobuf-dev"
DEP_OPTS="NO_QT=1 NO_UPNP=1 DEBUG=1 ALLOW_HOST_PACKAGES=1"
RUN_FUNCTIONAL_TESTS=true
#TEST_RUNNER_EXTRA="--coverage --extended" # Run extended tests so that coverage does not fail, but exclude the very slow dbcrash
GOAL="install"
BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports CPPFLAGS=-DDEBUG_LOCKORDER"
# x86_64 Linux (no depends, only system libs)
BITCOIN_CONFIG="--enable-zmq --with-gui=qt5 --enable-glibc-back-compat --enable-reduce-exports"
- stage: test
name: 'x86_64 Linux [GOAL: install] [trusty] [no functional tests, no depends, only system libs]'
env: >-
HOST=x86_64-unknown-linux-gnu
DOCKER_NAME_TAG=ubuntu:14.04
PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libicu-dev libpng-dev libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.1++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev libgmp-dev"
NO_DEPENDS=1
RUN_FUNCTIONAL_TESTS=false
GOAL="install"
BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=no"
- stage: test
name: 'x86_64 Linux [GOAL: install] [xenial] [no depends, only system libs]'
env: >-
HOST=x86_64-unknown-linux-gnu
DOCKER_NAME_TAG=ubuntu:16.04
PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libssl-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev libgmp-dev"
NO_DEPENDS=1
GOAL="install"
BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --disable-hardening --disable-asm"
- stage: test
name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs]'
env: >-
HOST=x86_64-unknown-linux-gnu
PACKAGES="python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev libgmp-dev"
NO_DEPENDS=1
GOAL="install"
BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER"
# x86_64 Linux (sanitizers)
BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER"
# - stage: test
# name: 'x86_64 Linux [GOAL: install] [bionic] [no depends, only system libs, sanitizers: fuzzer,address]'
# env: >-
# HOST=x86_64-unknown-linux-gnu
# PACKAGES="clang python3-zmq qtbase5-dev qttools5-dev-tools libssl1.0-dev libevent-dev bsdmainutils libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-program-options-dev libboost-test-dev libboost-thread-dev libdb5.3++-dev libminiupnpc-dev libzmq3-dev libprotobuf-dev protobuf-compiler libqrencode-dev libgmp-dev"
# NO_DEPENDS=1
# RUN_UNIT_TESTS=false
# RUN_FUNCTIONAL_TESTS=false
# RUN_BENCH=true
# RUN_FUNCTIONAL_TESTS=false # Disabled for now, can be combined with the other x86_64 linux NO_DEPENDS job when functional tests pass the sanitizers
# GOAL="install"
# BITCOIN_CONFIG="--enable-zmq --with-incompatible-bdb --enable-glibc-back-compat --enable-reduce-exports --with-gui=qt5 CPPFLAGS=-DDEBUG_LOCKORDER --with-sanitizers=undefined CC=clang CXX=clang++"
# x86_64 Linux, No wallet

# - stage: test
# name: 'x86_64 Linux [GOAL: install] [bionic] [no wallet]'
# env: >-
# HOST=x86_64-unknown-linux-gnu
# PACKAGES="python3"
# PACKAGES="python3-zmq"
# DEP_OPTS="NO_WALLET=1"
# GOAL="install"
# BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
# Cross-Mac

- stage: test
name: 'macOS 10.10 [GOAL: deploy] [no functional tests]'
env: >-
HOST=x86_64-apple-darwin14
PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python3-setuptools-git"
PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python3-dev python3-setuptools"
OSX_SDK=10.11
RUN_UNIT_TESTS=false
RUN_FUNCTIONAL_TESTS=false
GOAL="all deploy"
GOAL="deploy"
BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror"
@@ -6,4 +6,10 @@

export LC_ALL=C

travis_retry pip install flake8
travis_retry pip install codespell==1.13.0
travis_retry pip install flake8==3.5.0
travis_retry pip install vulture==0.29

SHELLCHECK_VERSION=v0.6.0
curl -s "https://storage.googleapis.com/shellcheck/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/
export PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}"
@@ -7,6 +7,8 @@
export LC_ALL=C.UTF-8

PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
# Add llvm-symbolizer directory to PATH. Needed to get symbolized stack traces from the sanitizers.
PATH=$PATH:/usr/lib/llvm-6.0/bin/
export PATH

BEGIN_FOLD () {
@@ -7,9 +7,11 @@
export LC_ALL=C.UTF-8

travis_retry docker pull "$DOCKER_NAME_TAG"
env | grep -E '^(CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env
env | grep -E '^(BITCOIN_CONFIG|CCACHE_|WINEDEBUG|LC_ALL|BOOST_TEST_RANDOM|CONFIG_SHELL)' | tee /tmp/env
if [[ $HOST = *-mingw32 ]]; then
DOCKER_ADMIN="--cap-add SYS_ADMIN"
elif [[ $BITCOIN_CONFIG = *--with-sanitizers=*address* ]]; then # If ran with (ASan + LSan), Docker needs access to ptrace (https://github.com/google/sanitizers/issues/764)
DOCKER_ADMIN="--cap-add SYS_PTRACE"
fi
DOCKER_ID=$(docker run $DOCKER_ADMIN -idt --mount type=bind,src=$TRAVIS_BUILD_DIR,dst=$TRAVIS_BUILD_DIR --mount type=bind,src=$CCACHE_DIR,dst=$CCACHE_DIR -w $TRAVIS_BUILD_DIR --env-file /tmp/env $DOCKER_NAME_TAG)

@@ -40,28 +40,11 @@ BEGIN_FOLD configure
DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false)
END_FOLD

set -o errtrace
trap 'DOCKER_EXEC "cat ${TRAVIS_BUILD_DIR}/sanitizer-output/* 2> /dev/null"' ERR

BEGIN_FOLD build
DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false )
END_FOLD

if [ "$RUN_UNIT_TESTS" = "true" ]; then
BEGIN_FOLD unit-tests
DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1
END_FOLD
fi

if [ "$RUN_BENCH" = "true" ]; then
BEGIN_FOLD bench
DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib $OUTDIR/bin/bench_obsr -scaling=0.001
END_FOLD
fi

if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then
extended="--extended --exclude feature_pruning,feature_dbcrash"
fi

if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
BEGIN_FOLD functional-tests
DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 --coverage --quiet --failfast ${extended}
END_FOLD
fi
cd ${TRAVIS_BUILD_DIR} || (echo "could not enter travis build dir $TRAVIS_BUILD_DIR"; exit 1)
@@ -0,0 +1,21 @@
#!/usr/bin/env bash
#
# Copyright (c) 2018 The Bitcoin Core developers
# Distributed under the MIT software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.

export LC_ALL=C.UTF-8

cd "build/obsr-$HOST" || (echo "could not enter distdir build/obsr-$HOST"; exit 1)

if [ "$RUN_UNIT_TESTS" = "true" ]; then
BEGIN_FOLD unit-tests
DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1
END_FOLD
fi

if [ "$RUN_FUNCTIONAL_TESTS" = "true" ]; then
BEGIN_FOLD functional-tests
DOCKER_EXEC test/functional/test_runner.py --combinedlogslen=4000 ${TEST_RUNNER_EXTRA} --quiet
END_FOLD
fi

0 comments on commit b8005b4

Please sign in to comment.
You can’t perform that action at this time.