changed so each LDB key was in its own DB

optimized a little
first pass at not loading full claimtrie into RAM
2019-08-19 08:29:56 -06:00 · 2019-08-02 17:27:28 -06:00 · 2019-08-01 18:35:58 -06:00 · 2019-08-01 15:44:05 -06:00
105 changed files with 4212 additions and 9697 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,8 +1,8 @@
-<!-- This issue tracker is only for technical issues related to lbrycrd (the LBRY blockchain).
+<!-- This issue tracker is only for technical issues related to Bitcoin Core.

-General questions and/or support requests are best directed to the community chat at https://chat.lbry.org.
+General bitcoin questions and/or support requests are best directed to the Bitcoin StackExchange at https://bitcoin.stackexchange.com.

-For reporting security issues, please email security@lbry.com.
+For reporting security issues, please read instructions at https://bitcoincore.org/en/contact/.

 If the node is "stuck" during sync or giving "block checksum mismatch" errors, please ensure your hardware is stable by running memtest and observe CPU temperature with a load-test tool such as linpack before creating an issue! -->

@ -13,7 +13,7 @@ If the node is "stuck" during sync or giving "block checksum mismatch" errors, p

 <!--- How reliably can you reproduce the issue, what are the steps to do so? -->

-<!-- What version of lbrycrd are you using, where did you get it (website, self-compiled, etc)? -->
+<!-- What version of Bitcoin Core are you using, where did you get it (website, self-compiled, etc)? -->

 <!-- What type of machine are you observing the error on (OS/CPU and disk type)? -->

--- a/.travis.yml
+++ b/.travis.yml
@ -7,6 +7,7 @@ cache:
 stages:
  - build
  - test
+  - quality

 jobs:
  include:
@ -14,7 +15,7 @@ jobs:
    - &build-template
      stage: build
      name: linux
-      env: NAME=linux DOCKER_IMAGE=lbry/build_lbrycrd_gcc EXT=
+      env: NAME=linux EXT=
      os: linux
      dist: xenial
      language: minimal
@ -22,9 +23,8 @@ jobs:
        - docker
      install:
        - mkdir -p ${HOME}/ccache
-        - docker pull $DOCKER_IMAGE
+        - docker pull $DOCKER_BUILD_IMAGE
      script:
-        - echo "build..."
        - docker run -v "$(pwd):/lbrycrd" -v "${HOME}/ccache:/ccache" -w /lbrycrd -e CCACHE_DIR=/ccache ${DOCKER_IMAGE} packaging/build_${NAME}_64bit.sh
      before_deploy:
        - mkdir -p dist
@ -48,11 +48,11 @@ jobs:

    - <<: *build-template
      name: windows
-      env: NAME=windows DOCKER_IMAGE=lbry/build_lbrycrd EXT=.exe
+      env: NAME=windows EXT=.exe

    - <<: *build-template
      name: osx
-      env: NAME=darwin DOCKER_IMAGE=lbry/build_lbrycrd EXT=
+      env: NAME=darwin EXT=
      before_install:
        - mkdir -p ./depends/SDKs && pushd depends/SDKs && curl -C - ${MAC_OS_SDK} | tar --skip-old-files -xJ && popd

@ -63,12 +63,12 @@ jobs:
      dist: xenial
      language: minimal
      git:
-        clone: false
+        depth: 3
      install:
        - mkdir -p testrun && cd testrun
        - curl http://build.lbry.io/lbrycrd/${TRAVIS_BRANCH}/lbrycrd-${NAME}-test.zip -o temp.zip
        - unzip temp.zip
-      script: TRIEHASH_FUZZER_BLOCKS=1000 ./test_lbrycrd
+      script: ./test_lbrycrd

    - <<: *test-template
      # os: windows # doesn't support secrets at the moment
@ -78,11 +78,20 @@ jobs:
      services:
        - docker
      script:
-        - docker pull lbry/wine
-        - docker run -v "$(pwd):/test" -e "WINEDEBUG=-all" -e "TRIEHASH_FUZZER_BLOCKS=1000" -it lbry/wine wine "/test/test_lbrycrd.exe"
+        - docker pull $DOCKER_WINE_IMAGE
+        - docker run -v "$(pwd):/test" -e "WINEDEBUG=-all" -it $DOCKER_WINE_IMAGE wine "/test/test_lbrycrd.exe"

    - <<: *test-template
      os: osx
      osx_image: xcode8.3
      env: NAME=darwin

+
+    - stage: quality
+      name: "check format"
+      os: linux
+      dist: xenial
+      language: minimal
+      install:
+        - sudo apt-get install -y clang-format-3.9
+      script: git diff -U0 origin/master -- '*.h' '*.cpp' | ./contrib/devtools/clang-format-diff.py -p1
--- a/README.md
+++ b/README.md
@ -1,32 +1,11 @@
 # LBRYcrd - The LBRY blockchain

 [![Build Status](https://travis-ci.org/lbryio/lbrycrd.svg?branch=master)](https://travis-ci.org/lbryio/lbrycrd)
-[![MIT licensed](https://img.shields.io/dub/l/vibe-d.svg?style=flat)](https://github.com/lbryio/lbry-desktop/blob/master/LICENSE)

-LBRYcrd uses a blockchain similar to bitcoin's to implement an index and payment system for content on the LBRY network. It is a fork of [bitcoin core](https://github.com/bitcoin/bitcoin). In addition to the libraries used by bitcoin, LBRYcrd also uses [icu4c](https://github.com/unicode-org/icu/tree/master/icu4c).
+LBRYcrd uses a blockchain similar to bitcoin's to implement an index and payment system for content on the LBRY network. It is a fork of bitcoin core. In addition to the libraries used by bitcoin, LBRYcrd also uses icu4c.

 Please read the [lbry.tech overview](https://lbry.tech/overview) for a general understanding of the LBRY pieces. From there you could read the [LBRY spec](https://spec.lbry.com/) for specifics on the data in the blockchain. 

-## Table of Contents
-
-1. [Installation](#installation)
-2. [Usage](#usage)
-   1. [Examples](#examples)
-   2. [Data directory](#data-directory)
-3. [Running from Source](#running-from-source)
-   1. [Ubuntu with pulled static dependencies](#ubuntu-with-pulled-static-dependencies)
-   2. [Ubuntu with local shared dependencies](#ubuntu-with-local-shared-dependencies)
-   3. [MacOS (cross-compiled)](<#macos-(cross-compiled)>)
-   4. [MacOS with local shared dependencies](#macos-with-local-shared-dependencies)
-   5. [Windows (cross-compiled)](<#windows-(cross-compiled)>)
-   6. [Use with CLion](#use-with-clion)
-4. [Contributing](#contributing)
-   - [Testnet](#testnet)
-5. [Mailing List](#mailing-list)
-6. [License](#license)
-7. [Security](#security)
-8. [Contact](#contact)
-
 ## Installation

 Latest binaries are available from https://github.com/lbryio/lbrycrd/releases. There is no installation procedure; the CLI binaries will run as-is and will have any uncommon dependencies statically linked into the binary. The QT GUI is not supported. LBRYcrd is distributed as a collection of executable files; traditional installers are not provided. 
@ -37,7 +16,7 @@ The `lbrycrdd` executable will start a LBRYcrd node and connect you to the LBRYc
 to interact with lbrycrdd through the command line. Command-line help for both executables are available through
 the "--help" flag (e.g. `lbrycrdd --help`). Examples:

-#### Examples
+#### Examples:

 Run `./lbrycrdd -server -daemon` to start lbrycrdd in the background.

@ -46,8 +25,7 @@ Run `./lbrycrd-cli -getinfo` to check for some basic information about your LBRY
 Run `./lbrycrd-cli help` to get a list of all commands that you can run. To get help on specific commands run `./lbrycrd-cli [command_name] help`

 Test locally:
-
-```sh
+```
 ./lbrycrdd -server -regtest -txindex  # run this in its own window
 ./lbrycrd-cli -regtest generate 120   # mine 20 spendable coins
 ./lbrycrd-cli -regtest claimname my_name deadbeef 1 # hold a name claim with 1 coin
@ -57,26 +35,24 @@ Test locally:
 ./lbrycrd-cli -regtest stop           # kill lbrycrdd
 rm -fr ~/.lbrycrd/regtest/            # destroy regtest data
 ```
-
 For further understanding of a "regtest" setup, see the local stack setup instructions here: https://lbry.tech/resources/regtest-setup

 The CLI help is also browsable online at https://lbry.tech/api/blockchain

-#### Data directory
+#### Data directory:

 Lbrycrdd will use the below default data directories (changeable with -datadir):

-```sh
+```
 Windows:  %APPDATA%\lbrycrd
 Mac:      ~/Library/Application Support/lbrycrd
 Unix:     ~/.lbrycrd
 ```
-
 The data directory contains various things such as your default wallet (wallet.dat), debug logs (debug.log), and blockchain data. You can optionally create a configuration file lbrycrd.conf in the default data directory which will be used by default when running lbrycrdd.

 For a list of configuration parameters, run `./lbrycrdd --help`. Below is a sample lbrycrd.conf to enable JSON RPC server on lbrycrdd.

-```sh
+```
 rpcuser=lbry
 rpcpassword=xyz123456790
 daemon=1
@ -85,19 +61,15 @@ txindex=1
 ```

 ## Running from Source
-
-The easiest way to compile is to utilize the Docker image that contains the necessary compilers: lbry/build_lbrycrd. This will allow you to reproduce the build as made on our build servers. In this sample we map a local lbrycrd folder and a local ccache folder inside the image:
-```sh
+The easiest way to compile is to utilize the Docker image that contains the necessary compilers: lbry/build_lbrycrd. This will allow you to reproduce the build as made on our build servers. I this sample we map a local lbrycrd folder and a local ccache folder inside the image:
+```
 git clone https://github.com/lbryio/lbrycrd.git
 cd lbrycrd
 docker run -v "$(pwd):/lbrycrd" --rm -v "${HOME}/ccache:/ccache" -w /lbrycrd -e CCACHE_DIR=/ccache lbry/build_lbrycrd packaging/build_linux_64bit.sh
 ```
-
 Some examples of compiling directly:
-
-#### Ubuntu with pulled static dependencies
-
-```sh
+#### Ubuntu with pulled static dependencies:
+```
 sudo apt install build-essential git libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates
 git clone https://github.com/lbryio/lbrycrd.git
 cd lbrycrd
@ -105,14 +77,10 @@ cd lbrycrd
 ./src/test/test_lbrycrd

 ```
-
 Other Linux distros would be similar. The build shell script is fairly trivial; take a peek at its contents.
-
-#### Ubuntu with local shared dependencies
-
+#### Ubuntu with local shared dependencies:
 Note: using untested dependencies may lead to conflicting results.
-
-```sh
+```
 sudo add-apt-repository ppa:bitcoin/bitcoin
 sudo apt-get update
 sudo apt-get install libdb4.8-dev libdb4.8++-dev libicu-dev libssl-dev libevent-dev \ 
@ -129,10 +97,8 @@ make -j$(nproc)
 ./src/lbrycrdd -server ...

 ```
-
-#### MacOS (cross-compiled)
-
-```sh
+#### MacOS (cross-compiled):
+```
 sudo apt-get install clang llvm git libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates \
                     libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev
                    
@ -144,12 +110,9 @@ tar ... extract SDK to depends/SDKs/MacOSX10.11.sdk
 ./packaging/build_darwin_64bit.sh

 ```
-
 Look in packaging/build_darwin_64bit.sh for further understanding.
-
-#### MacOS with local shared dependencies
-
-```sh
+#### MacOS with local shared dependencies:
+```
 brew install boost berkeley-db@4 icu4c libevent
 # fix conflict with gawk pulled first:
 brew reinstall readline
@ -164,12 +127,9 @@ CONFIG_SITE=$(pwd)/depends/x86_64-apple-darwin15.6.0/share/config.site ./configu
 make -j$(sysctl -n hw.ncpu)

 ```
-
-#### Windows (cross-compiled)
-
+#### Windows (cross-compiled):
 Compiling on MS Windows (outside of WSL) is not supported. The Windows build is cross-compiled from Linux like so:
-
-```sh
+```
 sudo apt-get install build-essential git libtool autotools-dev automake pkg-config bsdmainutils curl ca-certificates \
                     g++-mingw-w64-x86-64 mingw-w64-x86-64-dev
                     
@ -183,16 +143,13 @@ cd lbrycrd

 If you encounter any errors, please check `doc/build-*.md` for further instructions. If you're still stuck, [create an issue](https://github.com/lbryio/lbrycrd/issues/new) with the output of that command, your system info, and any other information you think might be helpful. The scripts in the packaging folder are simple and will grant extra light on the build process as needed.

-#### Use with CLion
-
+#### Use with CLion:
 CLion has not traditionally supported Autotools projects, although some progress on that is now in the works. We do include a cmake build file for compiling lbrycrd. See contrib/cmake. Alas, CLion doesn't support external projects in cmake, so that particular approach is also insufficient. CLion does support "compile_commands.json" projects. Fortunately, this can be easily generated for lbrycrd like so:
-
-```sh
+```
 pip install --user compiledb
 ./autogen.sh && ./configure --enable-static=no --enable-shared --with-pic --without-gui CXXFLAGS="-O0 -g" CFLAGS="-O0 -g" # or whatever normal lbrycrd config
 compiledb make -j10
 ```
-
 Then open the newly generated compile_commands.json file as a project in CLion. Debugging is supported if you compiled with `-g`. To enable that you will need to create a target in CLion by going to File -> Settings -> Build -> Custom Build Targets. Add an empty target with your choice of name. From there you can go to "Edit Configurations", typically found in a drop-down at the top of the editor. Add a Custom Build Application, select your new target, select the compiled file (i.e. test_lbrycrd or lbrycrdd, etc), and then add any necessary command line parameters. Ensure that there is nothing in the "Before launch" section.

 ## Contributing
@ -210,8 +167,8 @@ regularly to indicate new official, stable release versions.
 Testing and code review is the bottleneck for development; we get more pull
 requests than we can review and test on short notice. Please be patient and help out by testing
 other people's pull requests, and remember this is a security-critical project where any mistake might cost people
-lots of money. Developers are strongly encouraged to write [unit tests](/src/test/README.md) for new code and to
-submit new unit tests for old code. Unit tests are compiled by default and can be run with `src/test/test_lbrycrd`
+lots of money. Developers are strongly encouraged to write [unit tests](/doc/unit-tests.md) for new code and to
+submit new unit tests for old code. Unit tests are compiled by default and can be run with `src/test/test_lbrycrd`.

 The Travis CI system makes sure that every pull request is built, and that unit and sanity tests are automatically run. See https://travis-ci.org/lbryio/lbrycrd

@ -219,11 +176,7 @@ The Travis CI system makes sure that every pull request is built, and that unit

 Testnet is maintained for testing purposes and can be accessed using the command `./lbrycrdd -testnet`. If you would like to obtain testnet credits, please contact brannon@lbry.com or grin@lbry.com .

-It is easy to solo mine on testnet. (It's easy on mainnet too, but much harder to win.) For instructions see  [SGMiner](https://github.com/lbryio/sgminer-gm) and [Mining Contributions](https://github.com/lbryio/lbrycrd/tree/master/contrib/mining) 
-
-## Mailing List
-
-We maintain a mailing list for notifications of upgrades, security issues, and soft/hard forks. To join, visit [https://lbry.com/forklist](https://lbry.com/forklist).
+It is easy to solo mine on testnet. (It's easy on mainnet too, but much harder to win.) For instructions see https://github.com/lbryio/sgminer-gm and https://github.com/lbryio/lbrycrd/tree/master/contrib/mining 

 ## License

@ -231,9 +184,11 @@ This project is MIT licensed. For the full license, see [LICENSE](LICENSE).

 ## Security

-We take security seriously. Please contact [security@lbry.com](mailto:security@lbry.com) regarding any security issues.
-Our PGP key is [here](https://lbry.com/faq/pgp-key) if you need it.
+We take security seriously. Please contact security@lbry.com regarding any security issues.
+Our PGP key is [here](https://keybase.io/lbry/key.asc) if you need it.

 ## Contact

 The primary contact for this project is [@BrannonKing](https://github.com/BrannonKing) (brannon@lbry.com)
+
+
--- a/autogen.sh
+++ b/autogen.sh
@ -7,7 +7,7 @@ export LC_ALL=C
 set -e
 srcdir="$(dirname $0)"
 cd "$srcdir"
-if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="$(which glibtoolize 2>/dev/null)"; then
+if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`which glibtoolize 2>/dev/null`"; then
  LIBTOOLIZE="${GLIBTOOLIZE}"
  export LIBTOOLIZE
 fi
--- a/configure.ac
+++ b/configure.ac
@ -2,10 +2,10 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
 AC_PREREQ([2.60])
 define(_CLIENT_VERSION_MAJOR, 0)
 define(_CLIENT_VERSION_MINOR, 17)
-define(_CLIENT_VERSION_REVISION, 3)
-define(_CLIENT_VERSION_BUILD, 3)
+define(_CLIENT_VERSION_REVISION, 2)
+define(_CLIENT_VERSION_BUILD, 1)
 define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2021)
+define(_COPYRIGHT_YEAR, 2019)
 define(_COPYRIGHT_HOLDERS,[The %s developers])
 define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[LBRYcrd Core]])
 AC_INIT([LBRYcrd Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/lbryio/lbrycrd/issues],[lbrycrd],[https://lbry.com/])
--- a/contrib/macdeploy/detached-sig-apply.sh
+++ b/contrib/macdeploy/detached-sig-apply.sh
@ -36,13 +36,13 @@ if [ -z "${CODESIGN_ALLOCATE}" ]; then
 fi

 find ${TEMPDIR} -name "*.sign" | while read i; do
-  SIZE=$(stat -c %s "${i}")
-  TARGET_FILE="$(echo "${i}" | sed 's/\.sign$//')"
+  SIZE=`stat -c %s "${i}"`
+  TARGET_FILE="`echo "${i}" | sed 's/\.sign$//'`"

  echo "Allocating space for the signature of size ${SIZE} in ${TARGET_FILE}"
  ${CODESIGN_ALLOCATE} -i "${TARGET_FILE}" -a ${ARCH} ${SIZE} -o "${i}.tmp"

-  OFFSET=$(${PAGESTUFF} "${i}.tmp" -p | tail -2 | grep offset | sed 's/[^0-9]*//g')
+  OFFSET=`${PAGESTUFF} "${i}.tmp" -p | tail -2 | grep offset | sed 's/[^0-9]*//g'`
  if [ -z ${QUIET} ]; then
    echo "Attaching signature at offset ${OFFSET}"
  fi
--- a/contrib/macdeploy/detached-sig-create.sh
+++ b/contrib/macdeploy/detached-sig-create.sh
@ -27,19 +27,19 @@ ${CODESIGN} -f --file-list ${TEMPLIST} "$@" "${BUNDLE}"

 grep -v CodeResources < "${TEMPLIST}" | while read i; do
  TARGETFILE="${BUNDLE}/`echo "${i}" | sed "s|.*${BUNDLE}/||"`"
-  SIZE=$(pagestuff "$i" -p | tail -2 | grep size | sed 's/[^0-9]*//g')
-  OFFSET=$(pagestuff "$i" -p | tail -2 | grep offset | sed 's/[^0-9]*//g')
+  SIZE=`pagestuff "$i" -p | tail -2 | grep size | sed 's/[^0-9]*//g'`
+  OFFSET=`pagestuff "$i" -p | tail -2 | grep offset | sed 's/[^0-9]*//g'`
  SIGNFILE="${TEMPDIR}/${OUTROOT}/${TARGETFILE}.sign"
-  DIRNAME="$(dirname "${SIGNFILE}")"
+  DIRNAME="`dirname "${SIGNFILE}"`"
  mkdir -p "${DIRNAME}"
  echo "Adding detached signature for: ${TARGETFILE}. Size: ${SIZE}. Offset: ${OFFSET}"
  dd if="$i" of="${SIGNFILE}" bs=1 skip=${OFFSET} count=${SIZE} 2>/dev/null
 done

 grep CodeResources < "${TEMPLIST}" | while read i; do
-  TARGETFILE="${BUNDLE}/$(echo "${i}" | sed "s|.*${BUNDLE}/||")"
+  TARGETFILE="${BUNDLE}/`echo "${i}" | sed "s|.*${BUNDLE}/||"`"
  RESOURCE="${TEMPDIR}/${OUTROOT}/${TARGETFILE}"
-  DIRNAME="$(dirname "${RESOURCE}")"
+  DIRNAME="`dirname "${RESOURCE}"`"
  mkdir -p "${DIRNAME}"
  echo "Adding resource for: \"${TARGETFILE}\""
  cp "${i}" "${RESOURCE}"
--- a/contrib/mining/README.md
+++ b/contrib/mining/README.md
@ -36,7 +36,7 @@ insert into coins(name, symbol, symbol2, algo, enable, auto_ready, rpcuser, rpcp
  values('Local LBRY Instance', 'LBC', 'LBC', 'lbry', 1, 1, 'ruser', 'rpswd', '127.0.0.1', 19245, 1, 'utf-8', 0, 1, 0, 0, 0);
 exit
 ```
-Use port 19245 for testnet, port 9245 for main. Set usesegwit to 1 after the segwit fork is enabled on December 11, 2019.
+Use port 19245 for testnet, port 9245 for main.
 #### 3. Run the stratum server:
 ```
 docker run --network host -d lbry/yiimp_stratum
@ -47,7 +47,6 @@ docker run --network host -it lbry/yiimp_stratum bash
 cat config/lbry.conf
 ./stratum config/lbry
 ```
-When testing with an ASIC you may need to modify the TCP server address in said lbry.conf file to be an external IP address.

 #### 4. Connect sgminer to it:
 ```
--- a/contrib/windeploy/detached-sig-create.sh
+++ b/contrib/windeploy/detached-sig-create.sh
@ -23,7 +23,7 @@ TIMESERVER=http://timestamp.comodoca.com
 CERTFILE="win-codesign.cert"

 mkdir -p "${OUTSUBDIR}"
-basename -a $(ls -1 "${SRCDIR}"/*-unsigned.exe) | while read UNSIGNED; do
+basename -a `ls -1 "${SRCDIR}"/*-unsigned.exe` | while read UNSIGNED; do
  echo Signing "${UNSIGNED}"
  "${OSSLSIGNCODE}" sign -certs "${CERTFILE}" -t "${TIMESERVER}" -in "${SRCDIR}/${UNSIGNED}" -out "${WORKDIR}/${UNSIGNED}" "$@"
  "${OSSLSIGNCODE}" extract-signature -pem -in "${WORKDIR}/${UNSIGNED}" -out "${OUTSUBDIR}/${UNSIGNED}.pem" && rm "${WORKDIR}/${UNSIGNED}"
--- a/depends/Makefile
+++ b/depends/Makefile
@ -131,7 +131,7 @@ $(host_prefix)/share/config.site : config.site.in $(host_prefix)/.stamp_$(final_
            -e 's|@build_os@|$(build_os)|' \
            -e 's|@host_os@|$(host_os)|' \
            -e 's|@CFLAGS@|$(strip $(host_CFLAGS) $(host_$(release_type)_CFLAGS))|' \
-            -e 's|@CXXFLAGS@|$(strip -pipe $(host_$(release_type)_CXXFLAGS))|' \
+            -e 's|@CXXFLAGS@|$(strip $(host_CXXFLAGS) $(host_$(release_type)_CXXFLAGS))|' \
            -e 's|@CPPFLAGS@|$(strip $(host_CPPFLAGS) $(host_$(release_type)_CPPFLAGS))|' \
            -e 's|@LDFLAGS@|$(strip $(host_LDFLAGS) $(host_$(release_type)_LDFLAGS))|' \
            -e 's|@allow_host_packages@|$(ALLOW_HOST_PACKAGES)|' \
--- a/depends/glibc_version_header/force_link_glibc_2.19.h
+++ b/depends/glibc_version_header/force_link_glibc_2.19.h
--- a/depends/hosts/darwin.mk
+++ b/depends/hosts/darwin.mk
@ -7,13 +7,12 @@ darwin_CC=clang -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) -isysroo
 darwin_CXX=clang++ -target $(host) -mmacosx-version-min=$(OSX_MIN_VERSION) -isysroot $(OSX_SDK) -mlinker-version=$(LD64_VERSION) -stdlib=libc++ -B $(host_prefix)/native/bin

 darwin_CFLAGS=-pipe
-darwin_CXXFLAGS=$(darwin_CFLAGS) -std=c++11
+darwin_CXXFLAGS=$(darwin_CFLAGS)

-darwin_release_CFLAGS=-O2 -g
+darwin_release_CFLAGS=-O2
 darwin_release_CXXFLAGS=$(darwin_release_CFLAGS)

-darwin_debug_CFLAGS=-Og -g
-darwin_debug_CXXFLAGS=-O0 -g
+darwin_debug_CFLAGS=-Og
+darwin_debug_CXXFLAGS=$(darwin_debug_CFLAGS)

 darwin_native_toolchain=native_cctools
-
--- a/depends/hosts/linux.mk
+++ b/depends/hosts/linux.mk
@ -1,14 +1,11 @@
 linux_CFLAGS=-pipe
-linux_CXXFLAGS=$(linux_CFLAGS) -std=c++11
+linux_CXXFLAGS=$(linux_CFLAGS)

-linux_release_CFLAGS=-O3 -g
-ifeq (1,$(shell ldd --version | head -1 | awk '{print $$NF < 2.28}'))
-linux_release_CFLAGS+= -include $(BASEDIR)/glibc_version_header/force_link_glibc_2.19.h
-endif
+linux_release_CFLAGS=-O2
 linux_release_CXXFLAGS=$(linux_release_CFLAGS)

-linux_debug_CFLAGS=-O1 -g
-linux_debug_CXXFLAGS=-O0 -g
+linux_debug_CFLAGS=-Og
+linux_debug_CXXFLAGS=$(linux_debug_CFLAGS)

 linux_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC

--- a/depends/hosts/mingw32.mk
+++ b/depends/hosts/mingw32.mk
@ -1,11 +1,10 @@
 mingw32_CFLAGS=-pipe
-mingw32_CXXFLAGS=$(mingw32_CFLAGS) -std=c++11
+mingw32_CXXFLAGS=$(mingw32_CFLAGS)

-mingw32_release_CFLAGS=-O2 -g
+mingw32_release_CFLAGS=-O2
 mingw32_release_CXXFLAGS=$(mingw32_release_CFLAGS)

-mingw32_debug_CFLAGS=-O1 -g
-mingw32_debug_CXXFLAGS=-O0 -g
+mingw32_debug_CFLAGS=-O1
+mingw32_debug_CXXFLAGS=$(mingw32_debug_CFLAGS)

 mingw32_debug_CPPFLAGS=-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC
-
--- a/depends/packages/bdb.mk
+++ b/depends/packages/bdb.mk
@ -1,6 +1,6 @@
 package=bdb
 $(package)_version=4.8.30
-$(package)_download_path=https://download.oracle.com/berkeley-db
+$(package)_download_path=http://download.oracle.com/berkeley-db
 $(package)_file_name=db-$($(package)_version).NC.tar.gz
 $(package)_sha256_hash=12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef
 $(package)_build_subdir=build_unix
@ -9,7 +9,7 @@ define $(package)_set_vars
 $(package)_config_opts=--disable-shared --enable-cxx --disable-replication
 $(package)_config_opts_mingw32=--enable-mingw
 $(package)_config_opts_linux=--with-pic
-$(package)_cppflags_mingw32=-DUNICODE -D_UNICODE
+$(package)_cxxflags=-std=c++11
 endef

 define $(package)_preprocess_cmds
@ -29,4 +29,3 @@ endef
 define $(package)_stage_cmds
  $(MAKE) DESTDIR=$($(package)_staging_dir) install_lib install_include
 endef
-
--- a/depends/packages/boost.mk
+++ b/depends/packages/boost.mk
@ -1,6 +1,6 @@
 package=boost
 $(package)_version=1_69_0
-$(package)_download_path=https://boostorg.jfrog.io/artifactory/main/release/1.69.0/source/
+$(package)_download_path=https://dl.bintray.com/boostorg/release/1.69.0/source/
 $(package)_file_name=$(package)_$($(package)_version).tar.bz2
 $(package)_sha256_hash=8f32d4617390d1c2d16f26a27ab60d97807b35440d45891fa340fc2648b04406
 $(package)_dependencies=icu
--- a/depends/packages/icu.mk
+++ b/depends/packages/icu.mk
@ -22,6 +22,7 @@ define $(package)_preprocess_cmds
  PKG_CONFIG_SYSROOT_DIR=/ \
  PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig \
  PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig \
+  sed -i.old 's/^GEN_DEPS.cc.*/& $(CXXFLAGS)/' source/config/mh-mingw* && \
  mkdir -p build && cd build && \
  ../source/runConfigureICU Linux $($(package)_standard_opts) CXXFLAGS=-std=c++11 && \
  $(MAKE) && cd ..
@ -31,8 +32,6 @@ define $(package)_config_cmds
  PKG_CONFIG_SYSROOT_DIR=/ \
  PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig \
  PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig \
-  sed -i.old 's|^GEN_DEPS.c=.*|& $($(package)_cflags)|' config/mh-mingw* && \
-  sed -i.old 's|^GEN_DEPS.cc=.*|& $($(package)_cxxflags)|' config/mh-mingw* && \
  $($(package)_autoconf)
 endef

--- a/depends/packages/libevent.mk
+++ b/depends/packages/libevent.mk
@ -27,5 +27,4 @@ define $(package)_stage_cmds
 endef

 define $(package)_postprocess_cmds
-  rm lib/*.la
 endef
--- a/depends/packages/miniupnpc.mk
+++ b/depends/packages/miniupnpc.mk
@ -1,6 +1,6 @@
 package=miniupnpc
 $(package)_version=2.0.20180203
-$(package)_download_path=https://miniupnp.tuxfamily.org/files/
+$(package)_download_path=http://miniupnp.free.fr/files
 $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=90dda8c7563ca6cd4a83e23b3c66dbbea89603a1675bfdb852897c2c9cc220b7

--- a/depends/packages/openssl.mk
+++ b/depends/packages/openssl.mk
@ -5,7 +5,7 @@ $(package)_file_name=$(package)-$($(package)_version).tar.gz
 $(package)_sha256_hash=8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c

 define $(package)_set_vars
-$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc) $($(package)_cflags) $($(package)_cppflags)"
+$(package)_config_env=AR="$($(package)_ar)" RANLIB="$($(package)_ranlib)" CC="$($(package)_cc)"
 $(package)_config_opts=--prefix=$(host_prefix) --openssldir=$(host_prefix)/etc/openssl
 $(package)_config_opts+=no-camellia
 $(package)_config_opts+=no-capieng
@ -42,6 +42,7 @@ $(package)_config_opts+=no-weak-ssl-ciphers
 $(package)_config_opts+=no-whirlpool
 $(package)_config_opts+=no-zlib
 $(package)_config_opts+=no-zlib-dynamic
+$(package)_config_opts+=$($(package)_cflags) $($(package)_cppflags)
 $(package)_config_opts_linux=-fPIC -Wa,--noexecstack
 $(package)_config_opts_x86_64_linux=linux-x86_64
 $(package)_config_opts_i686_linux=linux-generic32
--- a/depends/packages/protobuf.mk
+++ b/depends/packages/protobuf.mk
@ -4,6 +4,7 @@ $(package)_download_path=$(native_$(package)_download_path)
 $(package)_file_name=$(native_$(package)_file_name)
 $(package)_sha256_hash=$(native_$(package)_sha256_hash)
 $(package)_dependencies=native_$(package)
+$(package)_cxxflags=-std=c++11

 define $(package)_set_vars
  $(package)_config_opts=--disable-shared --with-protoc=$(build_prefix)/bin/protoc
--- a/depends/packages/zeromq.mk
+++ b/depends/packages/zeromq.mk
@ -6,10 +6,9 @@ $(package)_sha256_hash=bcbabe1e2c7d0eec4ed612e10b94b112dd5f06fcefa994a0c79a45d83
 $(package)_patches=0001-fix-build-with-older-mingw64.patch 0002-disable-pthread_set_name_np.patch

 define $(package)_set_vars
-  $(package)_config_opts=--without-docs --disable-shared --without-libsodium --disable-curve --disable-curve-keygen --disable-perf --disable-Werror --disable-drafts
-  $(package)_config_opts += --without-libsodium --without-libgssapi_krb5 --without-pgm --without-norm --without-vmci
-  $(package)_config_opts += --disable-libunwind --disable-radix-tree --without-gcov
+  $(package)_config_opts=--without-docs --disable-shared --without-libsodium --disable-curve --disable-curve-keygen --disable-perf --disable-Werror
  $(package)_config_opts_linux=--with-pic
+  $(package)_cxxflags=-std=c++11
 endef

 define $(package)_preprocess_cmds
@ -32,5 +31,5 @@ endef

 define $(package)_postprocess_cmds
  sed -i.old "s/ -lstdc++//" lib/pkgconfig/libzmq.pc && \
-  rm -rf bin share lib/*.la
+  rm -rf bin share
 endef
--- a/packaging/build_darwin_64bit.sh
+++ b/packaging/build_darwin_64bit.sh
@ -30,13 +30,13 @@ if which ccache >/dev/null; then
 fi

 pushd depends
-make -j$(getconf _NPROCESSORS_ONLN) HOST=x86_64-apple-darwin14 NO_QT=1 V=1
+make -j`getconf _NPROCESSORS_ONLN` HOST=x86_64-apple-darwin14 NO_QT=1 V=1
 popd

 ./autogen.sh
-DEPS_DIR=$(pwd)/depends/x86_64-apple-darwin14
+DEPS_DIR=`pwd`/depends/x86_64-apple-darwin14
 CONFIG_SITE=${DEPS_DIR}/share/config.site ./configure --enable-reduce-exports --without-gui --with-icu="${DEPS_DIR}" --enable-static --disable-shared
-make -j$(getconf _NPROCESSORS_ONLN)
+make -j`getconf _NPROCESSORS_ONLN`
 ${DEPS_DIR}/native/bin/x86_64-apple-darwin14-strip src/lbrycrdd src/lbrycrd-cli src/lbrycrd-tx

 if which ccache >/dev/null; then
--- a/packaging/build_linux_64bit.sh
+++ b/packaging/build_linux_64bit.sh
@ -20,13 +20,13 @@ export CXXFLAGS="${CXXFLAGS:--frecord-gcc-switches}"
 echo "CXXFLAGS set to $CXXFLAGS"

 cd depends
-make -j$(getconf _NPROCESSORS_ONLN) HOST=x86_64-pc-linux-gnu NO_QT=1 V=1
+make -j`getconf _NPROCESSORS_ONLN` HOST=x86_64-pc-linux-gnu NO_QT=1 V=1
 cd ..

 ./autogen.sh
-DEPS_DIR=$(pwd)/depends/x86_64-pc-linux-gnu
+DEPS_DIR=`pwd`/depends/x86_64-pc-linux-gnu
 CONFIG_SITE=${DEPS_DIR}/share/config.site ./configure --enable-static --disable-shared --with-pic --without-gui
-make -j$(getconf _NPROCESSORS_ONLN)
+make -j`getconf _NPROCESSORS_ONLN`
 strip src/lbrycrdd src/lbrycrd-cli src/lbrycrd-tx

 if which ccache >/dev/null; then
--- a/packaging/build_windows_32bit.sh
+++ b/packaging/build_windows_32bit.sh
@ -20,14 +20,17 @@ if which ccache >/dev/null; then
    ccache -ps
 fi

+export CXXFLAGS="${CXXFLAGS:--frecord-gcc-switches}"
+echo "CXXFLAGS set to $CXXFLAGS"
+
 pushd depends
-make -j$(getconf _NPROCESSORS_ONLN) HOST=i686-w64-mingw32 NO_QT=1 V=1
+make -j`getconf _NPROCESSORS_ONLN` HOST=i686-w64-mingw32 NO_QT=1 V=1
 popd

 ./autogen.sh
-DEPS_DIR=$(pwd)/depends/i686-w64-mingw32
+DEPS_DIR=`pwd`/depends/i686-w64-mingw32
 CONFIG_SITE=${DEPS_DIR}/share/config.site ./configure --prefix=/ --without-gui --with-icu="$DEPS_DIR" --enable-static --disable-shared
-make -j$(getconf _NPROCESSORS_ONLN)
+make -j`getconf _NPROCESSORS_ONLN`
 i686-w64-mingw32-strip src/lbrycrdd.exe src/lbrycrd-cli.exe src/lbrycrd-tx.exe

 if which ccache >/dev/null; then
--- a/packaging/build_windows_64bit.sh
+++ b/packaging/build_windows_64bit.sh
@ -19,14 +19,17 @@ if which ccache >/dev/null; then
    ccache -ps
 fi

+export CXXFLAGS="${CXXFLAGS:--frecord-gcc-switches}"
+echo "CXXFLAGS set to $CXXFLAGS"
+
 pushd depends
-make -j$(getconf _NPROCESSORS_ONLN) HOST=x86_64-w64-mingw32 NO_QT=1 V=1
+make -j`getconf _NPROCESSORS_ONLN` HOST=x86_64-w64-mingw32 NO_QT=1 V=1
 popd

 ./autogen.sh
-DEPS_DIR=$(pwd)/depends/x86_64-w64-mingw32
+DEPS_DIR=`pwd`/depends/x86_64-w64-mingw32
 CONFIG_SITE=${DEPS_DIR}/share/config.site ./configure --prefix=/ --without-gui --with-icu="$DEPS_DIR" --enable-static --disable-shared
-make -j$(getconf _NPROCESSORS_ONLN)
+make -j`getconf _NPROCESSORS_ONLN`
 x86_64-w64-mingw32-strip src/lbrycrdd.exe src/lbrycrd-cli.exe src/lbrycrd-tx.exe

 if which ccache >/dev/null; then
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -155,7 +155,6 @@ BITCOIN_CORE_H = \
  reverse_iterator.h \
  reverselock.h \
  rpc/blockchain.h \
-  rpc/claimrpchelp.h \
  rpc/client.h \
  rpc/mining.h \
  rpc/protocol.h \
--- a/src/Makefile.test.include
+++ b/src/Makefile.test.include
@ -66,11 +66,6 @@ BITCOIN_TESTS =\
  test/net_tests.cpp \
  test/claimtriecache_tests.cpp \
  test/claimtriebranching_tests.cpp \
-  test/claimtrieexpirationfork_tests.cpp \
-  test/claimtriefixture.cpp \
-  test/claimtriehashfork_tests.cpp \
-  test/claimtrienormalization_tests.cpp \
-  test/claimtrierpc_tests.cpp \
  test/nameclaim_tests.cpp \
  test/netbase_tests.cpp \
  test/pmt_tests.cpp \
--- a/src/bloom.cpp
+++ b/src/bloom.cpp
@ -3,7 +3,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

 #include <bloom.h>
-#include <nameclaim.h>

 #include <primitives/transaction.h>
 #include <hash.h>
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@ -123,7 +123,7 @@ void CChainParams::UpdateVersionBitsParameters(Consensus::DeploymentPos d, int64
 class CMainParams : public CChainParams {
 public:
    CMainParams() {
-        strNetworkID = CBaseChainParams::MAIN;
+        strNetworkID = "lbrycrd";
        consensus.nSubsidyLevelInterval = 1<<5;
        consensus.nMajorityEnforceBlockUpgrade = 750;
        consensus.nMajorityRejectBlockOutdated = 950;
@ -144,9 +144,7 @@ public:
        consensus.nAllowMinDiffMaxHeight = -1;
        consensus.nNormalizedNameForkHeight = 539940; // targeting 21 March 2019
        consensus.nMinTakeoverWorkaroundHeight = 496850;
-        consensus.nMaxTakeoverWorkaroundHeight = 658300; // targeting 30 Oct 2019
-        consensus.nWitnessForkHeight = 680770; // targeting 11 Dec 2019
-        consensus.nAllClaimsInMerkleForkHeight = 658310; // targeting 30 Oct 2019
+        consensus.nMaxTakeoverWorkaroundHeight = 10000000;
        consensus.fPowAllowMinDifficultyBlocks = false;
        consensus.fPowNoRetargeting = false;
        consensus.nRuleChangeActivationThreshold = 1916; // 95% of a  half week
@ -160,16 +158,17 @@ public:
        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1462060800; // May 1st, 2016
        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017

-        // Deployment of SegWit (BIP141, BIP143, and BIP147) -- Unused (see nWitnessForkHeight).
+        // Deployment of SegWit (BIP141, BIP143, and BIP147)
        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1547942400; // Jan 20, 2019
        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1548288000; // Jan 24, 2019

        // The best chain should have at least this much work.
-        consensus.nMinimumChainWork = uint256S("000000000000000000000000000000000000000000000499ed6684d1bf6f6fd3"); //946000
+        consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000607ca7e806c4c1e9"); //400000

        // By default assume that the signatures in ancestors of this block are valid.
-        consensus.defaultAssumeValid = uint256S("0d3b537afe49820e1c6efc555463f955251b1293c6e5130137e1e25744431172"); //946000
+        //consensus.defaultAssumeValid = uint256S("0xf0e56e70782af63ccb49c76e852540688755869ba59ec68cac9c04a6b4d9f5ca"); //400000
+        consensus.defaultAssumeValid = uint256S("0xa6bbb48f5343eb9b0287c22f3ea8b29f36cf10794a37f8a925a894d6f4519913"); //4000

        /**
         * The message start string is designed to be unlikely to occur in normal data.
@ -195,11 +194,9 @@ public:
        vSeeds.clear();
        vFixedSeeds.clear();

-        vSeeds.emplace_back("dnsseed1.lbry.io"); // LBRY Inc
-        vSeeds.emplace_back("dnsseed2.lbry.io"); // LBRY Inc
-        vSeeds.emplace_back("dnsseed3.lbry.io"); // LBRY Inc
-        vSeeds.emplace_back("seed.lbry.grin.io"); // Grin
-        vSeeds.emplace_back("seed.allaboutlbc.com"); // Madiator2011
+        vSeeds.emplace_back("dnsseed1.lbry.io"); // lbry.io
+        vSeeds.emplace_back("dnsseed2.lbry.io"); // lbry.io
+        vSeeds.emplace_back("dnsseed3.lbry.io"); // lbry.io

        base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1, 0x55);
        base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1, 0x7a);
@ -207,6 +204,8 @@ public:
        base58Prefixes[EXT_PUBLIC_KEY] = {0x04, 0x88, 0xB2, 0x1E};
        base58Prefixes[EXT_SECRET_KEY] = {0x04, 0x88, 0xAD, 0xE4};

+        vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
+
        bech32_hrp = "lbc";

        vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
@ -241,7 +240,7 @@ public:
 class CTestNetParams : public CChainParams {
 public:
    CTestNetParams() {
-        strNetworkID = CBaseChainParams::TESTNET;
+        strNetworkID = "lbrycrdtest";
        consensus.nSubsidyLevelInterval = 1 << 5;
        consensus.nMajorityEnforceBlockUpgrade = 51;
        consensus.nMajorityRejectBlockOutdated = 75;
@ -262,9 +261,7 @@ public:
        consensus.nAllowMinDiffMaxHeight = 1100000;
        consensus.nNormalizedNameForkHeight = 993380;   // targeting, 21 Feb 2019
        consensus.nMinTakeoverWorkaroundHeight = 99;
-        consensus.nMaxTakeoverWorkaroundHeight = 1198550; // targeting 30 Sep 2019
-        consensus.nWitnessForkHeight = 1198600;
-        consensus.nAllClaimsInMerkleForkHeight = 1198560; // targeting 30 Sep 2019
+        consensus.nMaxTakeoverWorkaroundHeight = 10000000;
        consensus.fPowAllowMinDifficultyBlocks = true;
        consensus.fPowNoRetargeting = false;
        consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains
@ -278,7 +275,7 @@ public:
        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1456790400; // March 1st, 2016
        consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017

-        // Deployment of SegWit (BIP141, BIP143, and BIP147) -- Unused (see nWitnessForkHeight).
+        // Deployment of SegWit (BIP141, BIP143, and BIP147)
        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1462060800; // May 1st 2016
        consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
@ -351,7 +348,7 @@ public:
 class CRegTestParams : public CChainParams {
 public:
    CRegTestParams() {
-        strNetworkID = CBaseChainParams::REGTEST;
+        strNetworkID = "lbrycrdreg";
        consensus.nSubsidyLevelInterval = 1 << 5;
        consensus.BIP16Exception = uint256();
        consensus.BIP34Height = 1000; // BIP34 is needed for validation_block_tests
@ -370,8 +367,6 @@ public:
        consensus.nNormalizedNameForkHeight = 250; // SDK depends upon this number
        consensus.nMinTakeoverWorkaroundHeight = -1;
        consensus.nMaxTakeoverWorkaroundHeight = -1;
-        consensus.nWitnessForkHeight = 150;
-        consensus.nAllClaimsInMerkleForkHeight = 350;
        consensus.fPowAllowMinDifficultyBlocks = false;
        consensus.fPowNoRetargeting = false;
        consensus.nRuleChangeActivationThreshold = 108; // 75% for testchains
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@ -13,7 +13,7 @@

 const std::string CBaseChainParams::MAIN = "lbrycrd";
 const std::string CBaseChainParams::TESTNET = "lbrycrdtest";
-const std::string CBaseChainParams::REGTEST = "lbrycrdreg";
+const std::string CBaseChainParams::REGTEST = "regtest";

 void SetupChainParamsBaseOptions()
 {
--- a/src/claimscriptop.cpp
+++ b/src/claimscriptop.cpp
@ -149,7 +149,7 @@ bool ProcessClaim(CClaimScriptOp& claimOp, CClaimTrieCache& trieCache, const CSc
 {
    int op;
    std::vector<std::vector<unsigned char> > vvchParams;
-    if (!DecodeClaimScript(scriptPubKey, op, vvchParams, trieCache.allowSupportMetadata()))
+    if (!DecodeClaimScript(scriptPubKey, op, vvchParams))
        return false;

    switch (op) {
--- a/src/claimscriptop.h
+++ b/src/claimscriptop.h
@ -59,17 +59,17 @@ public:
     */
    CClaimScriptAddOp(const COutPoint& point, CAmount nValue, int nHeight);
    /**
-     * Implementation of OP_CLAIM_NAME handler
+     * Implamention of OP_CLAIM_NAME handler
     * @see CClaimScriptOp::claimName
     */
    bool claimName(CClaimTrieCache& trieCache, const std::string& name) override;
    /**
-     * Implementation of OP_UPDATE_CLAIM handler
+     * Implamention of OP_UPDATE_CLAIM handler
     * @see CClaimScriptOp::updateClaim
     */
    bool updateClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
    /**
-     * Implementation of OP_SUPPORT_CLAIM handler
+     * Implamention of OP_SUPPORT_CLAIM handler
     * @see CClaimScriptOp::supportClaim
     */
    bool supportClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
@ -100,17 +100,17 @@ public:
     */
    CClaimScriptUndoAddOp(const COutPoint& point, int nHeight);
    /**
-     * Implementation of OP_CLAIM_NAME handler
+     * Implamention of OP_CLAIM_NAME handler
     * @see CClaimScriptOp::claimName
     */
    bool claimName(CClaimTrieCache& trieCache, const std::string& name) override;
    /**
-     * Implementation of OP_UPDATE_CLAIM handler
+     * Implamention of OP_UPDATE_CLAIM handler
     * @see CClaimScriptOp::updateClaim
     */
    bool updateClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
    /**
-     * Implementation of OP_SUPPORT_CLAIM handler
+     * Implamention of OP_SUPPORT_CLAIM handler
     * @see CClaimScriptOp::supportClaim
     */
    bool supportClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
@ -141,17 +141,17 @@ public:
     */
    CClaimScriptSpendOp(const COutPoint& point, int nHeight, int& nValidHeight);
    /**
-     * Implementation of OP_CLAIM_NAME handler
+     * Implamention of OP_CLAIM_NAME handler
     * @see CClaimScriptOp::claimName
     */
    bool claimName(CClaimTrieCache& trieCache, const std::string& name) override;
    /**
-     * Implementation of OP_UPDATE_CLAIM handler
+     * Implamention of OP_UPDATE_CLAIM handler
     * @see CClaimScriptOp::updateClaim
     */
    bool updateClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
    /**
-     * Implementation of OP_SUPPORT_CLAIM handler
+     * Implamention of OP_SUPPORT_CLAIM handler
     * @see CClaimScriptOp::supportClaim
     */
    bool supportClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
@ -184,17 +184,17 @@ public:
     */
    CClaimScriptUndoSpendOp(const COutPoint& point, CAmount nValue, int nHeight, int nValidHeight);
    /**
-     * Implementation of OP_CLAIM_NAME handler
+     * Implamention of OP_CLAIM_NAME handler
     * @see CClaimScriptOp::claimName
     */
    bool claimName(CClaimTrieCache& trieCache, const std::string& name) override;
    /**
-     * Implementation of OP_UPDATE_CLAIM handler
+     * Implamention of OP_UPDATE_CLAIM handler
     * @see CClaimScriptOp::updateClaim
     */
    bool updateClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
    /**
-     * Implementation of OP_SUPPORT_CLAIM handler
+     * Implamention of OP_SUPPORT_CLAIM handler
     * @see CClaimScriptOp::supportClaim
     */
    bool supportClaim(CClaimTrieCache& trieCache, const std::string& name, const uint160& claimId) override;
--- a/src/claimtrie.cpp
+++ b/src/claimtrie.cpp
--- a/src/claimtrie.h
+++ b/src/claimtrie.h
@ -17,28 +17,16 @@
 #include <unordered_map>
 #include <unordered_set>

-// leveldb keys
-#define TRIE_NODE 'n'
-#define TRIE_NODE_CHILDREN 'b'
-#define CLAIM_BY_ID 'i'
-#define CLAIM_QUEUE_ROW 'r'
-#define CLAIM_QUEUE_NAME_ROW 'm'
-#define CLAIM_EXP_QUEUE_ROW 'e'
-#define SUPPORT 's'
-#define SUPPORT_QUEUE_ROW 'u'
-#define SUPPORT_QUEUE_NAME_ROW 'p'
-#define SUPPORT_EXP_QUEUE_ROW 'x'
-
 uint256 getValueHash(const COutPoint& outPoint, int nHeightOfLastTakeover);

 struct CClaimValue
 {
    COutPoint outPoint;
    uint160 claimId;
-    CAmount nAmount = 0;
-    CAmount nEffectiveAmount = 0;
-    int nHeight = 0;
-    int nValidAtHeight = 0;
+    CAmount nAmount;
+    CAmount nEffectiveAmount;
+    int nHeight;
+    int nValidAtHeight;

    CClaimValue() = default;

@ -62,6 +50,7 @@ struct CClaimValue
        READWRITE(nAmount);
        READWRITE(nHeight);
        READWRITE(nValidAtHeight);
+        READWRITE(nEffectiveAmount);
    }

    bool operator<(const CClaimValue& other) const
@ -92,9 +81,9 @@ struct CSupportValue
 {
    COutPoint outPoint;
    uint160 supportedClaimId;
-    CAmount nAmount = 0;
-    int nHeight = 0;
-    int nValidAtHeight = 0;
+    CAmount nAmount;
+    int nHeight;
+    int nValidAtHeight;

    CSupportValue() = default;

@ -158,17 +147,6 @@ struct CClaimTrieData
    inline void SerializationOp(Stream& s, Operation ser_action)
    {
        READWRITE(hash);
-
-        if (ser_action.ForRead()) {
-            if (s.eof()) {
-                claims.clear();
-                nHeightOfLastTakeover = 0;
-                return;
-            }
-        }
-        else if (claims.empty())
-            return;
-
        READWRITE(claims);
        READWRITE(nHeightOfLastTakeover);
    }
@ -189,10 +167,34 @@ struct CClaimTrieData
    }
 };

+struct CClaimTrieDataNode {
+    CClaimTrieData data;
+    // we're using a vector to avoid RAM thrashing and for faster serialization ops.
+    // We're assuming its data is inserted in order and never modified.
+    std::vector<std::pair<std::string, uint256>> children;
+    bool childrenSerialization = true;
+
+    CClaimTrieDataNode() = default;
+    CClaimTrieDataNode(CClaimTrieDataNode&&) = default;
+    CClaimTrieDataNode(const CClaimTrieDataNode&) = default;
+    CClaimTrieDataNode& operator=(CClaimTrieDataNode&&) = default;
+    CClaimTrieDataNode& operator=(const CClaimTrieDataNode& d) = default;
+
+    ADD_SERIALIZE_METHODS;
+
+    template <typename Stream, typename Operation>
+    inline void SerializationOp(Stream& s, Operation ser_action)
+    {
+        READWRITE(data);
+        if (childrenSerialization) // wanting constexpr but hoping the compiler is smart enough anyway
+            READWRITE(children);
+    }
+};
+
 struct COutPointHeightType
 {
    COutPoint outPoint;
-    int nHeight = 0;
+    int nHeight;

    COutPointHeightType() = default;

@ -215,7 +217,7 @@ struct CNameOutPointHeightType
 {
    std::string name;
    COutPoint outPoint;
-    int nHeight = 0;
+    int nHeight;

    CNameOutPointHeightType() = default;

@ -284,73 +286,44 @@ struct CClaimIndexElement
    CClaimValue claim;
 };

-struct CClaimNsupports
+struct CClaimsForNameType
 {
-    CClaimNsupports() = default;
-    CClaimNsupports(CClaimNsupports&&) = default;
-    CClaimNsupports(const CClaimNsupports&) = default;
+    claimEntryType claims;
+    supportEntryType supports;
+    int nLastTakeoverHeight;
+    std::string name;

-    CClaimNsupports& operator=(CClaimNsupports&&) = default;
-    CClaimNsupports& operator=(const CClaimNsupports&) = default;
-
-    CClaimNsupports(const CClaimValue& claim, CAmount effectiveAmount, const std::vector<CSupportValue>& supports = {})
-        : claim(claim), effectiveAmount(effectiveAmount), supports(supports)
+    CClaimsForNameType(claimEntryType claims, supportEntryType supports, int nLastTakeoverHeight, std::string name)
+        : claims(std::move(claims)), supports(std::move(supports)), nLastTakeoverHeight(nLastTakeoverHeight), name(std::move(name))
    {
    }

-    bool IsNull() const
-    {
-        return claim.claimId.IsNull();
-    }
-
-    CClaimValue claim;
-    CAmount effectiveAmount = 0;
-    std::vector<CSupportValue> supports;
+    CClaimsForNameType(CClaimsForNameType&&) = default;
+    CClaimsForNameType(const CClaimsForNameType&) = default;
+    CClaimsForNameType& operator=(CClaimsForNameType&&) = default;
+    CClaimsForNameType& operator=(const CClaimsForNameType&) = default;
 };

-static const CClaimNsupports invalid;
-
-struct CClaimSupportToName
+class CClaimTrie
 {
-    CClaimSupportToName(const std::string& name, int nLastTakeoverHeight, std::vector<CClaimNsupports> claimsNsupports, std::vector<CSupportValue> unmatchedSupports)
-        : name(name), nLastTakeoverHeight(nLastTakeoverHeight), claimsNsupports(std::move(claimsNsupports)), unmatchedSupports(std::move(unmatchedSupports))
-    {
-    }
+    int nNextHeight = 0;
+    int nProportionalDelayFactor = 0;
+    std::unique_ptr<CDBWrapper> db_TRIE_NODE_BY_HASH;
+    std::unique_ptr<CDBWrapper> db_TRIE_NODE_BY_NAME;
+    std::unique_ptr<CDBWrapper> db_CLAIM_BY_ID;
+    std::unique_ptr<CDBWrapper> db_CLAIM_EXP_QUEUE_ROW;
+    std::unique_ptr<CDBWrapper> db_CLAIM_QUEUE_ROW;
+    std::unique_ptr<CDBWrapper> db_CLAIM_QUEUE_NAME_ROW;
+    std::unique_ptr<CDBWrapper> db_SUPPORT_EXP_QUEUE_ROW;
+    std::unique_ptr<CDBWrapper> db_SUPPORT_QUEUE_ROW;
+    std::unique_ptr<CDBWrapper> db_SUPPORT_QUEUE_NAME_ROW;
+    std::unique_ptr<CDBWrapper> db_SUPPORT;

-    const CClaimNsupports& find(const uint160& claimId) const
-    {
-        auto it = std::find_if(claimsNsupports.begin(), claimsNsupports.end(), [&claimId](const CClaimNsupports& value) {
-            return claimId == value.claim.claimId;
-        });
-        return it != claimsNsupports.end() ? *it : invalid;
-    }
-
-    const CClaimNsupports& find(const std::string& partialId) const
-    {
-        std::string lowered(partialId);
-        for (auto& c: lowered)
-            c = std::tolower(c);
-
-        auto it = std::find_if(claimsNsupports.begin(), claimsNsupports.end(), [&lowered](const CClaimNsupports& value) {
-            return value.claim.claimId.GetHex().find(lowered) == 0;
-        });
-        return it != claimsNsupports.end() ? *it : invalid;
-    }
-
-    const std::string name;
-    const int nLastTakeoverHeight;
-    const std::vector<CClaimNsupports> claimsNsupports;
-    const std::vector<CSupportValue> unmatchedSupports;
-};
-
-class CClaimTrie : public CPrefixTrie<std::string, CClaimTrieData>
-{
 public:
    CClaimTrie() = default;
-    virtual ~CClaimTrie() = default;
    CClaimTrie(CClaimTrie&&) = delete;
    CClaimTrie(const CClaimTrie&) = delete;
-    CClaimTrie(bool fMemory, bool fWipe, int proportionalDelayFactor = 32, std::size_t cacheMB=200);
+    CClaimTrie(bool fMemory, bool fWipe, int proportionalDelayFactor = 32);

    CClaimTrie& operator=(CClaimTrie&&) = delete;
    CClaimTrie& operator=(const CClaimTrie&) = delete;
@ -361,17 +334,19 @@ public:
    friend struct ClaimTrieChainFixture;
    friend class CClaimTrieCacheExpirationFork;
    friend class CClaimTrieCacheNormalizationFork;
-    friend bool getClaimById(const uint160&, std::string&, CClaimValue*);
-    friend bool getClaimById(const std::string&, std::string&, CClaimValue*);

    std::size_t getTotalNamesInTrie() const;
    std::size_t getTotalClaimsInTrie() const;
    CAmount getTotalValueOfClaimsInTrie(bool fControllingOnly) const;
+    bool checkConsistency(const uint256& rootHash) const;

-protected:
-    int nNextHeight = 0;
-    int nProportionalDelayFactor = 0;
-    std::unique_ptr<CDBWrapper> db;
+    bool contains(const std::string& key) const;
+    bool empty() const;
+    bool find(const uint256& key, CClaimTrieDataNode& node) const;
+    bool find(const std::string& key, CClaimTrieDataNode& node) const;
+
+    std::vector<std::pair<std::string, CClaimTrieDataNode>> nodes(const std::string& key) const;
+    void recurseAllHashedNodes(const std::string& name, const CClaimTrieDataNode& current, std::function<void(const std::string&, const CClaimTrieDataNode&)> function) const;
 };

 struct CClaimTrieProofNode
@ -394,66 +369,21 @@ struct CClaimTrieProofNode
 struct CClaimTrieProof
 {
    CClaimTrieProof() = default;
+
+    CClaimTrieProof(std::vector<CClaimTrieProofNode> nodes, bool hasValue, const COutPoint& outPoint, int nHeightOfLastTakeover)
+        : nodes(std::move(nodes)), hasValue(hasValue), outPoint(outPoint), nHeightOfLastTakeover(nHeightOfLastTakeover)
+    {
+    }
+
    CClaimTrieProof(CClaimTrieProof&&) = default;
    CClaimTrieProof(const CClaimTrieProof&) = default;
    CClaimTrieProof& operator=(CClaimTrieProof&&) = default;
    CClaimTrieProof& operator=(const CClaimTrieProof&) = default;

-    std::vector<std::pair<bool, uint256>> pairs;
    std::vector<CClaimTrieProofNode> nodes;
-    int nHeightOfLastTakeover = 0;
-    bool hasValue = false;
+    bool hasValue;
    COutPoint outPoint;
-};
-
-template <typename T>
-class COptional
-{
-    bool own;
-    T* value;
-public:
-    COptional(T* value = nullptr) : own(false), value(value) {}
-    COptional(COptional&& o)
-    {
-        own = o.own;
-        value = o.value;
-        o.own = false;
-        o.value = nullptr;
-    }
-    COptional(T&& o) : own(true)
-    {
-        value = new T(std::move(o));
-    }
-    ~COptional()
-    {
-        if (own)
-            delete value;
-    }
-    COptional& operator=(COptional&&) = delete;
-    bool unique() const
-    {
-        return own;
-    }
-    operator bool() const
-    {
-        return value;
-    }
-    operator T*() const
-    {
-        return value;
-    }
-    T* operator->() const
-    {
-        return value;
-    }
-    operator T&() const
-    {
-        return *value;
-    }
-    T& operator*() const
-    {
-        return *value;
-    }
+    int nHeightOfLastTakeover;
 };

 template <typename T>
@ -476,6 +406,8 @@ typedef std::map<int, expirationQueueRowType> expirationQueueType;
 typedef std::set<CClaimValue> claimIndexClaimListType;
 typedef std::vector<CClaimIndexElement> claimIndexElementListType;

+typedef CPrefixTrie<std::string, CClaimTrieData> CClaimPrefixTrie;
+
 class CClaimTrieCacheBase
 {
 public:
@ -484,16 +416,17 @@ public:

    uint256 getMerkleHash();

+    bool getClaimById(const uint160& claimId, std::string& name, CClaimValue& claim) const;
+
    bool flush();
    bool empty() const;
-    bool checkConsistency() const;
    bool ReadFromDisk(const CBlockIndex* tip);

    bool haveClaim(const std::string& name, const COutPoint& outPoint) const;
-    bool haveClaimInQueue(const std::string& name, const COutPoint& outPoint, int& nValidAtHeight) const;
+    bool haveClaimInQueue(const std::string& name, const COutPoint& outPoint, int& nValidAtHeight);

    bool haveSupport(const std::string& name, const COutPoint& outPoint) const;
-    bool haveSupportInQueue(const std::string& name, const COutPoint& outPoint, int& nValidAtHeight) const;
+    bool haveSupportInQueue(const std::string& name, const COutPoint& outPoint, int& nValidAtHeight);

    bool addClaim(const std::string& name, const COutPoint& outPoint, const uint160& claimId, CAmount nAmount, int nHeight);
    bool undoAddClaim(const std::string& name, const COutPoint& outPoint, int nHeight);
@ -523,24 +456,25 @@ public:

    virtual int expirationTime() const;

-    virtual bool finalizeDecrement(std::vector<std::pair<std::string, int>>& takeoverHeightUndo);
+    bool finalizeDecrement(std::vector<std::pair<std::string, int>>& takeoverHeightUndo);

-    virtual CClaimSupportToName getClaimsForName(const std::string& name) const;
+    virtual CClaimsForNameType getClaimsForName(const std::string& name) const;

-    CClaimTrie::const_iterator find(const std::string& name) const;
-    void iterate(std::function<void(const std::string&, const CClaimTrieData&)> callback) const;
+    CAmount getEffectiveAmountForClaim(const std::string& name, const uint160& claimId, std::vector<CSupportValue>* supports = nullptr) const;
+    CAmount getEffectiveAmountForClaim(const CClaimsForNameType& claims, const uint160& claimId, std::vector<CSupportValue>* supports = nullptr) const;

-    void dumpToLog(CClaimTrie::const_iterator it, bool diffFromBase = true) const;
+    CClaimPrefixTrie::const_iterator begin() const;
+    CClaimPrefixTrie::const_iterator end() const;
+
+    void dumpToLog(CClaimPrefixTrie::const_iterator it, bool diffFromBase = true) const;
    virtual std::string adjustNameForValidHeight(const std::string& name, int validHeight) const;

 protected:
    CClaimTrie* base;
-    CClaimTrie nodesToAddOrUpdate; // nodes pulled in from base (and possibly modified thereafter), written to base on flush
-    std::unordered_set<std::string> nodesAlreadyCached; // set of nodes already pulled into cache from base
+    CClaimPrefixTrie nodesToAddOrUpdate; // nodes pulled in from base (and possibly modified thereafter), written to base on flush
    std::unordered_set<std::string> namesToCheckForTakeover; // takeover numbers are updated on increment

-    virtual uint256 recursiveComputeMerkleHash(CClaimTrie::iterator& it);
-    virtual bool recursiveCheckConsistency(CClaimTrie::const_iterator& it, std::string& failed) const;
+    uint256 recursiveComputeMerkleHash(CClaimPrefixTrie::iterator& it);

    virtual bool insertClaimIntoTrie(const std::string& name, const CClaimValue& claim, bool fCheckTakeover);
    virtual bool removeClaimFromTrie(const std::string& name, const COutPoint& outPoint, CClaimValue& claim, bool fCheckTakeover);
@ -553,7 +487,7 @@ protected:
    int getDelayForName(const std::string& name) const;
    virtual int getDelayForName(const std::string& name, const uint160& claimId) const;

-    CClaimTrie::iterator cacheData(const std::string& name, bool create = true);
+    CClaimPrefixTrie::iterator cacheData(const std::string& name, bool create = true);

    bool getLastTakeoverForName(const std::string& name, uint160& claimId, int& takeoverHeight) const;

@ -582,8 +516,10 @@ private:

    std::unordered_map<std::string, supportEntryType> supportCache;  // to be added/updated to base (and disk) on flush
    std::unordered_set<std::string> nodesToDelete; // to be removed from base (and disk) on flush
+    std::unordered_set<std::string> nodesAlreadyCached; // set of nodes already pulled into cache from base
    std::unordered_map<std::string, bool> takeoverWorkaround;
    std::unordered_set<std::string> removalWorkaround;
+    std::unordered_set<std::string> dirtyNodes;

    bool shouldUseTakeoverWorkaround(const std::string& key) const;
    void addTakeoverWorkaroundPotential(const std::string& key);
@ -595,26 +531,19 @@ private:
    bool removeSupport(const std::string& name, const COutPoint& outPoint, int nHeight, int& nValidAtHeight, bool fCheckTakeover);
    bool removeClaim(const std::string& name, const COutPoint& outPoint, int nHeight, int& nValidAtHeight, bool fCheckTakeover);

-    template <typename T>
-    void insertRowsFromQueue(std::vector<T>& result, const std::string& name) const;
+    bool validateTrieConsistency(const CBlockIndex* tip);

    template <typename T>
-    std::vector<queueEntryType<T>>* getQueueCacheRow(int nHeight, bool createIfNotExists);
+    std::pair<const int, std::vector<queueEntryType<T>>>* getQueueCacheRow(int nHeight, bool createIfNotExists = false);

    template <typename T>
-    COptional<const std::vector<queueEntryType<T>>> getQueueCacheRow(int nHeight) const;
+    typename queueNameType::value_type* getQueueCacheNameRow(const std::string& name, bool createIfNotExists = false);

    template <typename T>
-    queueNameRowType* getQueueCacheNameRow(const std::string& name, bool createIfNotExists);
+    typename expirationQueueType::value_type* getExpirationQueueCacheRow(int nHeight, bool createIfNotExists = false);

    template <typename T>
-    COptional<const queueNameRowType> getQueueCacheNameRow(const std::string& name) const;
-
-    template <typename T>
-    expirationQueueRowType* getExpirationQueueCacheRow(int nHeight, bool createIfNotExists);
-
-    template <typename T>
-    bool haveInQueue(const std::string& name, const COutPoint& outPoint, int& nValidAtHeight) const;
+    bool haveInQueue(const std::string& name, const COutPoint& outPoint, int& nValidAtHeight);

    template <typename T>
    T add(const std::string& name, const COutPoint& outPoint, const uint160& claimId, CAmount nAmount, int nHeight);
@ -662,8 +591,7 @@ public:
    void setExpirationTime(int time);
    int expirationTime() const override;

-    virtual void initializeIncrement();
-    bool finalizeDecrement(std::vector<std::pair<std::string, int>>& takeoverHeightUndo) override;
+    void expirationForkActive(int height, bool increment);

    bool incrementBlock(insertUndoType& insertUndo,
        claimQueueRowType& expireUndo,
@ -708,7 +636,7 @@ public:

    bool getProofForName(const std::string& name, CClaimTrieProof& proof) override;
    bool getInfoForName(const std::string& name, CClaimValue& claim) const override;
-    CClaimSupportToName getClaimsForName(const std::string& name) const override;
+    CClaimsForNameType getClaimsForName(const std::string& name) const override;
    std::string adjustNameForValidHeight(const std::string& name, int validHeight) const override;

 protected:
@ -731,26 +659,6 @@ private:
        std::vector<std::pair<std::string, int>>& takeoverHeightUndo);
 };

-class CClaimTrieCacheHashFork : public CClaimTrieCacheNormalizationFork
-{
-public:
-    explicit CClaimTrieCacheHashFork(CClaimTrie* base);
-
-    bool getProofForName(const std::string& name, CClaimTrieProof& proof) override;
-    bool getProofForName(const std::string& name, CClaimTrieProof& proof, const std::function<bool(const CClaimValue&)>& comp);
-    void initializeIncrement() override;
-    bool finalizeDecrement(std::vector<std::pair<std::string, int>>& takeoverHeightUndo) override;
-
-    bool allowSupportMetadata() const;
-
-protected:
-    uint256 recursiveComputeMerkleHash(CClaimTrie::iterator& it) override;
-    bool recursiveCheckConsistency(CClaimTrie::const_iterator& it, std::string& failed) const override;
-
-private:
-    void copyAllBaseToCache();
-};
-
-typedef CClaimTrieCacheHashFork CClaimTrieCache;
+typedef CClaimTrieCacheNormalizationFork CClaimTrieCache;

 #endif // BITCOIN_CLAIMTRIE_H
--- a/src/claimtrieforks.cpp
+++ b/src/claimtrieforks.cpp
@ -1,9 +1,9 @@

-#include <consensus/merkle.h>
 #include <chainparams.h>
 #include <claimtrie.h>
-#include <hash.h>

+#include <boost/algorithm/string.hpp>
+#include <boost/foreach.hpp>
 #include <boost/locale.hpp>
 #include <boost/locale/conversion.hpp>
 #include <boost/locale/localization_backend.hpp>
@ -44,21 +44,10 @@ bool CClaimTrieCacheExpirationFork::decrementBlock(insertUndoType& insertUndo, c
    return false;
 }

-void CClaimTrieCacheExpirationFork::initializeIncrement()
+void CClaimTrieCacheExpirationFork::expirationForkActive(int nHeight, bool increment)
 {
-    // we could do this in the constructor, but that would not allow for multiple increments in a row (as done in unit tests)
-    if (nNextHeight != Params().GetConsensus().nExtendedClaimExpirationForkHeight)
-        return;
-
-    forkForExpirationChange(true);
-}
-
-bool CClaimTrieCacheExpirationFork::finalizeDecrement(std::vector<std::pair<std::string, int>>& takeoverHeightUndo)
-{
-    auto ret = CClaimTrieCacheBase::finalizeDecrement(takeoverHeightUndo);
-    if (ret && nNextHeight == Params().GetConsensus().nExtendedClaimExpirationForkHeight)
-       forkForExpirationChange(false);
-    return ret;
+    if (nHeight == Params().GetConsensus().nExtendedClaimExpirationForkHeight)
+        forkForExpirationChange(increment);
 }

 bool CClaimTrieCacheExpirationFork::forkForExpirationChange(bool increment)
@ -72,29 +61,31 @@ bool CClaimTrieCacheExpirationFork::forkForExpirationChange(bool increment)
    */

    //look through db for expiration queues, if we haven't already found it in dirty expiration queue
-    boost::scoped_ptr<CDBIterator> pcursor(base->db->NewIterator());
-    for (pcursor->SeekToFirst(); pcursor->Valid(); pcursor->Next()) {
-        std::pair<uint8_t, int> key;
-        if (!pcursor->GetKey(key))
+    boost::scoped_ptr<CDBIterator> pcursor_ceqr(base->db_CLAIM_EXP_QUEUE_ROW->NewIterator());
+    for (pcursor_ceqr->SeekToFirst(); pcursor_ceqr->Valid(); pcursor_ceqr->Next()) {
+        int height;
+        if (!pcursor_ceqr->GetKey(height))
            continue;
-        int height = key.second;
-        if (key.first == CLAIM_EXP_QUEUE_ROW) {
        expirationQueueRowType row;
-            if (pcursor->GetValue(row)) {
+        if (pcursor_ceqr->GetValue(row)) {
            reactivateClaim(row, height, increment);
        } else {
            return error("%s(): error reading expiration queue rows from disk", __func__);
        }
-        } else if (key.first == SUPPORT_EXP_QUEUE_ROW) {
+    }
+
+    boost::scoped_ptr<CDBIterator> pcursor_seqr(base->db_SUPPORT_EXP_QUEUE_ROW->NewIterator());
+    for (pcursor_seqr->SeekToFirst(); pcursor_seqr->Valid(); pcursor_seqr->Next()) {
+        int height;
+        if (!pcursor_seqr->GetKey(height))
+            continue;
        expirationQueueRowType row;
-            if (pcursor->GetValue(row)) {
+        if (pcursor_seqr->GetValue(row)) {
            reactivateSupport(row, height, increment);
        } else {
            return error("%s(): error reading support expiration queue rows from disk", __func__);
        }
    }
-    }
-
    return true;
 }

@ -172,12 +163,16 @@ bool CClaimTrieCacheNormalizationFork::normalizeAllNamesInTrieIfNecessary(insert
    // run the one-time upgrade of all names that need to change
    // it modifies the (cache) trie as it goes, so we need to grab everything to be modified first

-    for (auto it = base->cbegin(); it != base->cend(); ++it) {
-        const std::string normalized = normalizeClaimName(it.key(), true);
-        if (normalized == it.key())
+    boost::scoped_ptr<CDBIterator> pcursor(base->db_TRIE_NODE_BY_NAME->NewIterator());
+    for (pcursor->SeekToFirst(); pcursor->Valid(); pcursor->Next()) {
+        std::string name;
+        if (!pcursor->GetKey(name))
+            continue;
+
+        const std::string normalized = normalizeClaimName(name, true);
+        if (normalized == name)
            continue;

-        auto& name = it.key();
        auto supports = getSupportsForName(name);
        for (auto support : supports) {
            // if it's already going to expire just skip it
@ -239,7 +234,7 @@ bool CClaimTrieCacheNormalizationFork::getInfoForName(const std::string& name, C
    return CClaimTrieCacheExpirationFork::getInfoForName(normalizeClaimName(name), claim);
 }

-CClaimSupportToName CClaimTrieCacheNormalizationFork::getClaimsForName(const std::string& name) const
+CClaimsForNameType CClaimTrieCacheNormalizationFork::getClaimsForName(const std::string& name) const
 {
    return CClaimTrieCacheExpirationFork::getClaimsForName(normalizeClaimName(name));
 }
@ -253,229 +248,3 @@ std::string CClaimTrieCacheNormalizationFork::adjustNameForValidHeight(const std
 {
    return normalizeClaimName(name, validHeight > Params().GetConsensus().nNormalizedNameForkHeight);
 }
-
-CClaimTrieCacheHashFork::CClaimTrieCacheHashFork(CClaimTrie* base) : CClaimTrieCacheNormalizationFork(base)
-{
-}
-
-static const uint256 leafHash = uint256S("0000000000000000000000000000000000000000000000000000000000000002");
-static const uint256 emptyHash = uint256S("0000000000000000000000000000000000000000000000000000000000000003");
-
-std::vector<uint256> getClaimHashes(const CClaimTrieData& data)
-{
-    std::vector<uint256> hashes;
-    for (auto& claim : data.claims)
-        hashes.push_back(getValueHash(claim.outPoint, data.nHeightOfLastTakeover));
-    return hashes;
-}
-
-template <typename T>
-using iCbType = std::function<uint256(T&)>;
-
-template <typename TIterator>
-uint256 recursiveBinaryTreeHash(TIterator& it, const iCbType<TIterator>& process)
-{
-    std::vector<uint256> childHashes;
-    for (auto& child : it.children())
-        childHashes.emplace_back(process(child));
-
-    std::vector<uint256> claimHashes;
-    if (!it->empty())
-        claimHashes = getClaimHashes(it.data());
-    else if (!it.hasChildren())
-        return {};
-
-    auto left = childHashes.empty() ? leafHash : ComputeMerkleRoot(childHashes);
-    auto right = claimHashes.empty() ? emptyHash : ComputeMerkleRoot(claimHashes);
-
-    return Hash(left.begin(), left.end(), right.begin(), right.end());
-}
-
-uint256 CClaimTrieCacheHashFork::recursiveComputeMerkleHash(CClaimTrie::iterator& it)
-{
-    if (nNextHeight < Params().GetConsensus().nAllClaimsInMerkleForkHeight)
-        return CClaimTrieCacheNormalizationFork::recursiveComputeMerkleHash(it);
-
-    using iterator = CClaimTrie::iterator;
-    iCbType<iterator> process = [&process](iterator& it) -> uint256 {
-        if (it->hash.IsNull())
-            it->hash = recursiveBinaryTreeHash(it, process);
-        assert(!it->hash.IsNull());
-        return it->hash;
-    };
-    return process(it);
-}
-
-bool CClaimTrieCacheHashFork::recursiveCheckConsistency(CClaimTrie::const_iterator& it, std::string& failed) const
-{
-    if (nNextHeight < Params().GetConsensus().nAllClaimsInMerkleForkHeight)
-        return CClaimTrieCacheNormalizationFork::recursiveCheckConsistency(it, failed);
-
-    struct CRecursiveBreak {};
-    using iterator = CClaimTrie::const_iterator;
-    iCbType<iterator> process = [&failed, &process](iterator& it) -> uint256 {
-        if (it->hash.IsNull() || it->hash != recursiveBinaryTreeHash(it, process)) {
-            failed = it.key();
-            throw CRecursiveBreak();
-        }
-        return it->hash;
-    };
-
-    try {
-        process(it);
-    } catch (const CRecursiveBreak&) {
-        return false;
-    }
-    return true;
-}
-
-std::vector<uint256> ComputeMerklePath(const std::vector<uint256>& hashes, uint32_t idx)
-{
-    uint32_t count = 0;
-    int matchlevel = -1;
-    bool matchh = false;
-    uint256 inner[32], h;
-    const uint32_t one = 1;
-    std::vector<uint256> res;
-
-    const auto iterateInner = [&](int& level) {
-        for (; !(count & (one << level)); level++) {
-            const auto& ihash = inner[level];
-            if (matchh) {
-                res.push_back(ihash);
-            } else if (matchlevel == level) {
-                res.push_back(h);
-                matchh = true;
-            }
-            h = Hash(ihash.begin(), ihash.end(), h.begin(), h.end());
-        }
-    };
-
-    while (count < hashes.size()) {
-        h = hashes[count];
-        matchh = count == idx;
-        count++;
-        int level = 0;
-        iterateInner(level);
-        // Store the resulting hash at inner position level.
-        inner[level] = h;
-        if (matchh)
-            matchlevel = level;
-    }
-
-    int level = 0;
-    while (!(count & (one << level)))
-        level++;
-
-    h = inner[level];
-    matchh = matchlevel == level;
-
-    while (count != (one << level)) {
-        // If we reach this point, h is an inner value that is not the top.
-        if (matchh)
-            res.push_back(h);
-
-        h = Hash(h.begin(), h.end(), h.begin(), h.end());
-        // Increment count to the value it would have if two entries at this
-        count += (one << level);
-        level++;
-        iterateInner(level);
-    }
-    return res;
-}
-
-bool CClaimTrieCacheHashFork::getProofForName(const std::string& name, CClaimTrieProof& proof)
-{
-    return getProofForName(name, proof, nullptr);
-}
-
-bool CClaimTrieCacheHashFork::getProofForName(const std::string& name, CClaimTrieProof& proof, const std::function<bool(const CClaimValue&)>& comp)
-{
-    if (nNextHeight < Params().GetConsensus().nAllClaimsInMerkleForkHeight)
-        return CClaimTrieCacheNormalizationFork::getProofForName(name, proof);
-
-    auto fillPairs = [&proof](const std::vector<uint256>& hashes, uint32_t idx) {
-        auto partials = ComputeMerklePath(hashes, idx);
-        for (int i = partials.size() - 1; i >= 0; --i)
-            proof.pairs.emplace_back((idx >> i) & 1, partials[i]);
-    };
-
-    // cache the parent nodes
-    cacheData(name, false);
-    getMerkleHash();
-    proof = CClaimTrieProof();
-    for (auto& it : static_cast<const CClaimTrie&>(nodesToAddOrUpdate).nodes(name)) {
-        std::vector<uint256> childHashes;
-        uint32_t nextCurrentIdx = 0;
-        for (auto& child : it.children()) {
-            if (name.find(child.key()) == 0)
-                nextCurrentIdx = uint32_t(childHashes.size());
-            childHashes.push_back(child->hash);
-        }
-
-        std::vector<uint256> claimHashes;
-        if (!it->empty())
-            claimHashes = getClaimHashes(it.data());
-
-        // I am on a node; I need a hash(children, claims)
-        // if I am the last node on the list, it will be hash(children, x)
-        // else it will be hash(x, claims)
-        if (it.key() == name) {
-            uint32_t nClaimIndex = 0;
-            auto& claims = it->claims;
-            auto itClaim = !comp ? claims.begin() : std::find_if(claims.begin(), claims.end(), comp);
-            if (itClaim != claims.end()) {
-                proof.hasValue = true;
-                proof.outPoint = itClaim->outPoint;
-                proof.nHeightOfLastTakeover = it->nHeightOfLastTakeover;
-                nClaimIndex = std::distance(claims.begin(), itClaim);
-            }
-            auto hash = childHashes.empty() ? leafHash : ComputeMerkleRoot(childHashes);
-            proof.pairs.emplace_back(true, hash);
-            if (!claimHashes.empty())
-                fillPairs(claimHashes, nClaimIndex);
-        } else {
-            auto hash = claimHashes.empty() ? emptyHash : ComputeMerkleRoot(claimHashes);
-            proof.pairs.emplace_back(false, hash);
-            if (!childHashes.empty())
-                fillPairs(childHashes, nextCurrentIdx);
-        }
-    }
-    std::reverse(proof.pairs.begin(), proof.pairs.end());
-    return true;
-}
-
-void CClaimTrieCacheHashFork::copyAllBaseToCache()
-{
-    for (auto it = base->cbegin(); it != base->cend(); ++it)
-        if (nodesAlreadyCached.insert(it.key()).second)
-            nodesToAddOrUpdate.insert(it.key(), it.data());
-
-    for (auto it = nodesToAddOrUpdate.begin(); it != nodesToAddOrUpdate.end(); ++it)
-        it->hash.SetNull();
-}
-
-void CClaimTrieCacheHashFork::initializeIncrement()
-{
-    CClaimTrieCacheNormalizationFork::initializeIncrement();
-    // we could do this in the constructor, but that would not allow for multiple increments in a row (as done in unit tests)
-    if (nNextHeight != Params().GetConsensus().nAllClaimsInMerkleForkHeight - 1)
-        return;
-
-    // if we are forking, we load the entire base trie into the cache trie
-    // we reset its hash computation so it can be recomputed completely
-    copyAllBaseToCache();
-}
-
-bool CClaimTrieCacheHashFork::finalizeDecrement(std::vector<std::pair<std::string, int>>& takeoverHeightUndo)
-{
-    auto ret = CClaimTrieCacheNormalizationFork::finalizeDecrement(takeoverHeightUndo);
-    if (ret && nNextHeight == Params().GetConsensus().nAllClaimsInMerkleForkHeight - 1)
-        copyAllBaseToCache();
-    return ret;
-}
-
-bool CClaimTrieCacheHashFork::allowSupportMetadata() const
-{
-    return nNextHeight >= Params().GetConsensus().nAllClaimsInMerkleForkHeight;
-}
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@ -81,8 +81,6 @@ struct Params {
    int nMinTakeoverWorkaroundHeight;
    int nMaxTakeoverWorkaroundHeight;

-    int nWitnessForkHeight;
-
    int64_t nPowTargetSpacing;
    int64_t nPowTargetTimespan;
    /** how long it took claims to expire before the hard fork */
@ -96,8 +94,6 @@ struct Params {
            nOriginalClaimExpirationTime :
            nExtendedClaimExpirationTime;
    }
-    /** blocks before the hard fork that adds all claims into the merkle hash */
-    int64_t nAllClaimsInMerkleForkHeight;
    int64_t DifficultyAdjustmentInterval() const { return nPowTargetTimespan / nPowTargetSpacing; }
    uint256 nMinimumChainWork;
    uint256 defaultAssumeValid;
--- a/src/consensus/tx_verify.cpp
+++ b/src/consensus/tx_verify.cpp
@ -154,8 +154,7 @@ int64_t GetTransactionSigOpCost(const CTransaction& tx, const CCoinsViewCache& i
        const Coin& coin = inputs.AccessCoin(tx.vin[i].prevout);
        assert(!coin.IsSpent());
        const CTxOut &prevout = coin.out;
-        const CScript& scriptPubKey = StripClaimScriptPrefix(prevout.scriptPubKey);
-        nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, scriptPubKey, &tx.vin[i].scriptWitness, flags);
+        nSigOps += CountWitnessSigOps(tx.vin[i].scriptSig, prevout.scriptPubKey, &tx.vin[i].scriptWitness, flags);
    }
    return nSigOps;
 }
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@ -15,7 +15,6 @@
 #include <util.h>
 #include <utilmoneystr.h>
 #include <utilstrencodings.h>
-#include <nameclaim.h>

 UniValue ValueFromAmount(const CAmount& amount)
 {
@ -148,20 +147,12 @@ void ScriptToUniv(const CScript& script, UniValue& out, bool include_address)
    out.pushKV("hex", HexStr(script.begin(), script.end()));

    std::vector<std::vector<unsigned char>> solns;
-    txnouttype type; int claimOp;
-    auto stripped = StripClaimScriptPrefix(script, claimOp);
-    Solver(stripped, type, solns);
-    if (claimOp >= 0) {
-        out.pushKV("isclaim", UniValue(claimOp == OP_CLAIM_NAME || claimOp == OP_UPDATE_CLAIM));
-        out.pushKV("issupport", UniValue(claimOp == OP_SUPPORT_CLAIM));
-        out.pushKV("subtype", GetTxnOutputType(type));
-        out.pushKV("type", GetTxnOutputType(TX_NONSTANDARD)); // trying to keep backwards compatibility
-    }
-    else
-        out.pushKV("type", GetTxnOutputType(type)); // trying to keep backwards compatibility
+    txnouttype type;
+    Solver(script, type, solns);
+    out.pushKV("type", GetTxnOutputType(type));

    CTxDestination address;
-    if (include_address && ExtractDestination(stripped, address)) {
+    if (include_address && ExtractDestination(script, address)) {
        out.pushKV("address", EncodeDestination(address));
    }
 }
@ -177,28 +168,19 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey,
    if (fIncludeHex)
        out.pushKV("hex", HexStr(scriptPubKey.begin(), scriptPubKey.end()));

-    int claimOp;
-    auto stripped = StripClaimScriptPrefix(scriptPubKey, claimOp);
-    auto extracted = ExtractDestinations(stripped, type, addresses, nRequired);
-    if (extracted)
-        out.pushKV("reqSigs", nRequired);
-
-    if (claimOp >= 0) {
-        out.pushKV("isclaim", UniValue(claimOp == OP_CLAIM_NAME || claimOp == OP_UPDATE_CLAIM));
-        out.pushKV("issupport", UniValue(claimOp == OP_SUPPORT_CLAIM));
-        out.pushKV("subtype", GetTxnOutputType(type));
-        out.pushKV("type", GetTxnOutputType(TX_NONSTANDARD));
+    if (!ExtractDestinations(scriptPubKey, type, addresses, nRequired)) {
+        out.pushKV("type", GetTxnOutputType(type));
+        return;
    }
-    else
+
+    out.pushKV("reqSigs", nRequired);
    out.pushKV("type", GetTxnOutputType(type));

-    if (extracted) {
    UniValue a(UniValue::VARR);
-        for (const CTxDestination &addr : addresses) {
+    for (const CTxDestination& addr : addresses) {
        a.push_back(EncodeDestination(addr));
    }
    out.pushKV("addresses", a);
-    }
 }

 void TxToUniv(const CTransaction& tx, const uint256& hashBlock, UniValue& entry, bool include_hex, int serialize_flags)
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@ -80,14 +80,14 @@ static void SetMaxOpenFiles(leveldb::Options *options) {
    // implementation that does not use extra file descriptors (the fds are
    // closed after being mmaped).
    //
-    // Increasing the value beyond the nmap count is dangerous because LevelDB will
-    // fall back to a non-mmap implementation when the file count is too large (thus contending select()).
+    // Increasing the value beyond the default is dangerous because LevelDB will
+    // fall back to a non-mmap implementation when the file count is too large.
    // On 32-bit Unix host we should decrease the value because the handles use
    // up real fds, and we want to avoid fd exhaustion issues.
    //
    // See PR #12495 for further discussion.

-    int default_open_files = 400;
+    int default_open_files = options->max_open_files;
 #ifndef WIN32
    if (sizeof(void*) < 8) {
        options->max_open_files = 64;
@ -100,10 +100,10 @@ static void SetMaxOpenFiles(leveldb::Options *options) {
 static leveldb::Options GetOptions(size_t nCacheSize)
 {
    leveldb::Options options;
-    auto write_cache = std::min(nCacheSize / 4, size_t(32 * 1024 * 1024)); // cap write_cache
+    auto write_cache = std::min(nCacheSize / 4, size_t(16) << 20U); // cap write_cache at 16MB (4x default)
    options.block_cache = leveldb::NewLRUCache(nCacheSize - write_cache * 2);
    options.write_buffer_size = write_cache; // up to two write buffers may be held in memory simultaneously
-    options.filter_policy = leveldb::NewBloomFilterPolicy(12);
+    options.filter_policy = leveldb::NewBloomFilterPolicy(10);
    options.compression = leveldb::kNoCompression;
    options.info_log = new CBitcoinLevelDBLogger();
    if (leveldb::kMajorVersion > 1 || (leveldb::kMajorVersion == 1 && leveldb::kMinorVersion >= 16)) {
@ -181,16 +181,8 @@ CDBWrapper::~CDBWrapper()
    options.env = nullptr;
 }

-bool CDBWrapper::Sync() {
-    CDBBatch batch(*this);
-    return WriteBatch(batch, true);
-}
-
 bool CDBWrapper::WriteBatch(CDBBatch& batch, bool fSync)
 {
-    if (!pdb)
-        return false;
-
    const bool log_memory = LogAcceptCategory(BCLog::LEVELDB);
    double mem_before = 0;
    if (log_memory) {
@ -247,6 +239,11 @@ bool CDBIterator::Valid() const { return piter->Valid(); }
 void CDBIterator::SeekToFirst() { piter->SeekToFirst(); }
 void CDBIterator::Next() { piter->Next(); }

+bool CDBWrapper::Sync() {
+    CDBBatch batch(*this);
+    return WriteBatch(batch, true);
+}
+
 namespace dbwrapper_private {

 void HandleError(const leveldb::Status& status)
--- a/src/dbwrapper.h
+++ b/src/dbwrapper.h
@ -30,13 +30,13 @@ namespace dbwrapper_private {

 /** Handle database error by throwing dbwrapper_error exception.
 */
-    void HandleError(const leveldb::Status& status);
+void HandleError(const leveldb::Status& status);

 /** Work around circular dependency, as well as for testing in dbwrapper_tests.
 * Database obfuscation should be considered an implementation detail of the
 * specific database.
 */
-    const std::vector<unsigned char>& GetObfuscateKey(const CDBWrapper &w);
+const std::vector<unsigned char>& GetObfuscateKey(const CDBWrapper &w);

 };

@ -61,9 +61,10 @@ public:
    void SeekToFirst();

    template<typename K> void Seek(const K& key) {
-        CDataStream ssKey(SER_DISK, CLIENT_VERSION);
-        ssKey << key;
-        leveldb::Slice slKey(ssKey.data(), ssKey.size());
+        CDataStream ssKey1(SER_DISK, CLIENT_VERSION);
+        // ssKey1.reserve(parent.ssKey.capacity());
+        ssKey1 << key;
+        leveldb::Slice slKey(ssKey1.data(), ssKey1.size());
        piter->Seek(slKey);
    }

@ -151,7 +152,7 @@ public:
     *                        with a zero'd byte array.
     */
    CDBWrapper(const fs::path& path, size_t nCacheSize, bool fMemory = false, bool fWipe = false, bool obfuscate = false);
-    virtual ~CDBWrapper();
+    ~CDBWrapper();

    CDBWrapper(const CDBWrapper&) = delete;
    /* CDBWrapper& operator=(const CDBWrapper&) = delete; */
@ -159,7 +160,6 @@ public:
    template <typename K, typename V>
    bool Read(const K& key, V& value) const
    {
-        assert(ssKey.empty());
        ssKey << key;
        leveldb::Slice slKey(ssKey.data(), ssKey.size());

@ -233,8 +233,6 @@ public:
    size_t EstimateSize(const K& key_begin, const K& key_end) const
    {
        CDataStream ssKey1(SER_DISK, CLIENT_VERSION), ssKey2(SER_DISK, CLIENT_VERSION);
-        ssKey1.reserve(ssKey.capacity());
-        ssKey2.reserve(ssKey.capacity());
        ssKey1 << key_begin;
        ssKey2 << key_end;
        leveldb::Slice slKey1(ssKey1.data(), ssKey1.size());
@ -271,17 +269,12 @@ class CDBBatch
    leveldb::WriteBatch batch;

    size_t size_estimate;
-    CDataStream ssKey, ssValue;

 public:
    /**
     * @param[in] _parent   CDBWrapper that this batch is to be submitted to
     */
-    explicit CDBBatch(const CDBWrapper &_parent) : parent(_parent), size_estimate(0),
-        ssKey(SER_DISK, CLIENT_VERSION), ssValue(SER_DISK, CLIENT_VERSION) {
-        ssKey.reserve(parent.ssKey.capacity());
-        ssValue.reserve(parent.ssValue.capacity());
-    };
+    explicit CDBBatch(const CDBWrapper &_parent) : parent(_parent), size_estimate(0) { };

    void Clear()
    {
@ -292,14 +285,14 @@ public:
    template <typename K, typename V>
    void Write(const K& key, const V& value)
    {
-        assert(ssKey.empty());
-        ssKey << key;
-        leveldb::Slice slKey(ssKey.data(), ssKey.size());
+        assert(parent.ssKey.empty());
+        parent.ssKey << key;
+        leveldb::Slice slKey(parent.ssKey.data(), parent.ssKey.size());

-        assert(ssValue.empty());
-        ssValue << value;
-        ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
-        leveldb::Slice slValue(ssValue.data(), ssValue.size());
+        assert(parent.ssValue.empty());
+        parent.ssValue << value;
+        parent.ssValue.Xor(dbwrapper_private::GetObfuscateKey(parent));
+        leveldb::Slice slValue(parent.ssValue.data(), parent.ssValue.size());

        batch.Put(slKey, slValue);
        // LevelDB serializes writes as:
@ -310,15 +303,15 @@ public:
        // - byte[]: value
        // The formula below assumes the key and value are both less than 16k.
        size_estimate += 3 + (slKey.size() > 127) + slKey.size() + (slValue.size() > 127) + slValue.size();
-        ssKey.clear();
-        ssValue.clear();
+        parent.ssKey.clear();
+        parent.ssValue.clear();
    }

    template <typename K>
    void Erase(const K& key)
    {
-        ssKey << key;
-        leveldb::Slice slKey(ssKey.data(), ssKey.size());
+        parent.ssKey << key;
+        leveldb::Slice slKey(parent.ssKey.data(), parent.ssKey.size());

        batch.Delete(slKey);
        // LevelDB serializes erases as:
@ -327,7 +320,7 @@ public:
        // - byte[]: key
        // The formula below assumes the key is less than 16kB.
        size_estimate += 2 + (slKey.size() > 127) + slKey.size();
-        ssKey.clear();
+        parent.ssKey.clear();
    }

    size_t SizeEstimate() const { return size_estimate; }
--- a/src/index/base.h
+++ b/src/index/base.h
@ -28,8 +28,6 @@ protected:
        DB(const fs::path& path, size_t n_cache_size,
           bool f_memory = false, bool f_wipe = false, bool f_obfuscate = false);

-        ~DB() override {}
-
        /// Read block locator of the chain that the txindex is in sync with.
        bool ReadBestBlock(CBlockLocator& locator) const;

--- a/src/index/txindex.cpp
+++ b/src/index/txindex.cpp
@ -29,7 +29,6 @@ class TxIndex::DB : public BaseIndex::DB
 {
 public:
    explicit DB(size_t n_cache_size, bool f_memory = false, bool f_wipe = false);
-    ~DB() override {}

    /// Read the disk location of the transaction data with the given hash. Returns false if the
    /// transaction hash is not indexed.
--- a/src/init.cpp
+++ b/src/init.cpp
@ -22,7 +22,6 @@
 #include <httprpc.h>
 #include <index/txindex.h>
 #include <key.h>
-#include <lbry.h>
 #include <validation.h>
 #include <miner.h>
 #include <netbase.h>
@ -371,7 +370,6 @@ void SetupServerArgs()
    gArgs.AddArg("-datadir=<dir>", "Specify data directory", false, OptionsCategory::OPTIONS);
    gArgs.AddArg("-dbbatchsize", strprintf("Maximum database write batch size in bytes (default: %u)", nDefaultDbBatchSize), true, OptionsCategory::OPTIONS);
    gArgs.AddArg("-dbcache=<n>", strprintf("Set database cache size in megabytes (%d to %d, default: %d)", nMinDbCache, nMaxDbCache, nDefaultDbCache), false, OptionsCategory::OPTIONS);
-    gArgs.AddArg("-claimtriecache=<n>", strprintf("Set claim trie cache size in megabytes (%d to %d, default: %d)", nMinDbCache, nMaxDbCache, nDefaultDbCache), false, OptionsCategory::OPTIONS);
    gArgs.AddArg("-debuglogfile=<file>", strprintf("Specify location of debug log file. Relative paths will be prefixed by a net-specific datadir location. (-nodebuglogfile to disable; default: %s)", DEFAULT_DEBUGLOGFILE), false, OptionsCategory::OPTIONS);
    gArgs.AddArg("-feefilter", strprintf("Tell other nodes to filter invs to us by our mempool min fee (default: %u)", DEFAULT_FEEFILTER), true, OptionsCategory::OPTIONS);
    gArgs.AddArg("-includeconf=<file>", "Specify additional configuration file, relative to the -datadir path (only useable from configuration file, not command line)", false, OptionsCategory::OPTIONS);
@ -399,7 +397,6 @@ void SetupServerArgs()
    hidden_args.emplace_back("-sysperms");
 #endif
    gArgs.AddArg("-txindex", strprintf("Maintain a full transaction index, used by the getrawtransaction rpc call (default: %u)", DEFAULT_TXINDEX), false, OptionsCategory::OPTIONS);
-    gArgs.AddArg("-memfile=<GiB>", "Use a memory mapped file for the claimtrie allocations (default: use RAM instead)", false, OptionsCategory::OPTIONS);

    gArgs.AddArg("-addnode=<ip>", "Add a node to connect to and attempt to keep the connection open (see the `addnode` RPC command help for more info). This option can be specified multiple times to add multiple nodes.", false, OptionsCategory::CONNECTION);
    gArgs.AddArg("-banscore=<n>", strprintf("Threshold for disconnecting misbehaving peers (default: %u)", DEFAULT_BANSCORE_THRESHOLD), false, OptionsCategory::CONNECTION);
@ -486,6 +483,7 @@ void SetupServerArgs()
        CURRENCY_UNIT, FormatMoney(DEFAULT_TRANSACTION_MAXFEE)), false, OptionsCategory::DEBUG_TEST);
    gArgs.AddArg("-printpriority", strprintf("Log transaction fee per kB when mining blocks (default: %u)", DEFAULT_PRINTPRIORITY), true, OptionsCategory::DEBUG_TEST);
    gArgs.AddArg("-printtoconsole", "Send trace/debug info to console (default: 1 when no -daemon. To disable logging to file, set -nodebuglogfile)", false, OptionsCategory::DEBUG_TEST);
+    gArgs.AddArg("-shrinkdebugfile", "Shrink debug.log file on client startup (default: 1 when no -debug)", false, OptionsCategory::DEBUG_TEST);
    gArgs.AddArg("-uacomment=<cmt>", "Append comment to the user agent string", false, OptionsCategory::DEBUG_TEST);

    SetupChainParamsBaseOptions();
@ -1235,6 +1233,11 @@ bool AppInitMain()
    CreatePidFile(GetPidFile(), getpid());
 #endif
    if (g_logger->m_print_to_file) {
+        if (gArgs.GetBoolArg("-shrinkdebugfile", g_logger->DefaultShrinkDebugFile())) {
+            // Do this first since it both loads a bunch of debug.log into memory,
+            // and because this needs to happen before any other debug.log printing
+            g_logger->ShrinkDebugFile();
+        }
        if (!g_logger->OpenDebugLog()) {
            return InitError(strprintf("Could not open debug log file %s",
                                       g_logger->m_file_path.string()));
@ -1437,8 +1440,6 @@ bool AppInitMain()
    LogPrintf("* Using %.1fMiB for chain state database\n", nCoinDBCache * (1.0 / 1024 / 1024));
    LogPrintf("* Using %.1fMiB for in-memory UTXO set (plus up to %.1fMiB of unused mempool space)\n", nCoinCacheUsage * (1.0 / 1024 / 1024), nMempoolSizeMax * (1.0 / 1024 / 1024));

-    g_memfileSize = gArgs.GetArg("-memfile", 0u);
-
    bool fLoaded = false;
    while (!fLoaded && !ShutdownRequested()) {
        bool fReset = fReindex;
@ -1460,10 +1461,7 @@ bool AppInitMain()
                pblocktree.reset();
                pblocktree.reset(new CBlockTreeDB(nBlockTreeDBCache, false, fReset));
                delete pclaimTrie;
-                int64_t trieCacheMB = gArgs.GetArg("-claimtriecache", nDefaultDbCache);
-                trieCacheMB = std::min(trieCacheMB, nMaxDbCache);
-                trieCacheMB = std::max(trieCacheMB, nMinDbCache);
-                pclaimTrie = new CClaimTrie(false, fReindex || fReindexChainState, 32, trieCacheMB);
+                pclaimTrie = new CClaimTrie(false, fReindex || fReindexChainState);

                if (fReset) {
                    pblocktree->WriteReindexing(true);
--- a/src/lbry.cpp
+++ b/src/lbry.cpp
@ -3,8 +3,6 @@

 #include <cstdio>

-uint32_t g_memfileSize = 0;
-
 unsigned int CalculateLbryNextWorkRequired(const CBlockIndex* pindexLast, int64_t nFirstBlockTime, const Consensus::Params& params)
 {
    if (params.fPowNoRetargeting)
--- a/src/lbry.h
+++ b/src/lbry.h
@ -4,7 +4,6 @@
 #include <chain.h>
 #include <chainparams.h>

-extern uint32_t g_memfileSize;
 unsigned int CalculateLbryNextWorkRequired(const CBlockIndex* pindexLast, int64_t nLastRetargetTime, const Consensus::Params& params);

 #endif
--- a/src/leveldb/include/leveldb/env.h
+++ b/src/leveldb/include/leveldb/env.h
@ -221,9 +221,6 @@ class RandomAccessFile {
  // Get a name for the file, only for error reporting
  virtual std::string GetName() const = 0;

-  virtual char* AllocateScratch(std::size_t size) const { return new char[size]; };
-  virtual void DeallocateScratch(char* pointer) const { delete[] pointer; };
-
 private:
  // No copying allowed
  RandomAccessFile(const RandomAccessFile&);
--- a/src/leveldb/table/format.cc
+++ b/src/leveldb/table/format.cc
@ -73,15 +73,15 @@ Status ReadBlock(RandomAccessFile* file,
  // Read the block contents as well as the type/crc footer.
  // See table_builder.cc for the code that built this structure.
  size_t n = static_cast<size_t>(handle.size());
-  char* buf = file->AllocateScratch(n + kBlockTrailerSize);
+  char* buf = new char[n + kBlockTrailerSize];
  Slice contents;
  Status s = file->Read(handle.offset(), n + kBlockTrailerSize, &contents, buf);
  if (!s.ok()) {
-    file->DeallocateScratch(buf);
+    delete[] buf;
    return s;
  }
  if (contents.size() != n + kBlockTrailerSize) {
-    file->DeallocateScratch(buf);
+    delete[] buf;
    return Status::Corruption("truncated block read", file->GetName());
  }

@ -91,7 +91,7 @@ Status ReadBlock(RandomAccessFile* file,
    const uint32_t crc = crc32c::Unmask(DecodeFixed32(data + n + 1));
    const uint32_t actual = crc32c::Value(data, n + 1);
    if (actual != crc) {
-      file->DeallocateScratch(buf);
+      delete[] buf;
      s = Status::Corruption("block checksum mismatch", file->GetName());
      return s;
    }
@ -103,7 +103,7 @@ Status ReadBlock(RandomAccessFile* file,
        // File implementation gave us pointer to some other data.
        // Use it directly under the assumption that it will be live
        // while the file is open.
-        file->DeallocateScratch(buf);
+        delete[] buf;
        result->data = Slice(data, n);
        result->heap_allocated = false;
        result->cachable = false;  // Do not double-cache
@ -118,23 +118,23 @@ Status ReadBlock(RandomAccessFile* file,
    case kSnappyCompression: {
      size_t ulength = 0;
      if (!port::Snappy_GetUncompressedLength(data, n, &ulength)) {
-        file->DeallocateScratch(buf);
+        delete[] buf;
        return Status::Corruption("corrupted compressed block contents", file->GetName());
      }
      char* ubuf = new char[ulength];
      if (!port::Snappy_Uncompress(data, n, ubuf)) {
-        file->DeallocateScratch(buf);
+        delete[] buf;
        delete[] ubuf;
        return Status::Corruption("corrupted compressed block contents", file->GetName());
      }
-      file->DeallocateScratch(buf);
+      delete[] buf;
      result->data = Slice(ubuf, ulength);
      result->heap_allocated = true;
      result->cachable = true;
      break;
    }
    default:
-      file->DeallocateScratch(buf);
+      delete[] buf;
      return Status::Corruption("bad block type", file->GetName());
  }

--- a/src/leveldb/util/env_posix.cc
+++ b/src/leveldb/util/env_posix.cc
@ -162,7 +162,6 @@ class PosixRandomAccessFile: public RandomAccessFile {
    }

    Status s;
-    assert(scratch);
    ssize_t r = pread(fd, scratch, n, static_cast<off_t>(offset));
    *result = Slice(scratch, (r < 0) ? 0 : r);
    if (r < 0) {
@ -189,19 +188,19 @@ class PosixMmapReadableFile: public RandomAccessFile {

 public:
  // base[0,length-1] contains the mmapped contents of the file.
-  PosixMmapReadableFile(std::string fname, void* base, size_t length,
+  PosixMmapReadableFile(const std::string& fname, void* base, size_t length,
                        Limiter* limiter)
-      : filename_(std::move(fname)), mmapped_region_(base), length_(length),
+      : filename_(fname), mmapped_region_(base), length_(length),
        limiter_(limiter) {
  }

-  ~PosixMmapReadableFile() override {
+  virtual ~PosixMmapReadableFile() {
    munmap(mmapped_region_, length_);
    limiter_->Release();
  }

-  Status Read(uint64_t offset, size_t n, Slice* result,
-                      char* scratch) const override {
+  virtual Status Read(uint64_t offset, size_t n, Slice* result,
+                      char* scratch) const {
    Status s;
    if (offset + n > length_) {
      *result = Slice();
@ -212,10 +211,7 @@ class PosixMmapReadableFile: public RandomAccessFile {
    return s;
  }

-  std::string GetName() const override { return filename_; }
-
-  char* AllocateScratch(std::size_t size) const override { return nullptr; }
-  void DeallocateScratch(char* pointer) const override { assert(pointer == nullptr); }
+  virtual std::string GetName() const { return filename_; }
 };

 class PosixWritableFile : public WritableFile {
@ -589,8 +585,8 @@ static int MaxMmaps() {
  if (mmap_limit >= 0) {
    return mmap_limit;
  }
-  // Up to 400 mmaps for 64-bit binaries (800MB); none for smaller pointer sizes.
-  mmap_limit = sizeof(void*) >= 8 ? 400 : 0;
+  // Up to 4096 mmaps for 64-bit binaries; none for smaller pointer sizes.
+  mmap_limit = sizeof(void*) >= 8 ? 4096 : 0;
  return mmap_limit;
 }

--- a/src/logging.cpp
+++ b/src/logging.cpp
@ -37,12 +37,6 @@ bool BCLog::Logger::OpenDebugLog()
    assert(m_fileout == nullptr);
    assert(!m_file_path.empty());

-    if (fs::exists(m_file_path)) {
-        fs::path old_file_path(m_file_path);
-        old_file_path += ".old";
-        fs::rename(m_file_path, old_file_path);
-    }
-
    m_fileout = fsbridge::fopen(m_file_path, "a");
    if (!m_fileout) {
        return false;
@ -89,6 +83,11 @@ bool BCLog::Logger::WillLogCategory(BCLog::LogFlags category) const
    return (m_categories.load(std::memory_order_relaxed) & category) != 0;
 }

+bool BCLog::Logger::DefaultShrinkDebugFile() const
+{
+    return m_categories == BCLog::NONE;
+}
+
 struct CLogCategoryDesc
 {
    BCLog::LogFlags flag;
@ -232,3 +231,44 @@ void BCLog::Logger::LogPrintStr(const std::string &str)
        }
    }
 }
+
+void BCLog::Logger::ShrinkDebugFile()
+{
+    // Amount of debug.log to save at end when shrinking (must fit in memory)
+    constexpr size_t RECENT_DEBUG_HISTORY_SIZE = 10 * 1000000;
+
+    assert(!m_file_path.empty());
+
+    // Scroll debug.log if it's getting too big
+    FILE* file = fsbridge::fopen(m_file_path, "r");
+
+    // Special files (e.g. device nodes) may not have a size.
+    size_t log_size = 0;
+    try {
+        log_size = fs::file_size(m_file_path);
+    } catch (boost::filesystem::filesystem_error &) {}
+
+    // If debug.log file is more than 10% bigger the RECENT_DEBUG_HISTORY_SIZE
+    // trim it down by saving only the last RECENT_DEBUG_HISTORY_SIZE bytes
+    if (file && log_size > 11 * (RECENT_DEBUG_HISTORY_SIZE / 10))
+    {
+        // Restart the file with some of the end
+        std::vector<char> vch(RECENT_DEBUG_HISTORY_SIZE, 0);
+        if (fseek(file, -((long)vch.size()), SEEK_END)) {
+            LogPrintf("Failed to shrink debug log file: fseek(...) failed\n");
+            fclose(file);
+            return;
+        }
+        int nBytes = fread(vch.data(), 1, vch.size(), file);
+        fclose(file);
+
+        file = fsbridge::fopen(m_file_path, "w");
+        if (file)
+        {
+            fwrite(vch.data(), 1, nBytes, file);
+            fclose(file);
+        }
+    }
+    else if (file != nullptr)
+        fclose(file);
+}
--- a/src/logging.h
+++ b/src/logging.h
@ -93,6 +93,7 @@ namespace BCLog {
        bool Enabled() const { return m_print_to_console || m_print_to_file; }

        bool OpenDebugLog();
+        void ShrinkDebugFile();

        uint32_t GetCategoryMask() const { return m_categories.load(); }

@ -102,6 +103,8 @@ namespace BCLog {
        bool DisableCategory(const std::string& str);

        bool WillLogCategory(LogFlags category) const;
+
+        bool DefaultShrinkDebugFile() const;
    };

 } // namespace BCLog
--- a/src/miner.cpp
+++ b/src/miner.cpp
@ -71,7 +71,7 @@ void blockToCache(const CBlock* pblock, CClaimTrieCache& trieCache, int nHeight)
        .claimUndoHeights = {}
    };

-    trieCache.initializeIncrement();
+    trieCache.expirationForkActive(nHeight, true);

    CCoinsViewCache view(pcoinsTip.get());

@ -208,7 +208,7 @@ std::unique_ptr<CBlockTemplate> BlockAssembler::CreateNewBlock(const CScript& sc
    CValidationState state;
    if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false)) {
        if (!trieCache.empty())
-            trieCache.dumpToLog(trieCache.find({}));
+            trieCache.dumpToLog(trieCache.begin());
        throw std::runtime_error(strprintf("%s: TestBlockValidity failed: %s", __func__, FormatStateMessage(state)));
    }
    int64_t nTime2 = GetTimeMicros();
--- a/src/nameclaim.cpp
+++ b/src/nameclaim.cpp
@ -1,6 +1,9 @@
+#include <boost/foreach.hpp>
 #include "nameclaim.h"
 #include "hash.h"
 #include "util.h"
+#include "claimtrie.h"
+

 std::vector<unsigned char> uint32_t_to_vch(uint32_t n)
 {
@ -18,35 +21,25 @@ uint32_t vch_to_uint32_t(std::vector<unsigned char>& vchN)
    uint32_t n;
    static const size_t uint32Size = sizeof(uint32_t);
    if (vchN.size() != uint32Size) {
-        LogPrintf("%s() : a vector<unsigned char> with size other than 4 has been given\n", __func__);
+        LogPrintf("%s() : a vector<unsigned char> with size other than 4 has been given", __func__);
        return 0;
    }
    n = vchN[0] << 24 | vchN[1] << 16 | vchN[2] << 8 | vchN[3];
    return n;
 }

-CScript ClaimNameScript(std::string name, std::string value, bool fakeSuffix)
+CScript ClaimNameScript(std::string name, std::string value)
 {
    std::vector<unsigned char> vchName(name.begin(), name.end());
    std::vector<unsigned char> vchValue(value.begin(), value.end());
-    auto ret = CScript() << OP_CLAIM_NAME << vchName << vchValue << OP_2DROP << OP_DROP;
-    if (fakeSuffix) ret.push_back(OP_TRUE);
-    return ret;
+    return CScript() << OP_CLAIM_NAME << vchName << vchValue << OP_2DROP << OP_DROP << OP_TRUE;
 }

-CScript SupportClaimScript(std::string name, uint160 claimId, std::string value, bool fakeSuffix)
+CScript SupportClaimScript(std::string name, uint160 claimId)
 {
    std::vector<unsigned char> vchName(name.begin(), name.end());
    std::vector<unsigned char> vchClaimId(claimId.begin(), claimId.end());
-    CScript ret;
-    if (value.empty())
-        ret = CScript() << OP_SUPPORT_CLAIM << vchName << vchClaimId << OP_2DROP << OP_DROP;
-    else {
-        std::vector<unsigned char> vchValue(value.begin(), value.end());
-        ret = CScript() << OP_SUPPORT_CLAIM << vchName << vchClaimId << vchValue << OP_2DROP << OP_2DROP;
-    }
-    if (fakeSuffix) ret.push_back(OP_TRUE);
-    return ret;
+    return CScript() << OP_SUPPORT_CLAIM << vchName << vchClaimId << OP_2DROP << OP_DROP << OP_TRUE;
 }

 CScript UpdateClaimScript(std::string name, uint160 claimId, std::string value)
@ -57,15 +50,14 @@ CScript UpdateClaimScript(std::string name, uint160 claimId, std::string value)
    return CScript() << OP_UPDATE_CLAIM << vchName << vchClaimId << vchValue << OP_2DROP << OP_2DROP << OP_TRUE;
 }

-bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams, bool allowSupportMetadata)
+bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams)
 {
    CScript::const_iterator pc = scriptIn.begin();
-    return DecodeClaimScript(scriptIn, op, vvchParams, pc, allowSupportMetadata);
+    return DecodeClaimScript(scriptIn, op, vvchParams, pc);
 }

-bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams, CScript::const_iterator& pc, bool allowSupportMetadata)
+bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams, CScript::const_iterator& pc)
 {
-    op = -1;
    opcodetype opcode;
    if (!scriptIn.GetOp(pc, opcode))
    {
@ -86,7 +78,6 @@ bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector
    // OP_CLAIM_NAME vchName vchValue OP_2DROP OP_DROP pubkeyscript
    // OP_UPDATE_CLAIM vchName vchClaimId vchValue OP_2DROP OP_2DROP pubkeyscript
    // OP_SUPPORT_CLAIM vchName vchClaimId OP_2DROP OP_DROP pubkeyscript
-    // OP_SUPPORT_CLAIM vchName vchClaimId vchValue OP_2DROP OP_2DROP pubkeyscript
    // All others are invalid.

    if (!scriptIn.GetOp(pc, opcode, vchParam1) || opcode < 0 || opcode > OP_PUSHDATA4)
@ -104,42 +95,35 @@ bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector
            return false;
        }
    }
-
-    if (!scriptIn.GetOp(pc, opcode, vchParam3))
+    if (op == OP_UPDATE_CLAIM)
+    {
+        if (!scriptIn.GetOp(pc, opcode, vchParam3) || opcode < 0 || opcode > OP_PUSHDATA4)
        {
            return false;
        }
-    auto last_drop = OP_DROP;
-    if (opcode >= 0 && opcode <= OP_PUSHDATA4 && op != OP_CLAIM_NAME)
+    }
+    if (!scriptIn.GetOp(pc, opcode) || opcode != OP_2DROP)
    {
+        return false;
+    }
    if (!scriptIn.GetOp(pc, opcode))
    {
        return false;
    }
-        last_drop = OP_2DROP;
-    }
-    else if (op == OP_UPDATE_CLAIM)
+    if ((op == OP_CLAIM_NAME || op == OP_SUPPORT_CLAIM) && opcode != OP_DROP)
    {
        return false;
    }
-    if (opcode != OP_2DROP)
-    {
-        return false;
-    }
-    if (!scriptIn.GetOp(pc, opcode) || opcode != last_drop)
-    {
-        return false;
-    }
-    if (op == OP_SUPPORT_CLAIM && last_drop == OP_2DROP && !allowSupportMetadata)
+    else if ((op == OP_UPDATE_CLAIM) && opcode != OP_2DROP)
    {
        return false;
    }

-    vvchParams.push_back(std::move(vchParam1));
-    vvchParams.push_back(std::move(vchParam2));
-    if (last_drop == OP_2DROP)
+    vvchParams.push_back(vchParam1);
+    vvchParams.push_back(vchParam2);
+    if (op == OP_UPDATE_CLAIM)
    {
-        vvchParams.push_back(std::move(vchParam3));
+        vvchParams.push_back(vchParam3);
    }
    return true;
 }
@ -200,7 +184,7 @@ CAmount CalcMinClaimTrieFee(const CTransaction& tx, const CAmount &minFeePerName
    }

    CAmount min_fee = 0;
-    for (const CTxOut& txout: tx.vout)
+    BOOST_FOREACH(const CTxOut& txout, tx.vout)
    {
        int op;
        std::vector<std::vector<unsigned char> > vvchParams;
--- a/src/nameclaim.h
+++ b/src/nameclaim.h
@ -11,7 +11,7 @@
 // This is the minimum claim fee per character in the name of an OP_CLAIM_NAME command that must
 // be attached to transactions for it to be accepted into the memory pool.
 // Rationale: current implementation of the claim trie uses more memory for longer name claims
-// due to the fact that each character is assigned a trie node regardless of whether it contains
+// due to the fact that each chracater is assigned a trie node regardless of whether it contains
 // any claims or not. In the future, we can switch to a radix tree implementation where
 // empty nodes do not take up any memory and the minimum fee can be priced on a per claim
 // basis.
@ -25,11 +25,11 @@
 // Scripts exceeding this size are rejected in CheckTransaction in main.cpp
 #define MAX_CLAIM_NAME_SIZE 255

-CScript ClaimNameScript(std::string name, std::string value, bool fakeSuffix=true);
-CScript SupportClaimScript(std::string name, uint160 claimId, std::string value="", bool fakeSuffix=true);
+CScript ClaimNameScript(std::string name, std::string value);
+CScript SupportClaimScript(std::string name, uint160 claimId);
 CScript UpdateClaimScript(std::string name, uint160 claimId, std::string value);
-bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams, bool allowSupportMetadata=true);
-bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams, CScript::const_iterator& pc, bool allowSupportMetadata=true);
+bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams);
+bool DecodeClaimScript(const CScript& scriptIn, int& op, std::vector<std::vector<unsigned char> >& vvchParams, CScript::const_iterator& pc);
 CScript StripClaimScriptPrefix(const CScript& scriptIn);
 CScript StripClaimScriptPrefix(const CScript& scriptIn, int& op);
 uint160 ClaimIdHash(const uint256& txhash, uint32_t nOut);
--- a/src/policy/policy.cpp
+++ b/src/policy/policy.cpp
@ -10,9 +10,11 @@
 #include <consensus/validation.h>
 #include <validation.h>
 #include <coins.h>
+#include <tinyformat.h>
+#include <util.h>
 #include <utilstrencodings.h>

-#include <nameclaim.h>
+#include "nameclaim.h"


 CAmount GetDustThreshold(const CTxOut& txout, const CFeeRate& dustRelayFeeIn)
@ -115,7 +117,8 @@ bool IsStandardTx(const CTransaction& tx, std::string& reason)
    unsigned int nDataOut = 0;
    txnouttype whichType;
    for (const CTxOut& txout : tx.vout) {
-        if (!::IsStandard(StripClaimScriptPrefix(txout.scriptPubKey), whichType)) {
+        const CScript& scriptPubKey = StripClaimScriptPrefix(txout.scriptPubKey);
+        if (!::IsStandard(scriptPubKey, whichType)) {
            reason = "scriptpubkey";
            return false;
        }
@ -168,7 +171,8 @@ bool AreInputsStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
        std::vector<std::vector<unsigned char> > vSolutions;
        txnouttype whichType;
        // get the scriptPubKey corresponding to this input:
-        if (!Solver(StripClaimScriptPrefix(prev.scriptPubKey), whichType, vSolutions))
+        const CScript& prevScript = StripClaimScriptPrefix(prev.scriptPubKey);
+        if (!Solver(prevScript, whichType, vSolutions))
            return false;

        if (whichType == TX_SCRIPTHASH)
@ -204,7 +208,7 @@ bool IsWitnessStandard(const CTransaction& tx, const CCoinsViewCache& mapInputs)
        const CTxOut &prev = mapInputs.AccessCoin(tx.vin[i].prevout).out;

        // get the scriptPubKey corresponding to this input:
-        CScript prevScript = StripClaimScriptPrefix(prev.scriptPubKey);
+        CScript prevScript = prev.scriptPubKey;

        if (prevScript.IsPayToScriptHash()) {
            std::vector <std::vector<unsigned char> > stack;
--- a/src/policy/policy.h
+++ b/src/policy/policy.h
@ -45,7 +45,7 @@ static const unsigned int MAX_STANDARD_P2WSH_SCRIPT_SIZE = 3600;
 * standard and should be done with care and ideally rarely. It makes sense to
 * only increase the dust limit after prior releases were already not creating
 * outputs below the new threshold */
-static const unsigned int DUST_RELAY_TX_FEE = 1000;
+static const unsigned int DUST_RELAY_TX_FEE = 3000;
 /**
 * Standard script verification flags that standard transactions will comply
 * with. However scripts violating these flags may still be present in valid
--- a/src/prefixtrie.cpp
+++ b/src/prefixtrie.cpp
@ -1,79 +1,6 @@

-#include <claimtrie.h>
-#include <fs.h>
-#include <lbry.h>
-#include <limits>
-#include <memory>
-#include <prefixtrie.h>
-
-#include <boost/interprocess/allocators/private_node_allocator.hpp>
-#include <boost/interprocess/indexes/null_index.hpp>
-#include <boost/interprocess/managed_mapped_file.hpp>
-
-namespace bip = boost::interprocess;
-
-typedef bip::basic_managed_mapped_file <
-    char,
-    bip::rbtree_best_fit<bip::null_mutex_family, bip::offset_ptr<void>>,
-    bip::null_index
-> managed_mapped_file;
-
-template <typename T>
-using node_allocator = bip::private_node_allocator<T, managed_mapped_file::segment_manager>;
-
-static managed_mapped_file::segment_manager* segmentManager()
-{
-    struct CSharedMemoryFile
-    {
-        CSharedMemoryFile() : file(GetDataDir() / "shared.mem")
-        {
-            fs::remove(file);
-            auto size = (uint64_t)g_memfileSize * 1024ULL * 1024ULL * 1024ULL;
-            // using string() to remove w_char filename encoding on Windows
-            menaged_file.reset(new managed_mapped_file(bip::create_only, file.string().c_str(), size));
-        }
-        ~CSharedMemoryFile()
-        {
-            menaged_file.reset();
-            fs::remove(file);
-        }
-        managed_mapped_file::segment_manager* segmentManager()
-        {
-            return menaged_file->get_segment_manager();
-        }
-        const fs::path file;
-        std::unique_ptr<managed_mapped_file> menaged_file;
-    };
-    static CSharedMemoryFile shem;
-    return shem.segmentManager();
-}
-
-template <typename T>
-static node_allocator<T>& nodeAllocator()
-{
-    static node_allocator<T> allocator(segmentManager());
-    return allocator;
-}
-
-template <typename T, class... Args>
-static std::shared_ptr<T> nodeAllocate(Args&&... args)
-{
-    return std::allocate_shared<T>(nodeAllocator<T>(), std::forward<Args>(args)...);
-}
-
-template <typename T, class... Args>
-static std::shared_ptr<T> allocateShared(Args&&... args)
-{
-    static auto allocate = g_memfileSize ? nodeAllocate<T, Args...> : std::make_shared<T, Args...>;
-    try {
-        return allocate(std::forward<Args>(args)...);
-    }
-    catch (const bip::bad_alloc&) {
-        allocate = std::make_shared<T, Args...>; // in case we fill up the memfile
-        LogPrint(BCLog::BENCH, "WARNING: The memfile is full; reverting to the RAM allocator for %s.\n", typeid(T).name());
-        return allocate(std::forward<Args>(args)...);
-    }
-}
+#include "prefixtrie.h"
+#include "claimtrie.h"

 template <typename TKey, typename TData>
 template <bool IsConst>
@ -91,7 +18,7 @@ typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>& CPrefixTrie<TKey,
    stack.clear();
    stack.reserve(o.stack.size());
    for (auto& i : o.stack)
-        stack.push_back(Bookmark{i.name, i.it, i.end});
+        stack.push_back(Bookmark{i.name, i.parent, i.it, i.end});
    return *this;
 }

@ -121,7 +48,7 @@ typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>& CPrefixTrie<TKey,
    if (!shared->children.empty()) {
        auto& children = shared->children;
        auto it = children.begin();
-        stack.emplace_back(Bookmark{name, it, children.end()});
+        stack.emplace_back(Bookmark{name, shared, it, children.end()});
        auto& postfix = it->first;
        name.insert(name.end(), postfix.begin(), postfix.end());
        node = it->second;
@ -179,30 +106,18 @@ bool CPrefixTrie<TKey, TData>::Iterator<IsConst>::operator!=(const Iterator& o)

 template <typename TKey, typename TData>
 template <bool IsConst>
-typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>::reference CPrefixTrie<TKey, TData>::Iterator<IsConst>::operator*()
+typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>::reference CPrefixTrie<TKey, TData>::Iterator<IsConst>::operator*() const
 {
-    return reference{name, data()};
+    assert(!node.expired());
+    return TPair(name, *(node.lock()->data));
 }

 template <typename TKey, typename TData>
 template <bool IsConst>
-typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>::const_reference CPrefixTrie<TKey, TData>::Iterator<IsConst>::operator*() const
+typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>::pointer CPrefixTrie<TKey, TData>::Iterator<IsConst>::operator->() const
 {
-    return const_reference{name, data()};
-}
-
-template <typename TKey, typename TData>
-template <bool IsConst>
-typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>::pointer CPrefixTrie<TKey, TData>::Iterator<IsConst>::operator->()
-{
-    return &(data());
-}
-
-template <typename TKey, typename TData>
-template <bool IsConst>
-typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>::const_pointer CPrefixTrie<TKey, TData>::Iterator<IsConst>::operator->() const
-{
-    return &(data());
+    assert(!node.expired());
+    return node.lock()->data.get();
 }

 template <typename TKey, typename TData>
@ -214,20 +129,18 @@ const TKey& CPrefixTrie<TKey, TData>::Iterator<IsConst>::key() const

 template <typename TKey, typename TData>
 template <bool IsConst>
-typename CPrefixTrie<TKey, TData>::template Iterator<IsConst>::data_reference CPrefixTrie<TKey, TData>::Iterator<IsConst>::data()
+TData& CPrefixTrie<TKey, TData>::Iterator<IsConst>::data()
 {
-    auto shared = node.lock();
-    assert(shared);
-    return *(shared->data);
+    assert(!node.expired());
+    return *(node.lock()->data);
 }

 template <typename TKey, typename TData>
 template <bool IsConst>
 const TData& CPrefixTrie<TKey, TData>::Iterator<IsConst>::data() const
 {
-    auto shared = node.lock();
-    assert(shared);
-    return *(shared->data);
+    assert(!node.expired());
+    return *(node.lock()->data);
 }

 template <typename TKey, typename TData>
@ -292,24 +205,6 @@ bool CPrefixTrie<TKey, TData>::find(const TKey& key, TNode node, const callback<
    return find(TKey(key.begin() + count, key.end()), it->second, cb);
 }

-template <typename TKey, typename TData>
-template <typename TIterator, typename TNode>
-std::vector<TIterator> CPrefixTrie<TKey, TData>::nodes(const TKey& key, TNode root)
-{
-    std::vector<TIterator> ret;
-    ret.reserve(1 + key.size());
-    ret.emplace_back(TKey{}, root);
-    if (key.empty()) return ret;
-    TKey name;
-    using CBType = callback<TNode>;
-    CBType cb = [&name, &ret](const TKey& key, TNode node) {
-        name.insert(name.end(), key.begin(), key.end());
-        ret.emplace_back(name, node);
-    };
-    find(key, root, cb);
-    return ret;
-}
-
 template <typename TKey, typename TData>
 std::shared_ptr<typename CPrefixTrie<TKey, TData>::Node>& CPrefixTrie<TKey, TData>::insert(const TKey& key, std::shared_ptr<typename CPrefixTrie<TKey, TData>::Node>& node)
 {
@ -327,20 +222,21 @@ std::shared_ptr<typename CPrefixTrie<TKey, TData>::Node>& CPrefixTrie<TKey, TDat
    }
    if (count == 0) {
        ++size;
-        it = children.emplace(key, allocateShared<Node>()).first;
+        it = children.emplace(key, std::make_shared<Node>()).first;
+        it->second->data = std::make_shared<TData>();
        return it->second;
    }
    if (count < it->first.size()) {
-        TKey prefix(key.begin(), key.begin() + count);
-        TKey postfix(it->first.begin() + count, it->first.end());
+        const TKey prefix(key.begin(), key.begin() + count);
+        const TKey postfix(it->first.begin() + count, it->first.end());
        auto nodes = std::move(it->second);
        children.erase(it);
        ++size;
-        it = children.emplace(std::move(prefix), allocateShared<Node>()).first;
-        it->second->children.emplace(std::move(postfix), std::move(nodes));
+        it = children.emplace(prefix, std::make_shared<Node>()).first;
+        it->second->children.emplace(postfix, std::move(nodes));
+        it->second->data = std::make_shared<TData>();
        if (key.size() == count)
            return it->second;
-        it->second->data = allocateShared<TData>();
    }
    return insert(TKey(key.begin() + count, key.end()), it->second);
 }
@ -357,7 +253,7 @@ void CPrefixTrie<TKey, TData>::erase(const TKey& key, std::shared_ptr<Node>& nod
    if (!find(key, node, cb))
        return;

-    nodes.back().second->data = allocateShared<TData>();
+    nodes.back().second->data = std::make_shared<TData>();
    for (; nodes.size() > 1; nodes.pop_back()) {
        // if we have only one child and no data ourselves, bring them up to our level
        auto& cNode = nodes.back().second;
@ -370,7 +266,7 @@ void CPrefixTrie<TKey, TData>::erase(const TKey& key, std::shared_ptr<Node>& nod
            auto& postfix = child->first;
            newKey.insert(newKey.end(), postfix.begin(), postfix.end());
            auto& pNode = nodes[nodes.size() - 2].second;
-            pNode->children.emplace(std::move(newKey), std::move(child->second));
+            pNode->children.emplace(newKey, std::move(child->second));
            pNode->children.erase(prefix);
            --size;
            continue;
@ -388,9 +284,9 @@ void CPrefixTrie<TKey, TData>::erase(const TKey& key, std::shared_ptr<Node>& nod
 }

 template <typename TKey, typename TData>
-CPrefixTrie<TKey, TData>::CPrefixTrie() : size(0), root(allocateShared<Node>())
+CPrefixTrie<TKey, TData>::CPrefixTrie() : size(0), root(std::make_shared<Node>())
 {
-    root->data = allocateShared<TData>();
+    root->data = std::make_shared<TData>();
 }

 template <typename TKey, typename TData>
@ -398,7 +294,7 @@ template <typename TDataUni>
 typename CPrefixTrie<TKey, TData>::iterator CPrefixTrie<TKey, TData>::insert(const TKey& key, TDataUni&& data)
 {
    auto& node = key.empty() ? root : insert(key, root);
-    node->data = allocateShared<TData>(std::forward<TDataUni>(data));
+    node->data = std::make_shared<TData>(std::forward<TDataUni>(data));
    return key.empty() ? begin() : iterator{key, node};
 }

@ -422,9 +318,9 @@ typename CPrefixTrie<TKey, TData>::iterator CPrefixTrie<TKey, TData>::insert(CPr
        auto name = it.key();
        name.insert(name.end(), key.begin(), key.end());
        auto& node = insert(key, shared);
-        copy = iterator{std::move(name), node};
+        copy = iterator{name, node};
    }
-    copy.node.lock()->data = allocateShared<TData>(std::forward<TDataUni>(data));
+    copy.node.lock()->data = std::make_shared<TData>(std::forward<TDataUni>(data));
    return copy;
 }

@ -475,17 +371,21 @@ TData& CPrefixTrie<TKey, TData>::at(const TKey& key)
 }

 template <typename TKey, typename TData>
-std::vector<typename CPrefixTrie<TKey, TData>::iterator> CPrefixTrie<TKey, TData>::nodes(const TKey& key)
+std::vector<typename CPrefixTrie<TKey, TData>::iterator> CPrefixTrie<TKey, TData>::nodes(const TKey& key) const
 {
-    if (empty()) return {};
-    return nodes<iterator>(key, root);
-}
-
-template <typename TKey, typename TData>
-std::vector<typename CPrefixTrie<TKey, TData>::const_iterator> CPrefixTrie<TKey, TData>::nodes(const TKey& key) const
-{
-    if (empty()) return {};
-    return nodes<const_iterator>(key, root);
+    std::vector<iterator> ret;
+    if (empty()) return ret;
+    ret.reserve(1 + key.size());
+    ret.emplace_back(TKey{}, root);
+    if (key.empty()) return ret;
+    TKey name;
+    using CBType = callback<std::shared_ptr<Node>>;
+    CBType cb = [&name, &ret](const TKey& key, std::shared_ptr<Node> node) {
+        name.insert(name.end(), key.begin(), key.end());
+        ret.emplace_back(name, node);
+    };
+    find(key, root, cb);
+    return ret;
 }

 template <typename TKey, typename TData>
@ -493,7 +393,7 @@ bool CPrefixTrie<TKey, TData>::erase(const TKey& key)
 {
    auto size_was = height();
    if (key.empty()) {
-        root->data = allocateShared<TData>();
+        root->data = std::make_shared<TData>();
    } else {
        erase(key, root);
    }
@ -504,7 +404,7 @@ template <typename TKey, typename TData>
 void CPrefixTrie<TKey, TData>::clear()
 {
    size = 0;
-    root->data = allocateShared<TData>();
+    root->data = std::make_shared<TData>();
    root->children.clear();
 }

@ -529,7 +429,7 @@ typename CPrefixTrie<TKey, TData>::iterator CPrefixTrie<TKey, TData>::begin()
 template <typename TKey, typename TData>
 typename CPrefixTrie<TKey, TData>::iterator CPrefixTrie<TKey, TData>::end()
 {
-    return {};
+    return iterator{TKey(), std::shared_ptr<Node>{}};
 }

 template <typename TKey, typename TData>
@ -541,7 +441,7 @@ typename CPrefixTrie<TKey, TData>::const_iterator CPrefixTrie<TKey, TData>::cbeg
 template <typename TKey, typename TData>
 typename CPrefixTrie<TKey, TData>::const_iterator CPrefixTrie<TKey, TData>::cend()
 {
-    return {};
+    return const_iterator{TKey(), std::shared_ptr<Node>{}};
 }

 template <typename TKey, typename TData>
@ -553,7 +453,7 @@ typename CPrefixTrie<TKey, TData>::const_iterator CPrefixTrie<TKey, TData>::begi
 template <typename TKey, typename TData>
 typename CPrefixTrie<TKey, TData>::const_iterator CPrefixTrie<TKey, TData>::end() const
 {
-    return {};
+    return const_iterator{TKey(), std::shared_ptr<Node>{}};
 }

 using Key = std::string;
--- a/src/prefixtrie.h
+++ b/src/prefixtrie.h
@ -9,10 +9,6 @@
 #include <type_traits>
 #include <vector>

-#include <boost/container/flat_map.hpp>
-
-namespace bc = boost::container;
-
 template <typename TKey, typename TData>
 class CPrefixTrie
 {
@ -21,13 +17,13 @@ class CPrefixTrie
        template <bool>
        friend class Iterator;
        friend class CPrefixTrie<TKey, TData>;
-        bc::flat_map<TKey, std::shared_ptr<Node>> children;
+        std::map<TKey, std::shared_ptr<Node>> children;

    public:
        Node() = default;
        Node(const Node&) = delete;
        Node(Node&& o) noexcept = default;
-        Node& operator=(Node&&) noexcept = default;
+        Node& operator=(Node&& o) noexcept = default;
        Node& operator=(const Node&) = delete;
        std::shared_ptr<TData> data;
    };
@ -42,15 +38,15 @@ class CPrefixTrie
        friend class CPrefixTrie<TKey, TData>;

        using TKeyRef = std::reference_wrapper<const TKey>;
-        using TDataRef = std::reference_wrapper<typename std::conditional<IsConst, const TData, TData>::type>;
+        using TDataRef = std::reference_wrapper<TData>;
        using TPair = std::pair<TKeyRef, TDataRef>;
-        using ConstTPair = std::pair<TKeyRef, const TData>;

        TKey name;
        std::weak_ptr<Node> node;

        struct Bookmark {
            TKey name;
+            std::weak_ptr<Node> parent;
            typename TChildren::iterator it;
            typename TChildren::iterator end;
        };
@ -60,15 +56,12 @@ class CPrefixTrie
    public:
        // Iterator traits
        using value_type = TPair;
-        using const_pointer = const TData* const;
-        using const_reference = ConstTPair;
-        using data_reference = typename std::conditional<IsConst, const TData&, TData&>::type;
        using pointer = typename std::conditional<IsConst, const TData* const, TData* const>::type;
-        using reference = typename std::conditional<IsConst, ConstTPair, TPair>::type;
+        using reference = typename std::conditional<IsConst, const TPair, TPair>::type;
        using difference_type = std::ptrdiff_t;
        using iterator_category = std::forward_iterator_tag;

-        Iterator() = default;
+        Iterator() = delete;
        Iterator(const Iterator&) = default;
        Iterator(Iterator&& o) noexcept = default;
        Iterator(const TKey& name, const std::shared_ptr<Node>& node) noexcept;
@ -92,15 +85,12 @@ class CPrefixTrie
        bool operator==(const Iterator& o) const;
        bool operator!=(const Iterator& o) const;

-        reference operator*();
-        const_reference operator*() const;
-
-        pointer operator->();
-        const_pointer operator->() const;
+        reference operator*() const;
+        pointer operator->() const;

        const TKey& key() const;

-        data_reference data();
+        TData& data();
        const TData& data() const;

        std::size_t depth() const;
@ -121,9 +111,6 @@ class CPrefixTrie
    template <typename TNode>
    static bool find(const TKey& key, TNode node, const callback<TNode>& cb);

-    template <typename TIterator, typename TNode>
-    static std::vector<TIterator> nodes(const TKey& key, TNode root);
-
    std::shared_ptr<Node>& insert(const TKey& key, std::shared_ptr<Node>& node);
    void erase(const TKey& key, std::shared_ptr<Node>& node);

@ -149,8 +136,7 @@ public:

    TData& at(const TKey& key);

-    std::vector<iterator> nodes(const TKey& key);
-    std::vector<const_iterator> nodes(const TKey& key) const;
+    std::vector<iterator> nodes(const TKey& key) const;

    bool erase(const TKey& key);

--- a/src/qt/networkstyle.cpp
+++ b/src/qt/networkstyle.cpp
@ -17,7 +17,7 @@ static const struct {
 } network_styles[] = {
    {"lbrycrd", QAPP_APP_NAME_DEFAULT, 0, 0, ""},
    {"lbrycrdtest", QAPP_APP_NAME_TESTNET, 70, 30, QT_TRANSLATE_NOOP("SplashScreen", "[testnet]")},
-    {"lbrycrdreg", QAPP_APP_NAME_REGTEST, 160, 30, "[regtest]"}
+    {"regtest", QAPP_APP_NAME_REGTEST, 160, 30, "[regtest]"}
 };
 static const unsigned network_styles_count = sizeof(network_styles)/sizeof(*network_styles);

--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@ -228,11 +228,11 @@ void PaymentServer::ipcParseCommandLine(interfaces::Node& node, int argc, char*
            PaymentRequestPlus request;
            if (readPaymentRequestFromFile(arg, request))
            {
-                if (request.getDetails().network() == CBaseChainParams::MAIN)
+                if (request.getDetails().network() == "lbrycrd")
                {
                    node.selectParams(CBaseChainParams::MAIN);
                }
-                else if (request.getDetails().network() == CBaseChainParams::TESTNET)
+                else if (request.getDetails().network() == "lbrycrdtest")
                {
                    node.selectParams(CBaseChainParams::TESTNET);
                }
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@ -1319,8 +1319,6 @@ static UniValue getchaintips(const JSONRPCRequest& request)
            "    \"height\": xxxx,\n"
            "    \"hash\": \"xxxx\",\n"
            "    \"branchlen\": 1          (numeric) length of branch connecting the tip to the main chain\n"
-            "    \"branchhash\": \"xxxx\",     (string) hash of the historical block where we branched\n"
-            "    \"branchhashNext\": \"xxxx\", (string) block hash of the first block down this chain\n"
            "    \"status\": \"xxxx\"        (string) status of the chain (active, valid-fork, valid-headers, headers-only, invalid)\n"
            "  }\n"
            "]\n"
@ -1374,19 +1372,8 @@ static UniValue getchaintips(const JSONRPCRequest& request)
        obj.pushKV("height", block->nHeight);
        obj.pushKV("hash", block->phashBlock->GetHex());

-        // not use ForkAt method because we need the previous one as well
-        const CBlockIndex *forkAt = block, *forkPrev = block;
-        while (forkAt && !chainActive.Contains(forkAt)) {
-            forkPrev = forkAt;
-            forkAt = forkAt->pprev;
-        }
-
-        const int branchLen = block->nHeight - forkAt->nHeight;
+        const int branchLen = block->nHeight - chainActive.FindFork(block)->nHeight;
        obj.pushKV("branchlen", branchLen);
-        if (forkAt != forkPrev) {
-            obj.pushKV("branchhash", forkAt->phashBlock->GetHex());
-            obj.pushKV("branchhashNext", forkPrev->phashBlock->GetHex());
-        }

        std::string status;
        if (chainActive.Contains(block)) {
--- a/src/rpc/claimrpchelp.h
+++ b/src/rpc/claimrpchelp.h
@ -1,345 +0,0 @@
-
-#ifndef CLAIMRPCHELP_H
-#define CLAIMRPCHELP_H
-
-// always keep defines T_ + value in upper case
-#define T_NORMALIZEDNAME                "normalizedName"
-#define T_BLOCKHASH                     "blockhash"
-#define T_CLAIMS                        "claims"
-#define T_CLAIMID                       "claimId"
-#define T_TXID                          "txId"
-#define T_N                             "n"
-#define T_AMOUNT                        "amount"
-#define T_HEIGHT                        "height"
-#define T_VALUE                         "value"
-#define T_NAME                          "name"
-#define T_VALIDATHEIGHT                 "validAtHeight"
-#define T_NAMES                         "names"
-#define T_EFFECTIVEAMOUNT               "effectiveAmount"
-#define T_LASTTAKEOVERHEIGHT            "lastTakeoverHeight"
-#define T_SUPPORTS                      "supports"
-#define T_SUPPORTSWITHOUTCLAIM          "supportsWithoutClaim"
-#define T_TOTALNAMES                    "totalNames"
-#define T_TOTALCLAIMS                   "totalClaims"
-#define T_TOTALVALUE                    "totalValue"
-#define T_CONTROLLINGONLY               "controllingOnly"
-#define T_CLAIMTYPE                     "claimType"
-#define T_DEPTH                         "depth"
-#define T_INCLAIMTRIE                   "inClaimTrie"
-#define T_ISCONTROLLING                 "isControlling"
-#define T_INSUPPORTMAP                  "inSupportMap"
-#define T_INQUEUE                       "inQueue"
-#define T_BLOCKSTOVALID                 "blocksToValid"
-#define T_NODES                         "nodes"
-#define T_CHILDREN                      "children"
-#define T_CHARACTER                     "character"
-#define T_NODEHASH                      "nodeHash"
-#define T_VALUEHASH                     "valueHash"
-#define T_PAIRS                         "pairs"
-#define T_ODD                           "odd"
-#define T_HASH                          "hash"
-#define T_BID                           "bid"
-#define T_SEQUENCE                      "sequence"
-#define T_CLAIMSADDEDORUPDATED          "claimsAddedOrUpdated"
-#define T_SUPPORTSADDEDORUPDATED        "supportsAddedOrUpdated"
-#define T_CLAIMSREMOVED                 "claimsRemoved"
-#define T_SUPPORTSREMOVED               "supportsRemoved"
-#define T_ADDRESS                       "address"
-#define T_PENDINGAMOUNT                 "pendingAmount"
-
-enum {
-    GETCLAIMSINTRIE = 0,
-    GETNAMESINTRIE,
-    GETVALUEFORNAME,
-    GETCLAIMSFORNAME,
-    GETCLAIMBYID,
-    GETTOTALCLAIMEDNAMES,
-    GETTOTALCLAIMS,
-    GETTOTALVALUEOFCLAIMS,
-    GETCLAIMSFORTX,
-    GETNAMEPROOF,
-    CHECKNORMALIZATION,
-    GETCLAIMBYBID,
-    GETCLAIMBYSEQ,
-    GETCLAIMPROOFBYBID,
-    GETCLAIMPROOFBYSEQ,
-    GETCHANGESINBLOCK,
-};
-
-#define S3_(pre, name, def) pre "\"" name "\"" def "\n"
-#define S3(pre, name, def) S3_(pre, name, def)
-#define S1(str)  str "\n"
-
-#define NAME_TEXT      "                    (string) the name to look up"
-#define BLOCKHASH_TEXT "               (string, optional) get claims in the trie\n" \
-"                                                  at the block specified\n" \
-"                                                  by this block hash.\n" \
-"                                                  If none is given,\n" \
-"                                                  the latest active\n" \
-"                                                  block will be used."
-
-#define CLAIM_OUTPUT    \
-S3("    ", T_NORMALIZEDNAME, "         (string) the name of the claim (after normalization)") \
-S3("    ", T_NAME, "                   (string) the original name of this claim (before normalization)") \
-S3("    ", T_VALUE, "                  (string) the value of this claim") \
-S3("    ", T_ADDRESS, "                (string) the destination address of this claim") \
-S3("    ", T_CLAIMID, "                (string) the claimId of the claim") \
-S3("    ", T_TXID, "                   (string) the txid of the claim") \
-S3("    ", T_N, "                      (numeric) the index of the claim in the transaction's list of outputs") \
-S3("    ", T_HEIGHT, "                 (numeric) the height of the block in which this transaction is located") \
-S3("    ", T_VALIDATHEIGHT, "          (numeric) the height at which the support became/becomes valid") \
-S3("    ", T_AMOUNT, "                 (numeric) the amount of the claim") \
-S3("    ", T_EFFECTIVEAMOUNT, "        (numeric) the amount plus amount from all supports associated with the claim") \
-S3("    ", T_PENDINGAMOUNT, "          (numeric) expected amount when claim and its supports are all valid") \
-S3("    ", T_SUPPORTS, ": [            (array of object) supports for this claim") \
-S3("        ", T_VALUE, "              (string) the metadata of the support if any") \
-S3("        ", T_ADDRESS, "            (string) the destination address of the support") \
-S3("        ", T_TXID, "               (string) the txid of the support") \
-S3("        ", T_N, "                  (numeric) the index of the support in the transaction's list of outputs") \
-S3("        ", T_HEIGHT, "             (numeric) the height of the block in which this transaction is located") \
-S3("        ", T_VALIDATHEIGHT, "      (numeric) the height at which the support became/becomes valid") \
-S3("        ", T_AMOUNT, "             (numeric) the amount of the support") \
-S1("    ]") \
-S3("    ", T_LASTTAKEOVERHEIGHT, "     (numeric) the last height at which ownership of the name changed") \
-S3("    ", T_BID, "                    (numeric) lower value means a higher bid rate, ordered by effective amount") \
-S3("    ", T_SEQUENCE, "               (numeric) lower value means an older one in sequence, ordered by height of insertion")
-
-#define PROOF_OUTPUT \
-S3("    ", T_NODES, ": [               (array of object, pre-fork) full nodes\n" \
-"                                                (i.e. those which lead to the requested name)") \
-S3("        ", T_CHILDREN, ": [        (array of object) the children of the node") \
-S3("            ", T_CHARACTER, "      (string) the character which leads from the parent to this child node") \
-S3("            ", T_NODEHASH, "       (string, if exists) the hash of the node if this is a leaf node") \
-S1("        ]") \
-S3("       ", T_VALUEHASH, "           (string, if exists) the hash of this node's value, if" \
-"                                                it has one. If this is the requested name this\n" \
-"                                                will not exist whether the node has a value or not") \
-S1("    ]") \
-S3("    ", T_PAIRS, ": [               (array of pairs, post-fork) hash can be validated by" \
-"                                                hashing claim from the bottom up") \
-S3("        ", T_ODD, "                (boolean) this value goes on the right of hash") \
-S3("        ", T_HASH, "               (string) the hash to be mixed in") \
-S1("    ]") \
-S3("    ", T_TXID, "                   (string, if exists) the txid of the claim which controls" \
-"                                                this name, if there is one.") \
-S3("    ", T_N, "                      (numeric) the index of the claim in the transaction's list of outputs") \
-S3("    ", T_LASTTAKEOVERHEIGHT, "     (numeric) the last height at which ownership of the name changed")
-
-static const char* const rpc_help[] = {
-
-// GETCLAIMSINTRIE
-S1("getclaimsintrie ( \"" T_BLOCKHASH R"(" )
-Return all claims in the name trie. Deprecated
-Arguments:)")
-S3("1. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S1("Result: [")
-S3("    ", T_NORMALIZEDNAME, "         (string) the name of the claim(s) (after normalization)")
-S3("    ", T_CLAIMS, ": [              (array of object) the claims for this name")
-S3("        ", T_NAME, "               (string) the original name of this claim (before normalization)")
-S3("        ", T_VALUE, "              (string) the value of this claim")
-S3("        ", T_ADDRESS, "            (string) the destination address of this claim")
-S3("        ", T_CLAIMID, "            (string) the claimId of the claim")
-S3("        ", T_TXID, "               (string) the txid of the claim")
-S3("        ", T_N, "                  (numeric) the index of the claim in the transaction's list of outputs")
-S3("        ", T_HEIGHT, "             (numeric) the height of the block in which this transaction is located")
-S3("        ", T_VALIDATHEIGHT, "      (numeric) the height at which the claim became/becomes valid")
-S3("        ", T_AMOUNT, "             (numeric) the amount of the claim")
-S1("    ]")
-"]",
-
-// GETNAMESINTRIE
-S1("getnamesintrie ( \"" T_BLOCKHASH R"(" )
-Return all claim names in the trie.
-Arguments:)")
-S3("1. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S1("Result: [")
-S3("    ", T_NAMES, "                  all names in the trie that have claims")
-"]",
-
-// GETVALUEFORNAME
-S1("getvalueforname \"" T_NAME "\" ( \"" T_BLOCKHASH "\" \"" T_CLAIMID R"(" )
-Return the winning or specified by claimId value associated with a name
-Arguments:)")
-S3("1. ", T_NAME, NAME_TEXT)
-S3("2. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S3("3. ", T_CLAIMID, "                 (string, optional) can be partial one")
-S1("Result: [")
-CLAIM_OUTPUT
-"]",
-
-// GETCLAIMSFORNAME
-S1("getclaimsforname \"" T_NAME "\" ( \"" T_BLOCKHASH R"(" )
-Return all claims and supports for a name
-Arguments:)")
-S3("1. ", T_NAME, NAME_TEXT)
-S3("2. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S1("Result: [")
-S3("    ", T_NORMALIZEDNAME, "         (string) the name of the claim(s) (after normalization)")
-S3("    ", T_CLAIMS, ": [              (array of object) the claims for this name")
-S3("        ", T_NAME, "               (string) the original name of this claim (before normalization)")
-S3("        ", T_VALUE, "              (string) the value of this claim")
-S3("        ", T_ADDRESS, "            (string) the destination address of this claim")
-S3("        ", T_CLAIMID, "            (string) the claimId of the claim")
-S3("        ", T_TXID, "               (string) the txid of the claim")
-S3("        ", T_N, "                  (numeric) the index of the claim in the transaction's list of outputs")
-S3("        ", T_HEIGHT, "             (numeric) the height of the block in which this transaction is located")
-S3("        ", T_VALIDATHEIGHT, "      (numeric) the height at which the claim became/becomes valid")
-S3("        ", T_AMOUNT, "             (numeric) the amount of the claim")
-S3("        ", T_EFFECTIVEAMOUNT, "    (numeric) the amount plus amount from all supports associated with the claim")
-S3("        ", T_PENDINGAMOUNT, "      (numeric) expected amount when claim and its support got valid")
-S3("        ", T_SUPPORTS, ": [        (array of object) supports for this claim")
-S3("            ", T_VALUE, "          (string) the metadata of the support if any")
-S3("            ", T_ADDRESS, "        (string) the destination address of the support")
-S3("            ", T_TXID, "           (string) the txid of the support")
-S3("            ", T_N, "              (numeric) the index of the support in the transaction's list of outputs")
-S3("            ", T_HEIGHT, "         (numeric) the height of the block in which this transaction is located")
-S3("            ", T_VALIDATHEIGHT, "  (numeric) the height at which the support became/becomes valid")
-S3("            ", T_AMOUNT, "         (numeric) the amount of the support")
-S1("        ]")
-S3("        ", T_BID, "                (numeric) lower value means a higher bid rate, ordered by effective amount")
-S3("        ", T_SEQUENCE, "           (numeric) lower value means an older one in sequence, ordered by height of insertion")
-S1("    ]")
-S3("    ", T_LASTTAKEOVERHEIGHT, "     (numeric) the last height at which ownership of the name changed")
-S3("    ", T_SUPPORTSWITHOUTCLAIM, ": [")
-S3("        ", T_TXID, "               (string) the txid of the support")
-S3("        ", T_N, "                  (numeric) the index of the support in the transaction's list of outputs")
-S3("        ", T_HEIGHT, "             (numeric) the height of the block in which this transaction is located")
-S3("        ", T_VALIDATHEIGHT, "      (numeric) the height at which the support became/becomes valid")
-S3("        ", T_AMOUNT, "             (numeric) the amount of the support")
-S1("    ]")
-"]",
-
-// GETCLAIMBYID
-S1("getclaimbyid \"" T_CLAIMID R"("
-Get a claim by claim id
-Arguments:)")
-S3("1. ", T_CLAIMID, "                 (string) the claimId of this claim or patial id (at least 3 chars)")
-S1("Result: [")
-CLAIM_OUTPUT
-"]",
-
-// GETTOTALCLAIMEDNAMES
-S1(R"(gettotalclaimednames
-Return the total number of names that have been
-Arguments:)")
-S1("Result:")
-S3("    ", T_TOTALNAMES, "             (numeric) the total number of names in the trie")
-,
-
-// GETTOTALCLAIMS
-S1(R"(gettotalclaims
-Return the total number of active claims in the trie
-Arguments:)")
-S1("Result:")
-S3("    ", T_TOTALCLAIMS, "            (numeric) the total number of active claims")
-,
-
-// GETTOTALVALUEOFCLAIMS
-S1("gettotalvalueofclaims ( " T_CONTROLLINGONLY R"( )
-Return the total value of the claims in the trie
-Arguments:)")
-S3("1. ", T_CONTROLLINGONLY, "         (boolean) only include the value of controlling claims")
-S1("Result:")
-S3("    ", T_TOTALVALUE, "             (numeric) the total value of the claims in the trie")
-,
-
-// GETCLAIMSFORTX
-S1("getclaimsfortx \"" T_TXID R"("
-Return any claims or supports found in a transaction
-Arguments:)")
-S3("1.  ", T_TXID, "                   (string) the txid of the transaction to check for unspent claims")
-S1("Result: [")
-S3("    ", T_N, "                      (numeric) the index of the claim in the transaction's list of outputs")
-S3("    ", T_CLAIMTYPE, "              (string) claim or support")
-S3("    ", T_NAME, "                   (string) the name claimed or supported")
-S3("    ", T_CLAIMID, "                (string) if a claim, its ID")
-S3("    ", T_VALUE, "                  (string) if a claim, its value")
-S3("    ", T_DEPTH, "                  (numeric) the depth of the transaction in the main chain")
-S3("    ", T_INCLAIMTRIE, "            (boolean) if a name claim, whether the claim is active, i.e. has made it into the trie")
-S3("    ", T_ISCONTROLLING, "          (boolean) if a name claim, whether the claim is the current controlling claim for the name")
-S3("    ", T_INSUPPORTMAP, "           (boolean) if a support, whether the support is active, i.e. has made it into the support map")
-S3("    ", T_INQUEUE, "                (boolean) whether the claim is in a queue waiting to be inserted into the trie or support map")
-S3("    ", T_BLOCKSTOVALID, "          (numeric) if in a queue, the number of blocks until it's inserted into the trie or support map")
-"]",
-
-// GETNAMEPROOF
-S1("getnameproof \"" T_NAME "\" ( \"" T_BLOCKHASH "\" \"" T_CLAIMID R"(" )
-Return the cryptographic proof that a name maps to a value or doesn't.
-Arguments:)")
-S3("1. ", T_NAME, NAME_TEXT)
-S3("2. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S3("3. ", T_CLAIMID, R"(                 (string, optional, post-fork) for validating a specific claim
-                                                can be partial one)")
-S1("Result: [")
-PROOF_OUTPUT
-"]",
-
-// CHECKNORMALIZATION
-S1("checknormalization \"" T_NAME R"("
-Given an unnormalized name of a claim, return normalized version of it
-Arguments:)")
-S3("1. ", T_NAME, "                    (string) the name to normalize")
-S1("Result:")
-S3("    ", T_NORMALIZEDNAME,  "        (string) normalized name")
-,
-
-// GETCLAIMBYBID
-S1("getclaimbybid \"" T_NAME "\" ( " T_BID " \"" T_BLOCKHASH R"(" )
-Get a claim by bid
-Arguments:)")
-S3("1. ", T_NAME, NAME_TEXT)
-S3("2. ", T_BID, "                     (numeric, optional) bid number")
-S3("3. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S1("Result: [")
-CLAIM_OUTPUT
-"]",
-
-// GETCLAIMBYSEQ
-S1("getclaimbyseq \"" T_NAME "\" ( " T_SEQUENCE " \"" T_BLOCKHASH R"(" )
-Get a claim by sequence
-Arguments:)")
-S3("1. ", T_NAME, NAME_TEXT)
-S3("2. ", T_SEQUENCE, "                (numeric, optional) sequence number")
-S3("3. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S1("Result: [")
-CLAIM_OUTPUT
-"]",
-
-// GETCLAIMPROOFBYBID
-S1("getclaimproofbyid \"" T_NAME "\" ( " T_BID " \"" T_BLOCKHASH R"(" )
-Return the cryptographic proof that a name maps to a value or doesn't by a bid.
-Arguments:)")
-S3("1. ", T_NAME, NAME_TEXT)
-S3("2. ", T_BID, "                     (numeric, optional) bid number")
-S3("3. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S1("Result: [")
-PROOF_OUTPUT
-"]",
-
-// GETCLAIMPROOFBYSEQ
-S1("getclaimproofbyseq \"" T_NAME "\" ( " T_SEQUENCE " \"" T_BLOCKHASH R"(" )
-Return the cryptographic proof that a name maps to a value or doesn't by a sequence.
-Arguments:)")
-S3("1. ", T_NAME, NAME_TEXT)
-S3("2. ", T_SEQUENCE, "                (numeric, optional) sequence number")
-S3("3. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S1("Result: [")
-PROOF_OUTPUT
-"]",
-
-// GETCHANGESINBLOCK
-S1("getchangesinblock ( \"" T_BLOCKHASH R"(" )
-Return the list of claims added, updated, and removed as pulled from the queued work for that block."
-Use this method to determine which claims or supports went live on a given block."
-Arguments:)")
-S3("1. ", T_BLOCKHASH, BLOCKHASH_TEXT)
-S1("Result: [")
-S3("    ", T_CLAIMSADDEDORUPDATED, "   (array of string) claimIDs added or updated in the trie")
-S3("    ", T_CLAIMSREMOVED, "          (array of string) claimIDs that were removed from the trie")
-S3("    ", T_SUPPORTSADDEDORUPDATED, " (array of string) IDs of supports added or updated")
-S3("    ", T_SUPPORTSREMOVED, "        (array of string) IDs that were removed from the trie")
-"]",
-
-};
-
-#endif // CLAIMRPCHELP_H
--- a/src/rpc/claimtrie.cpp
+++ b/src/rpc/claimtrie.cpp
--- a/src/rpc/client.cpp
+++ b/src/rpc/client.cpp
@ -80,7 +80,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
    { "scantxoutset", 1, "scanobjects" },
    { "addmultisigaddress", 0, "nrequired" },
    { "addmultisigaddress", 1, "keys" },
-    { "addtimelockedaddress", 0, "timelock" },
    { "createmultisig", 0, "nrequired" },
    { "createmultisig", 1, "keys" },
    { "listunspent", 0, "minconf" },
@ -172,15 +171,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
    { "rescanblockchain", 0, "start_height"},
    { "rescanblockchain", 1, "stop_height"},
    { "createwallet", 1, "disable_private_keys"},
-    { "listnameclaims", 0, "includesupports"},
-    { "listnameclaims", 1, "activeonly"},
-    { "listnameclaims", 2, "minconf"},
-    { "getclaimbybid", 1, "bid"},
-    { "getclaimbyseq", 1, "sequence"},
-    { "getclaimproofbybid", 1, "bid"},
-    { "getclaimproofbyseq", 1, "sequence"},
-    { "supportclaim", 4, "isTip"},
-    { "gettotalvalueofclaims", 0, "controlling_only"},
 };

 class CRPCConvertTable
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@ -451,7 +451,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request)
    if (strMode != "template")
        throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid mode");

-    if (Params().NetworkIDString() == CBaseChainParams::MAIN)
+    if (Params().NetworkIDString() != "lbrycrdreg") // who should own this constant?
    {
        if (!g_connman)
            throw JSONRPCError(RPC_CLIENT_P2P_DISABLED, "Error: Peer-to-peer functionality missing or disabled");
@ -567,8 +567,6 @@ static UniValue getblocktemplate(const JSONRPCRequest& request)

    // NOTE: If at some point we support pre-segwit miners post-segwit-activation, this needs to take segwit support into consideration
    const bool fPreSegWit = (ThresholdState::ACTIVE != VersionBitsState(pindexPrev, consensusParams, Consensus::DEPLOYMENT_SEGWIT, versionbitscache));
-    if (!fPreSegWit && !fSupportsSegwit)
-        throw JSONRPCError(RPC_INVALID_PARAMETER, "Segwit support is now required. Please include \"segwit\" in the client's rules.");

    UniValue aCaps(UniValue::VARR); aCaps.push_back("proposal");
    UniValue result(UniValue::VOBJ);
@ -623,6 +621,7 @@ static UniValue getblocktemplate(const JSONRPCRequest& request)
    aMutable.push_back("time");
    aMutable.push_back("transactions");
    aMutable.push_back("prevblock");
+    aMutable.push_back("submit/coinbase");

    result.pushKV("capabilities", aCaps);

--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@ -555,7 +555,6 @@ static UniValue decoderawtransaction(const JSONRPCRequest& request)
            "         \"asm\" : \"asm\",          (string) the asm\n"
            "         \"hex\" : \"hex\",          (string) the hex\n"
            "         \"reqSigs\" : n,            (numeric) The required sigs\n"
-            "         \"subtype\" : \"pubkeyhash\", (numeric) For claims and supports, this represents the type of suffix\n"
            "         \"type\" : \"pubkeyhash\",  (string) The type, eg 'pubkeyhash'\n"
            "         \"addresses\" : [           (json array of string)\n"
            "           \"12tvKAXCxZjSmdNbao16dKXC8tRWfcF5oc\"   (string) lbry address\n"
@ -1758,7 +1757,7 @@ UniValue converttopsbt(const JSONRPCRequest& request)
                            "createpsbt and walletcreatefundedpsbt should be used for new applications.\n"
                            "\nArguments:\n"
                            "1. \"hexstring\"              (string, required) The hex string of a raw transaction\n"
-                            "2. permitsigdata           (boolean, optional, default=false) If true, any signatures in the input will be discarded and conversion\n"
+                            "2. permitsigdata           (boolean, optional, default=false) If true, any signatures in the input will be discarded and conversion.\n"
                            "                              will continue. If false, RPC will fail if any signatures are present.\n"
                            "3. iswitness               (boolean, optional) Whether the transaction hex is a serialized witness transaction.\n"
                            "                              If iswitness is not present, heuristic tests will be used in decoding. If true, only witness deserializaion\n"
--- a/src/scheduler.cpp
+++ b/src/scheduler.cpp
@ -64,21 +64,9 @@ void CScheduler::serviceQueue()
            // Explicitly use a template here to avoid hitting that overload.
            while (!shouldStop() && !taskQueue.empty()) {
                boost::chrono::system_clock::time_point timeToWaitFor = taskQueue.begin()->first;
-                try {
-                    if (newTaskScheduled.wait_until<>(lock, timeToWaitFor) == boost::cv_status::timeout) {
+                if (newTaskScheduled.wait_until<>(lock, timeToWaitFor) == boost::cv_status::timeout)
                    break; // Exit loop after timeout, it means we reached the time of the event
            }
-                } catch (boost::thread_interrupted) {
-                    // We need to make sure we don't ignore this, or the thread won't end
-                    throw;
-                } catch (...) {
-                    // Some boost versions have a bug that can cause a time prior to system boot (or wake from sleep) to throw an exception instead of return timeout
-                    // See https://github.com/boostorg/thread/issues/308
-                    // Check if the time has passed and, if so, break gracefully
-                    if (timeToWaitFor <= boost::chrono::system_clock::now()) break;
-                    throw;
-                }
-            }
 #endif
            // If there are multiple threads, the queue can empty while we're waiting (another
            // thread may service the task we were waiting on).
--- a/src/script/interpreter.cpp
+++ b/src/script/interpreter.cpp
@ -4,7 +4,6 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.

 #include <script/interpreter.h>
-#include <nameclaim.h>

 #include <crypto/ripemd160.h>
 #include <crypto/sha1.h>
@ -1491,11 +1490,6 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
        return set_error(serror, SCRIPT_ERR_SIG_PUSHONLY);
    }

-    int claimOp;
-    const CScript& strippedScriptPubKey = StripClaimScriptPrefix(scriptPubKey, claimOp);
-    if (claimOp >= 0) // lbryum used to violate this rule with an off-by-1 at len == 255 (and its not very important)
-        flags &= ~SCRIPT_VERIFY_MINIMALDATA;
-
    std::vector<std::vector<unsigned char> > stack, stackCopy;
    if (!EvalScript(stack, scriptSig, flags, checker, SigVersion::BASE, serror))
        // serror is set
@ -1511,11 +1505,10 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
        return set_error(serror, SCRIPT_ERR_EVAL_FALSE);

    // Bare witness programs
-
    int witnessversion;
    std::vector<unsigned char> witnessprogram;
    if (flags & SCRIPT_VERIFY_WITNESS) {
-        if (strippedScriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
+        if (scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
            hadWitness = true;
            if (scriptSig.size() != 0) {
                // The scriptSig must be _exactly_ CScript(), otherwise we reintroduce malleability.
@ -1531,7 +1524,7 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C
    }

    // Additional validation for spend-to-script-hash transactions:
-    if ((flags & SCRIPT_VERIFY_P2SH) && strippedScriptPubKey.IsPayToScriptHash())
+    if ((flags & SCRIPT_VERIFY_P2SH) && scriptPubKey.IsPayToScriptHash())
    {
        // scriptSig must be literals-only or validation fails
        if (!scriptSig.IsPushOnly())
--- a/src/script/ismine.cpp
+++ b/src/script/ismine.cpp
@ -40,6 +40,8 @@ enum class IsMineResult
    WATCH_ONLY = 1,  //! Included in watch-only balance
    SPENDABLE = 2,   //! Included in all balances
    INVALID = 3,     //! Not spendable by anyone (uncompressed pubkey in segwit, P2SH inside P2SH or witness, witness inside witness)
+    CLAIM = 4,
+    SUPPORT = 5,
 };

 bool PermitsUncompressed(IsMineSigVersion sigversion)
@ -58,11 +60,17 @@ bool HaveKeys(const std::vector<valtype>& pubkeys, const CKeyStore& keystore)

 IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey, IsMineSigVersion sigversion)
 {
+    int op = 0;
    IsMineResult ret = IsMineResult::NO;

+    CScript strippedScriptPubKey = StripClaimScriptPrefix(scriptPubKey, op);
+    IsMineResult claim_ret = ((op == OP_CLAIM_NAME || op == OP_UPDATE_CLAIM) ? IsMineResult::CLAIM :
+                 ((op == OP_SUPPORT_CLAIM) ? IsMineResult::SUPPORT :
+                  IsMineResult::NO));
+
    std::vector<valtype> vSolutions;
    txnouttype whichType;
-    Solver(scriptPubKey, whichType, vSolutions);
+    Solver(strippedScriptPubKey, whichType, vSolutions);

    CKeyID keyID;
    switch (whichType)
@ -77,7 +85,7 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
            return IsMineResult::INVALID;
        }
        if (keystore.HaveKey(keyID)) {
-            ret = std::max(ret, IsMineResult::SPENDABLE);
+            ret = std::max(claim_ret, IsMineResult::SPENDABLE);
        }
        break;
    case TX_WITNESS_V0_KEYHASH:
@ -92,6 +100,10 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
            // This also applies to the P2WSH case.
            break;
        }
+        // Claims are not explicitly supported on Witness v0
+        // Transactions, and instead of supporting the wrapped inner
+        // tx, we are ignoring this type at this time (consistent with
+        // previous releases).
        ret = std::max(ret, IsMineInner(keystore, GetScriptForDestination(CKeyID(uint160(vSolutions[0]))), IsMineSigVersion::WITNESS_V0));
        break;
    }
@ -104,7 +116,7 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
            }
        }
        if (keystore.HaveKey(keyID)) {
-            ret = std::max(ret, IsMineResult::SPENDABLE);
+            ret = std::max(claim_ret, IsMineResult::SPENDABLE);
        }
        break;
    case TX_SCRIPTHASH:
@ -116,7 +128,7 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
        CScriptID scriptID = CScriptID(uint160(vSolutions[0]));
        CScript subscript;
        if (keystore.GetCScript(scriptID, subscript)) {
-            ret = std::max(ret, IsMineInner(keystore, subscript, IsMineSigVersion::P2SH));
+            ret = std::max(claim_ret, IsMineInner(keystore, subscript, IsMineSigVersion::P2SH));
        }
        break;
    }
@ -134,6 +146,10 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
        CScriptID scriptID = CScriptID(hash);
        CScript subscript;
        if (keystore.GetCScript(scriptID, subscript)) {
+            // Claims are not explicitly supported on Witness v0
+            // Transactions, and instead of supporting the wrapped inner
+            // tx, we are ignoring this type at this time (consistent with
+            // previous releases).
            ret = std::max(ret, IsMineInner(keystore, subscript, IsMineSigVersion::WITNESS_V0));
        }
        break;
@ -160,14 +176,14 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,
            }
        }
        if (HaveKeys(keys, keystore)) {
-            ret = std::max(ret, IsMineResult::SPENDABLE);
+            ret = std::max(claim_ret, IsMineResult::SPENDABLE);
        }
        break;
    }
    }

    if (ret == IsMineResult::NO && keystore.HaveWatchOnly(scriptPubKey)) {
-        ret = std::max(ret, IsMineResult::WATCH_ONLY);
+        ret = std::max(claim_ret, IsMineResult::WATCH_ONLY);
    }
    return ret;
 }
@ -176,22 +192,18 @@ IsMineResult IsMineInner(const CKeyStore& keystore, const CScript& scriptPubKey,

 isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey)
 {
-    isminetype flags = ISMINE_NO;
-    int op;
-    CScript strippedScriptPubKey = StripClaimScriptPrefix(scriptPubKey, op);
-    if (op == OP_CLAIM_NAME || op == OP_UPDATE_CLAIM)
-        flags = ISMINE_CLAIM;
-    else if (op == OP_SUPPORT_CLAIM)
-        flags = ISMINE_SUPPORT;
-
-    switch (IsMineInner(keystore, strippedScriptPubKey, IsMineSigVersion::TOP)) {
+    switch (IsMineInner(keystore, scriptPubKey, IsMineSigVersion::TOP)) {
    case IsMineResult::INVALID:
    case IsMineResult::NO:
        return ISMINE_NO;
    case IsMineResult::WATCH_ONLY:
-        return ISMINE_WATCH_ONLY; // addresses we're watching are never considered our claim or support -- but should they be?
+        return ISMINE_WATCH_ONLY;
    case IsMineResult::SPENDABLE:
-        return isminetype(ISMINE_SPENDABLE | flags);
+        return ISMINE_SPENDABLE;
+    case IsMineResult::CLAIM:
+        return ISMINE_CLAIM;
+    case IsMineResult::SUPPORT:
+        return ISMINE_SUPPORT;
    }
    assert(false);
 }
--- a/src/script/ismine.h
+++ b/src/script/ismine.h
@ -21,9 +21,7 @@ enum isminetype
    ISMINE_SPENDABLE = 2,
    ISMINE_CLAIM = 4,
    ISMINE_SUPPORT = 8,
-    ISMINE_ALL = ISMINE_WATCH_ONLY | ISMINE_SPENDABLE,
-    ISMINE_STAKE = ISMINE_CLAIM | ISMINE_SUPPORT,
-    ISMINE_SPENDABLE_OR_STAKE = ISMINE_SPENDABLE | ISMINE_STAKE
+    ISMINE_ALL = ISMINE_WATCH_ONLY | ISMINE_SPENDABLE
 };
 /** used for bitflags of isminetype */
 typedef uint8_t isminefilter;
--- a/src/script/script.cpp
+++ b/src/script/script.cpp
@ -133,9 +133,9 @@ const char* GetOpName(opcodetype opcode)
    case OP_CHECKSEQUENCEVERIFY    : return "OP_CHECKSEQUENCEVERIFY";
    case OP_NOP4                   : return "OP_NOP4";
    case OP_NOP5                   : return "OP_NOP5";
-    case OP_NOP6                   : return "OP_CLAIM_NAME";
-    case OP_NOP7                   : return "OP_SUPPORT_CLAIM";
-    case OP_NOP8                   : return "OP_UPDATE_CLAIM";
+    case OP_NOP6                   : return "OP_NOP6";
+    case OP_NOP7                   : return "OP_NOP7";
+    case OP_NOP8                   : return "OP_NOP8";
    case OP_NOP9                   : return "OP_NOP9";
    case OP_NOP10                  : return "OP_NOP10";

--- a/src/script/sign.cpp
+++ b/src/script/sign.cpp
@ -6,12 +6,13 @@
 #include <script/sign.h>

 #include <key.h>
-#include <nameclaim.h>
 #include <policy/policy.h>
 #include <primitives/transaction.h>
 #include <script/standard.h>
 #include <uint256.h>

+#include "nameclaim.h"
+
 typedef std::vector<unsigned char> valtype;

 MutableTransactionSignatureCreator::MutableTransactionSignatureCreator(const CMutableTransaction* txToIn, unsigned int nInIn, const CAmount& amountIn, int nHashTypeIn) : txTo(txToIn), nIn(nInIn), nHashType(nHashTypeIn), amount(amountIn), checker(txTo, nIn, amountIn) {}
@ -87,21 +88,6 @@ static bool CreateSig(const BaseSignatureCreator& creator, SignatureData& sigdat
    return false;
 }

-static CScript StripTimelockPrefix(const CScript& script) {
-    auto it = script.begin();
-    opcodetype op;
-    if (!script.GetOp(it, op))
-        return script;
-
-    if (!script.GetOp(it, op) || (op != OP_CHECKLOCKTIMEVERIFY && op != OP_CHECKSEQUENCEVERIFY))
-        return script;
-
-    if (!script.GetOp(it, op) || op != OP_DROP)
-        return script;
-
-    return CScript(it, script.end());
-}
-
 /**
 * Sign scriptPubKey using signature made with creator.
 * Signatures are returned in scriptSigRet (or returns false if scriptPubKey can't be signed),
@ -116,10 +102,10 @@ static bool SignStep(const SigningProvider& provider, const BaseSignatureCreator
    ret.clear();
    std::vector<unsigned char> sig;

+    const CScript& strippedScriptPubKey = StripClaimScriptPrefix(scriptPubKey);
+
    std::vector<valtype> vSolutions;
-    auto stripped = StripClaimScriptPrefix(scriptPubKey);
-    stripped = StripTimelockPrefix(stripped);
-    if (!Solver(stripped, whichTypeRet, vSolutions))
+    if (!Solver(strippedScriptPubKey, whichTypeRet, vSolutions))
        return false;

    switch (whichTypeRet)
@ -367,7 +353,7 @@ SignatureData DataFromTransaction(const CMutableTransaction& tx, unsigned int nI
    // Get scripts
    txnouttype script_type;
    std::vector<std::vector<unsigned char>> solutions;
-    Solver(StripClaimScriptPrefix(txout.scriptPubKey), script_type, solutions);
+    Solver(txout.scriptPubKey, script_type, solutions);
    SigVersion sigversion = SigVersion::BASE;
    CScript next_script = txout.scriptPubKey;

--- a/src/script/standard.cpp
+++ b/src/script/standard.cpp
@ -6,9 +6,9 @@
 #include <script/standard.h>

 #include <crypto/sha256.h>
-#include <nameclaim.h>
 #include <pubkey.h>
 #include <script/script.h>
+#include <util.h>
 #include <utilstrencodings.h>


@ -166,7 +166,7 @@ bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet)
 {
    std::vector<valtype> vSolutions;
    txnouttype whichType;
-    if (!Solver(StripClaimScriptPrefix(scriptPubKey), whichType, vSolutions))
+    if (!Solver(scriptPubKey, whichType, vSolutions))
        return false;

    if (whichType == TX_PUBKEY)
@ -214,8 +214,9 @@ bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::
    addressRet.clear();
    typeRet = TX_NONSTANDARD;
    std::vector<valtype> vSolutions;
-    auto solved = Solver(scriptPubKey, typeRet, vSolutions);
-    if (!solved || typeRet == TX_NULL_DATA){
+    if (!Solver(scriptPubKey, typeRet, vSolutions))
+        return false;
+    if (typeRet == TX_NULL_DATA){
        // This is data, not addresses
        return false;
    }
--- a/src/streams.h
+++ b/src/streams.h
@ -232,6 +232,7 @@ public:
        return vch.capacity();
    }

+
    //
    // Vector subset
    //
--- a/src/test/claimtriebranching_tests.cpp
+++ b/src/test/claimtriebranching_tests.cpp
--- a/src/test/claimtriecache_tests.cpp
+++ b/src/test/claimtriecache_tests.cpp
@ -3,7 +3,6 @@
 #include <uint256.h>
 #include <validation.h>

-#include <test/claimtriefixture.h>
 #include <test/test_bitcoin.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/scope_exit.hpp>
@ -37,12 +36,29 @@ public:
        return nodesToAddOrUpdate.height();
    }

-    CClaimTrie::iterator getCache(const std::string& key)
+    CClaimPrefixTrie::iterator getCache(const std::string& key)
    {
        return nodesToAddOrUpdate.find(key);
    }
 };

+CMutableTransaction BuildTransaction(const uint256& prevhash)
+{
+    CMutableTransaction tx;
+    tx.nVersion = 1;
+    tx.nLockTime = 0;
+    tx.vin.resize(1);
+    tx.vout.resize(1);
+    tx.vin[0].prevout.hash = prevhash;
+    tx.vin[0].prevout.n = 0;
+    tx.vin[0].scriptSig = CScript();
+    tx.vin[0].nSequence = std::numeric_limits<unsigned int>::max();
+    tx.vout[0].scriptPubKey = CScript();
+    tx.vout[0].nValue = 0;
+
+    return tx;
+}
+
 BOOST_FIXTURE_TEST_SUITE(claimtriecache_tests, RegTestingSetup)

 BOOST_AUTO_TEST_CASE(merkle_hash_single_test)
@ -108,7 +124,7 @@ BOOST_AUTO_TEST_CASE(merkle_hash_multiple_test)

    BOOST_CHECK(!pclaimTrie->empty());
    BOOST_CHECK_EQUAL(ntState.getMerkleHash(), hash2);
-    BOOST_CHECK(ntState.checkConsistency());
+    BOOST_CHECK(pclaimTrie->checkConsistency(hash2));

    CClaimTrieCacheTest ntState1(pclaimTrie);
    ntState1.removeClaimFromTrie(std::string("test"), tx1OutPoint, unused, true);
@ -128,7 +144,7 @@ BOOST_AUTO_TEST_CASE(merkle_hash_multiple_test)

    BOOST_CHECK(!pclaimTrie->empty());
    BOOST_CHECK_EQUAL(ntState2.getMerkleHash(), hash3);
-    BOOST_CHECK(ntState2.checkConsistency());
+    BOOST_CHECK(pclaimTrie->checkConsistency(hash3));

    CClaimTrieCacheTest ntState3(pclaimTrie);
    ntState3.insertClaimIntoTrie(std::string("test"), CClaimValue(tx1OutPoint, hash160, 50, 100, 200), true);
@ -136,7 +152,7 @@ BOOST_AUTO_TEST_CASE(merkle_hash_multiple_test)
    ntState3.flush();
    BOOST_CHECK(!pclaimTrie->empty());
    BOOST_CHECK_EQUAL(ntState3.getMerkleHash(), hash4);
-    BOOST_CHECK(ntState3.checkConsistency());
+    BOOST_CHECK(pclaimTrie->checkConsistency(hash4));

    CClaimTrieCacheTest ntState4(pclaimTrie);
    ntState4.removeClaimFromTrie(std::string("abab"), tx6OutPoint, unused, true);
@ -144,7 +160,7 @@ BOOST_AUTO_TEST_CASE(merkle_hash_multiple_test)
    ntState4.flush();
    BOOST_CHECK(!pclaimTrie->empty());
    BOOST_CHECK_EQUAL(ntState4.getMerkleHash(), hash2);
-    BOOST_CHECK(ntState4.checkConsistency());
+    BOOST_CHECK(pclaimTrie->checkConsistency(hash2));

    CClaimTrieCacheTest ntState5(pclaimTrie);
    ntState5.removeClaimFromTrie(std::string("test"), tx3OutPoint, unused, true);
@ -153,7 +169,7 @@ BOOST_AUTO_TEST_CASE(merkle_hash_multiple_test)
    ntState5.flush();
    BOOST_CHECK(!pclaimTrie->empty());
    BOOST_CHECK_EQUAL(ntState5.getMerkleHash(), hash2);
-    BOOST_CHECK(ntState5.checkConsistency());
+    BOOST_CHECK(pclaimTrie->checkConsistency(hash2));

    CClaimTrieCacheTest ntState6(pclaimTrie);
    ntState6.insertClaimIntoTrie(std::string("test"), CClaimValue(tx3OutPoint, hash160, 50, 101, 201), true);
@ -162,7 +178,7 @@ BOOST_AUTO_TEST_CASE(merkle_hash_multiple_test)
    ntState6.flush();
    BOOST_CHECK(!pclaimTrie->empty());
    BOOST_CHECK_EQUAL(ntState6.getMerkleHash(), hash2);
-    BOOST_CHECK(ntState6.checkConsistency());
+    BOOST_CHECK(pclaimTrie->checkConsistency(hash2));

    CClaimTrieCacheTest ntState7(pclaimTrie);
    ntState7.removeClaimFromTrie(std::string("test"), tx3OutPoint, unused, true);
@ -174,7 +190,7 @@ BOOST_AUTO_TEST_CASE(merkle_hash_multiple_test)
    ntState7.flush();
    BOOST_CHECK(pclaimTrie->empty());
    BOOST_CHECK_EQUAL(ntState7.getMerkleHash(), hash0);
-    BOOST_CHECK(ntState7.checkConsistency());
+    BOOST_CHECK(pclaimTrie->checkConsistency(hash0));
 }

 BOOST_AUTO_TEST_CASE(basic_insertion_info_test)
@ -184,6 +200,7 @@ BOOST_AUTO_TEST_CASE(basic_insertion_info_test)
    CClaimTrieCacheTest ctc(pclaimTrie);

    // create and insert claim
+    CClaimValue unused;
    uint256 hash0(uint256S("0000000000000000000000000000000000000000000000000000000000000001"));
    CMutableTransaction tx1 = BuildTransaction(hash0);
    uint160 claimId = ClaimIdHash(tx1.GetHash(), 0);
@ -194,13 +211,13 @@ BOOST_AUTO_TEST_CASE(basic_insertion_info_test)
    CClaimValue claimVal(claimOutPoint, claimId, amount, height, validHeight);
    ctc.insertClaimIntoTrie("test", claimVal, true);

-    // try getClaimsForName, effectiveAmount, getInfoForName
+    // try getClaimsForName, getEffectiveAmountForClaim, getInfoForName
    auto res = ctc.getClaimsForName("test");
-    BOOST_CHECK_EQUAL(res.claimsNsupports.size(), 1);
-    BOOST_CHECK_EQUAL(res.claimsNsupports[0].claim, claimVal);
-    BOOST_CHECK_EQUAL(res.claimsNsupports[0].supports.size(), 0);
+    BOOST_CHECK_EQUAL(res.claims.size(), 1);
+    BOOST_CHECK_EQUAL(res.claims[0], claimVal);
+    BOOST_CHECK_EQUAL(res.supports.size(), 0);

-    BOOST_CHECK_EQUAL(10, res.claimsNsupports[0].effectiveAmount);
+    BOOST_CHECK_EQUAL(10, ctc.getEffectiveAmountForClaim("test", claimId));

    CClaimValue claim;
    BOOST_CHECK(ctc.getInfoForName("test", claim));
@ -215,12 +232,12 @@ BOOST_AUTO_TEST_CASE(basic_insertion_info_test)
    CSupportValue support(supportOutPoint, claimId, supportAmount, height, validHeight);
    ctc.insertSupportIntoMap("test", support, false);

-    auto res1 = ctc.getClaimsForName("test");
-    BOOST_CHECK_EQUAL(res1.claimsNsupports.size(), 1);
-    BOOST_CHECK_EQUAL(res1.claimsNsupports[0].supports.size(), 1);
+    res = ctc.getClaimsForName("test");
+    BOOST_CHECK_EQUAL(res.claims.size(), 1);
+    BOOST_CHECK_EQUAL(res.supports.size(), 1);

    // try getEffectiveAmount
-    BOOST_CHECK_EQUAL(20, res1.claimsNsupports[0].effectiveAmount);
+    BOOST_CHECK_EQUAL(20, ctc.getEffectiveAmountForClaim("test", claimId));
 }

 BOOST_AUTO_TEST_CASE(recursive_prune_test)
@ -281,12 +298,13 @@ BOOST_AUTO_TEST_CASE(iteratetrie_test)
    ctc.insertClaimIntoTrie("test", claimVal, true);
    BOOST_CHECK(ctc.flush());

-    auto hit = pclaimTrie->find("");
-    BOOST_CHECK(hit);
-    BOOST_CHECK_EQUAL(hit.children().size(), 1U);
-    BOOST_CHECK(hit = pclaimTrie->find("test"));
-    BOOST_CHECK_EQUAL(hit.children().size(), 0U);
-    BOOST_CHECK_EQUAL(hit.data().claims.size(), 1);
+    std::size_t count = 0;
+    CClaimTrieDataNode node;
+    BOOST_CHECK(pclaimTrie->find("", node));
+    BOOST_CHECK_EQUAL(node.children.size(), 1U);
+    BOOST_CHECK(pclaimTrie->find("test", node));
+    BOOST_CHECK_EQUAL(node.children.size(), 0U);
+    BOOST_CHECK_EQUAL(node.data.claims.size(), 1);
 }

 BOOST_AUTO_TEST_CASE(trie_stays_consistent_test)
@ -303,13 +321,13 @@ BOOST_AUTO_TEST_CASE(trie_stays_consistent_test)
        BOOST_CHECK(cache.insertClaimIntoTrie(name, value, false));

    cache.flush();
-    BOOST_CHECK(cache.checkConsistency());
+    BOOST_CHECK(trie.checkConsistency(cache.getMerkleHash()));

    for (auto& name: names) {
        CClaimValue temp;
        BOOST_CHECK(cache.removeClaimFromTrie(name, COutPoint(), temp, false));
        cache.flush();
-        BOOST_CHECK(cache.checkConsistency());
+        BOOST_CHECK(trie.checkConsistency(cache.getMerkleHash()));
    }
    BOOST_CHECK(trie.empty());
 }
@ -382,69 +400,7 @@ BOOST_AUTO_TEST_CASE(verify_basic_serialization)
    ssData >> cv2;

    BOOST_CHECK_EQUAL(cv, cv2);
-}
-
-BOOST_AUTO_TEST_CASE(claimtrienode_serialize_unserialize)
-{
-    CDataStream ss(SER_DISK, 0);
-
-    uint160 hash160;
-
-    CClaimTrieData n1;
-    CClaimTrieData n2;
-    CClaimValue throwaway;
-
-    ss << n1;
-    ss >> n2;
-    BOOST_CHECK_EQUAL(n1, n2);
-
-    CClaimValue v1(COutPoint(uint256S("0000000000000000000000000000000000000000000000000000000000000001"), 0), hash160, 50, 0, 100);
-    CClaimValue v2(COutPoint(uint256S("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"), 1), hash160, 100, 1, 101);
-
-    n1.insertClaim(v1);
-    BOOST_CHECK(n1 != n2);
-    ss << n1;
-    ss >> n2;
-    BOOST_CHECK_EQUAL(n1, n2);
-
-    n1.insertClaim(v2);
-    BOOST_CHECK(n1 != n2);
-    ss << n1;
-    ss >> n2;
-    BOOST_CHECK_EQUAL(n1, n2);
-
-    n1.removeClaim(v1.outPoint, throwaway);
-    BOOST_CHECK(n1 != n2);
-    ss << n1;
-    ss >> n2;
-    BOOST_CHECK_EQUAL(n1, n2);
-
-    n1.removeClaim(v2.outPoint, throwaway);
-    BOOST_CHECK(n1 != n2);
-    ss << n1;
-    ss >> n2;
-    BOOST_CHECK_EQUAL(n1, n2);
-}
-
-BOOST_AUTO_TEST_CASE(claimtrienode_remove_invalid_claim)
-{
-    uint160 hash160;
-
-    CClaimTrieData n1;
-    CClaimTrieData n2;
-    CClaimValue throwaway;
-
-    CClaimValue v1(COutPoint(uint256S("0000000000000000000000000000000000000000000000000000000000000001"), 0), hash160, 50, 0, 100);
-    CClaimValue v2(COutPoint(uint256S("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"), 1), hash160, 100, 1, 101);
-
-    n1.insertClaim(v1);
-    n2.insertClaim(v2);
-
-    bool invalidClaim = n2.removeClaim(v1.outPoint, throwaway);
-    BOOST_CHECK_EQUAL(invalidClaim, false);
-
-    invalidClaim = n1.removeClaim(v2.outPoint, throwaway);
-    BOOST_CHECK_EQUAL(invalidClaim, false);
+    BOOST_CHECK_EQUAL(cv.nEffectiveAmount, cv2.nEffectiveAmount);
 }

 BOOST_AUTO_TEST_SUITE_END()
--- a/src/test/claimtrieexpirationfork_tests.cpp
+++ b/src/test/claimtrieexpirationfork_tests.cpp
@ -1,803 +0,0 @@
-// Copyright (c) 2015-2019 The LBRY Foundation
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://opensource.org/licenses/mit-license.php
-
-#include <test/claimtriefixture.h>
-
-using namespace std;
-
-BOOST_FIXTURE_TEST_SUITE(claimtrieexpirationfork_tests, RegTestingSetup)
-
-/*
-    expiration
-        check claims expire and loses claim
-        check claims expire and is not updateable (may be changed in future soft fork)
-        check supports expire and can cause supported bid to lose claim
-*/
-BOOST_AUTO_TEST_CASE(claimtrie_expire_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setExpirationForkHeight(1000000, 5, 1000000);
-
-    // check claims expire and loses claim
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(),"test", "one", 2);
-    fixture.IncrementBlocks(fixture.expirationTime());
-    BOOST_CHECK(fixture.is_best_claim("test", tx1));
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(),"test", "one", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test", tx2));
-
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test", tx1));
-    fixture.DecrementBlocks(fixture.expirationTime());
-
-    // check claims expire and is not updateable (may be changed in future soft fork)
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(),"test", "one", 2);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test", tx3));
-    fixture.IncrementBlocks(fixture.expirationTime());
-    CMutableTransaction u1 = fixture.MakeUpdate(tx3, "test", "two", ClaimIdHash(tx3.GetHash(), 0), 2);
-    BOOST_CHECK(!fixture.is_best_claim("test",u1));
-
-    fixture.DecrementBlocks(fixture.expirationTime());
-    BOOST_CHECK(fixture.is_best_claim("test", tx3));
-    fixture.DecrementBlocks(1);
-
-    // check supports expire and can cause supported bid to lose claim
-    CMutableTransaction tx4 = fixture.MakeClaim(fixture.GetCoinbase(), "test", "one", 1);
-    CMutableTransaction tx5 = fixture.MakeClaim(fixture.GetCoinbase(), "test", "one", 2);
-    CMutableTransaction s1 = fixture.MakeSupport(fixture.GetCoinbase(), tx4, "test", 2);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test",tx4));
-    CMutableTransaction u2 = fixture.MakeUpdate(tx4, "test", "two", ClaimIdHash(tx4.GetHash(),0), 1);
-    CMutableTransaction u3 = fixture.MakeUpdate(tx5, "test", "two", ClaimIdHash(tx5.GetHash(),0), 2);
-    fixture.IncrementBlocks(fixture.expirationTime());
-    BOOST_CHECK(fixture.is_best_claim("test", u3));
-    fixture.DecrementBlocks(fixture.expirationTime());
-    BOOST_CHECK(fixture.is_best_claim("test", tx4));
-    fixture.DecrementBlocks(1);
-
-    // check updated claims will extend expiration
-    CMutableTransaction tx6 = fixture.MakeClaim(fixture.GetCoinbase(), "test", "one", 2);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test", tx6));
-    CMutableTransaction u4 = fixture.MakeUpdate(tx6, "test", "two", ClaimIdHash(tx6.GetHash(), 0), 2);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test", u4));
-    fixture.IncrementBlocks(fixture.expirationTime()-1);
-    BOOST_CHECK(fixture.is_best_claim("test", u4));
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(!fixture.is_best_claim("test", u4));
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test", u4));
-    fixture.DecrementBlocks(fixture.expirationTime());
-    BOOST_CHECK(fixture.is_best_claim("test", tx6));
-}
-
-/*
-    claim expiration for hard fork
-        check claims do not expire post ExpirationForkHeight
-        check supports work post ExpirationForkHeight
-*/
-BOOST_AUTO_TEST_CASE(hardfork_claim_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setExpirationForkHeight(7, 3, 6);
-
-    // First create a claim and make sure it expires pre-fork
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(),"test","one",3);
-    fixture.IncrementBlocks(4);
-    BOOST_CHECK(!fixture.is_best_claim("test",tx1));
-    fixture.DecrementBlocks(3);
-    BOOST_CHECK(fixture.is_best_claim("test",tx1));
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(!fixture.is_best_claim("test",tx1));
-
-    // Create a claim 1 block before the fork height that will expire after the fork height
-    fixture.IncrementBlocks(1);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(),"test2","one",3);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 3);
-
-    // Disable future expirations and fast-forward past the fork height
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 6);
-    // make sure decrementing to before the fork height will apppropriately set back the
-    // expiration time to the original expiraiton time
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 3);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 6);
-
-    // make sure that claim created 1 block before the fork expires as expected
-    // at the extended expiration times
-    BOOST_CHECK(fixture.is_best_claim("test2", tx2));
-    fixture.IncrementBlocks(5);
-    BOOST_CHECK(!fixture.is_best_claim("test2", tx2));
-    fixture.DecrementBlocks(5);
-    BOOST_CHECK(fixture.is_best_claim("test2", tx2));
-
-    // This first claim is still expired since it's pre-fork, even
-    // after fork activation
-    BOOST_CHECK(!fixture.is_best_claim("test", tx1));
-
-    // This new claim created at the fork height cannot expire at original expiration
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(),"test","one",1);
-    fixture.IncrementBlocks(1);
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(fixture.is_best_claim("test",tx3));
-    BOOST_CHECK(!fixture.is_best_claim("test",tx1));
-    fixture.DecrementBlocks(3);
-
-    // but it expires at the extended expiration, and not a single block below
-    fixture.IncrementBlocks(6);
-    BOOST_CHECK(!fixture.is_best_claim("test",tx3));
-    fixture.DecrementBlocks(6);
-    fixture.IncrementBlocks(5);
-    BOOST_CHECK(fixture.is_best_claim("test",tx3));
-    fixture.DecrementBlocks(5);
-
-    // Ensure that we cannot update the original pre-fork expired claim
-    CMutableTransaction u1 = fixture.MakeUpdate(tx1,"test","two",ClaimIdHash(tx1.GetHash(),0), 3);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(!fixture.is_best_claim("test",u1));
-
-    // Ensure that supports for the expired claim don't support it
-    CMutableTransaction s1 = fixture.MakeSupport(fixture.GetCoinbase(),u1,"test",10);
-    BOOST_CHECK(!fixture.is_best_claim("test",u1));
-
-    // Ensure that we can update the new post-fork claim
-    CMutableTransaction u2 = fixture.MakeUpdate(tx3,"test","two",ClaimIdHash(tx3.GetHash(),0), 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test",u2));
-
-    // Ensure that supports for the new post-fork claim
-    CMutableTransaction s2 = fixture.MakeSupport(fixture.GetCoinbase(),u2,"test",3);
-    BOOST_CHECK(fixture.is_best_claim("test",u2));
-}
-
-/*
-    support expiration for hard fork
-*/
-BOOST_AUTO_TEST_CASE(hardfork_support_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setExpirationForkHeight(2, 2, 4);
-
-    // Create claim and support it before the fork height
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "test", "one", 1);
-    CMutableTransaction s1 = fixture.MakeSupport(fixture.GetCoinbase(), tx1, "test", 2);
-    // this claim will win without the support
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(),"test","one",2);
-    fixture.IncrementBlocks(2);
-
-    // check that the claim expires as expected at the extended time, as does the support
-    fixture.IncrementBlocks(2);
-    BOOST_CHECK(fixture.is_best_claim("test",tx1));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test",3));
-    fixture.DecrementBlocks(2);
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(!fixture.is_best_claim("test",tx1));
-    fixture.DecrementBlocks(3);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("test",tx1));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test",3));
-    fixture.DecrementBlocks(1);
-
-    // update the claims at fork
-    fixture.DecrementBlocks(1);
-    CMutableTransaction u1 = fixture.MakeUpdate(tx1, "test", "two", ClaimIdHash(tx1.GetHash(),0), 1);
-    CMutableTransaction u2 = fixture.MakeUpdate(tx2, "test", "two", ClaimIdHash(tx2.GetHash(),0), 2);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK_EQUAL(Params().GetConsensus().nExtendedClaimExpirationForkHeight, chainActive.Height());
-
-    BOOST_CHECK(fixture.is_best_claim("test", u1));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test",3));
-    BOOST_CHECK(!fixture.is_claim_in_queue("test", tx1));
-    BOOST_CHECK(!fixture.is_claim_in_queue("test", tx2));
-
-    // check that the support expires as expected
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(fixture.is_best_claim("test", u2));
-    fixture.DecrementBlocks(3);
-    fixture.IncrementBlocks(2);
-    BOOST_CHECK(fixture.is_best_claim("test",u1));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test",3));
-}
-
-/*
-    activation_fall_through and supports_fall_through
-        Tests for where claims/supports in queues would be undone properly in a decrement.
-        See https://github.com/lbryio/lbrycrd/issues/243 for more details
-*/
-
-BOOST_AUTO_TEST_CASE(activations_fall_through)
-{
-    ClaimTrieChainFixture fixture;
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "1", 1);
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK_EQUAL(fixture.proportionalDelayFactor(), 1);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "2", 3);
-    fixture.IncrementBlocks(1);
-
-    BOOST_CHECK(fixture.is_best_claim("A", tx1));
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-    fixture.DecrementBlocks(3);
-    fixture.Spend(tx1); // this will trigger early activation on tx2 claim
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-    fixture.DecrementBlocks(1); //reorg the early activation
-    BOOST_CHECK(fixture.is_best_claim("A", tx1));
-    fixture.Spend(tx1);
-    fixture.IncrementBlocks(1); // this should not cause tx2 to activate again and crash
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-}
-
-BOOST_AUTO_TEST_CASE(supports_fall_through)
-{
-    ClaimTrieChainFixture fixture;
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "1", 3);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "2", 1);
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "3", 2);
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK_EQUAL(fixture.proportionalDelayFactor(), 1);
-    CMutableTransaction sx2 = fixture.MakeSupport(fixture.GetCoinbase(), tx2, "A", 3);
-    fixture.IncrementBlocks(1);
-
-    BOOST_CHECK(fixture.is_best_claim("A", tx1));
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-    fixture.DecrementBlocks(3);
-    fixture.Spend(tx1); // this will trigger early activation
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-    fixture.DecrementBlocks(1); // reorg the early activation
-    BOOST_CHECK(fixture.is_best_claim("A", tx1));
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("A", tx1)); //tx2 support should not be active
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("A", tx1)); //tx2 support should not be active
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("A", tx2)); //tx2 support should be active now
-}
-
-/*
-    claim/support expiration for hard fork, but with checks for disk procedures
-*/
-BOOST_AUTO_TEST_CASE(hardfork_disk_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setExpirationForkHeight(7, 3, 6);
-
-    // Check that incrementing to fork height, reseting to disk will get proper expiration time
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 3);
-    fixture.IncrementBlocks(7, true);
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 6);
-    fixture.ReadFromDisk(chainActive.Tip());
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 6);
-
-    // Create a claim and support 1 block before the fork height that will expire after the fork height.
-    // Reset to disk, increment past the fork height and make sure we get
-    // proper behavior
-    fixture.DecrementBlocks(2);
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "test", "one", 1);
-    CMutableTransaction s1 = fixture.MakeSupport(fixture.GetCoinbase(), tx1, "test", 1);
-    fixture.IncrementBlocks(1);
-
-    fixture.ReadFromDisk(chainActive.Tip());
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 3);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK_EQUAL(fixture.expirationTime(), 6);
-    BOOST_CHECK(fixture.is_best_claim("test", tx1));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test",2));
-    fixture.IncrementBlocks(2);
-    BOOST_CHECK(fixture.is_best_claim("test", tx1));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test",2));
-    fixture.DecrementBlocks(2);
-    fixture.IncrementBlocks(5);
-    BOOST_CHECK(!fixture.is_best_claim("test", tx1));
-
-    // Create a claim and support before the fork height, reset to disk, update the claim
-    // increment past the fork height and make sure we get proper behavior
-    fixture.DecrementBlocks();
-    fixture.setExpirationForkHeight(3, 5, 6);
-
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(),"test2","one",1);
-    CMutableTransaction s2 = fixture.MakeSupport(fixture.GetCoinbase(),tx2,"test2",1);
-    fixture.IncrementBlocks(1);
-    fixture.ReadFromDisk(chainActive.Tip());
-    CMutableTransaction u2 = fixture.MakeUpdate(tx2, "test2", "two", ClaimIdHash(tx2.GetHash(), 0), 1);
-    // increment to fork
-    fixture.IncrementBlocks(2);
-    BOOST_CHECK(fixture.is_best_claim("test2", u2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test2",2));
-    // increment to original expiration, should not be expired
-    fixture.IncrementBlocks(2);
-    BOOST_CHECK(fixture.is_best_claim("test2", u2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test2", 2));
-    fixture.DecrementBlocks(2);
-    // increment to extended expiration, should be expired and not one block before
-    fixture.IncrementBlocks(5);
-    BOOST_CHECK(!fixture.is_best_claim("test2", u2));
-    fixture.DecrementBlocks(5);
-    fixture.IncrementBlocks(4);
-    BOOST_CHECK(fixture.is_best_claim("test2", u2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("test2", 1)); // the support expires one block before
-}
-
-BOOST_AUTO_TEST_CASE(claim_expiration_test)
-{
-    ClaimTrieChainFixture fixture;
-
-    std::string sName("atest");
-    std::string sValue("testa");
-
-    int nThrowaway;
-
-    // set expiration time to 80 blocks after the block is created
-    fixture.setExpirationForkHeight(1000000, 80, 1000000);
-
-    // create a claim. verify the expiration event has been scheduled.
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName, sValue, 10);
-    COutPoint tx1OutPoint(tx1.GetHash(), 0);
-    fixture.IncrementBlocks(1, true);
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // advance until the expiration event occurs. verify the expiration event occurs on time.
-
-    fixture.IncrementBlocks(79); // 80
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    fixture.IncrementBlocks(1); // 81
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    // roll forward a bit and then roll back to before the expiration event. verify the claim is reinserted. verify the expiration event is scheduled again.
-    fixture.IncrementBlocks(20); // 101
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    fixture.DecrementBlocks(21); // 80
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // advance until the expiration event occurs. verify the expiration event occurs on time.
-    fixture.IncrementBlocks(1); // 81
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    // roll back to before the expiration event. verify the claim is reinserted. verify the expiration event is scheduled again.
-    fixture.DecrementBlocks(2); // 79
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // roll back some more.
-    fixture.DecrementBlocks(39); // 40
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // spend the claim. verify the expiration event is removed.
-    CMutableTransaction tx2 = fixture.Spend(tx1);
-    fixture.IncrementBlocks(1); // 41
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    // roll back the spend. verify the expiration event is returned.
-    fixture.DecrementBlocks(1); // 40
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // advance until the expiration event occurs. verify the event occurs on time.
-    fixture.IncrementBlocks(40); // 80
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    fixture.IncrementBlocks(1); // 81
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    // spend the expired claim
-    fixture.CommitTx(tx2);
-    fixture.IncrementBlocks(1); // 82
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    // undo the spend. verify everything remains empty.
-    fixture.DecrementBlocks(1); // 81
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    // roll back to before the expiration event. verify the claim is reinserted. verify the expiration event is scheduled again.
-    fixture.DecrementBlocks(1); // 80
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // verify the expiration event happens at the right time again
-    fixture.IncrementBlocks(1); // 81
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    // roll back to before the expiration event. verify it gets reinserted and expiration gets scheduled.
-    fixture.DecrementBlocks(1); // 80
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // roll all the way back. verify the claim is removed and the expiration event is removed.
-    fixture.DecrementBlocks(); // 0
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-
-    // Make sure that when a claim expires, a lesser claim for the same name takes over
-
-    CClaimValue val;
-
-    // create one claim for the name
-    fixture.CommitTx(tx1);
-    fixture.IncrementBlocks(1, true); // 1
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // advance a little while and insert the second claim
-    fixture.IncrementBlocks(4); // 5
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), sName, sValue, 5);
-    COutPoint tx3OutPoint(tx3.GetHash(), 0);
-    fixture.IncrementBlocks(1); // 6
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(!fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    // advance until tx3 is valid, ensure tx1 is winning
-    fixture.IncrementBlocks(4); // 10
-
-    BOOST_CHECK(!fixture.queueEmpty());
-    BOOST_CHECK(fixture.haveClaimInQueue(sName, tx3OutPoint, nThrowaway));
-
-    fixture.IncrementBlocks(1); // 11
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx1OutPoint);
-    uint256 tx1MerkleHash = fixture.getMerkleHash();
-
-    // roll back to before tx3 is valid
-    fixture.DecrementBlocks(1); // 10
-
-    // advance again until tx is valid
-    fixture.IncrementBlocks(1); // 11
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx1OutPoint);
-    BOOST_CHECK_EQUAL(tx1MerkleHash, fixture.getMerkleHash());
-
-    // advance until the expiration event occurs. verify the expiration event occurs on time.
-    fixture.IncrementBlocks(69, true); // 80
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-
-    fixture.IncrementBlocks(1); // 81
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx3OutPoint);
-    BOOST_CHECK(tx1MerkleHash != fixture.getMerkleHash());
-
-    // spend tx1
-    fixture.CommitTx(tx2);
-    fixture.IncrementBlocks(1); // 82
-
-    // roll back to when tx1 and tx3 are in the trie and tx1 is winning
-    fixture.DecrementBlocks(); // 11
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.expirationQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx1OutPoint);
-    BOOST_CHECK_EQUAL(tx1MerkleHash, fixture.getMerkleHash());
-
-    // roll all the way back
-    fixture.DecrementBlocks();
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.expirationQueueEmpty());
-}
-
-BOOST_AUTO_TEST_CASE(expiring_supports_test)
-{
-    ClaimTrieChainFixture fixture;
-
-    std::string sName("atest");
-    std::string sValue1("testa");
-    std::string sValue2("testb");
-
-    CClaimValue val;
-    std::vector<uint256> blocks_to_invalidate;
-
-    fixture.setExpirationForkHeight(1000000, 80, 1000000);
-
-    // to be active bid must have: a higher block number and current block >= (current height - block number) / 32
-
-    // Verify that supports expire
-
-    // Create a 1 LBC claim (tx1)
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName, sValue1, 1);
-    fixture.IncrementBlocks(1); // 1, expires at 81
-
-    BOOST_CHECK(pcoinsTip->HaveCoin(COutPoint(tx1.GetHash(), 0)));
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-
-    // Create a 5 LBC support (tx3)
-    CMutableTransaction tx3 = fixture.MakeSupport(fixture.GetCoinbase(), tx1, sName, 5);
-    fixture.IncrementBlocks(1); // 2, expires at 82
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-
-    // Advance some, then insert 5 LBC claim (tx2)
-    fixture.IncrementBlocks(19); // 21
-
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), sName, sValue2, 5);
-    fixture.IncrementBlocks(1); // 22, activating in (22 - 2) / 1 = 20block (but not then active because support still holds tx1 up)
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(!fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    uint256 rootMerkleHash = fixture.getMerkleHash();
-
-    // Advance until tx2 is valid
-    fixture.IncrementBlocks(20); // 42
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(!fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK_EQUAL(rootMerkleHash, fixture.getMerkleHash());
-
-    fixture.IncrementBlocks(1); // 43
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx1.GetHash());
-    rootMerkleHash = fixture.getMerkleHash();
-
-    // Update tx1 so that it expires after tx3 expires
-    uint160 claimId = ClaimIdHash(tx1.GetHash(), 0);
-    CMutableTransaction tx4 = fixture.MakeUpdate(tx1, sName, sValue1, claimId, tx1.vout[0].nValue);
-
-    fixture.IncrementBlocks(1); // 104
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx4.GetHash());
-    BOOST_CHECK(rootMerkleHash != fixture.getMerkleHash());
-
-    // Advance until the support expires
-    fixture.IncrementBlocks(37); // 81
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    rootMerkleHash = fixture.getMerkleHash();
-
-    fixture.IncrementBlocks(1); // 82
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx2.GetHash());
-    BOOST_CHECK(rootMerkleHash != fixture.getMerkleHash());
-    rootMerkleHash = fixture.getMerkleHash();
-
-    // undo the block, make sure control goes back
-    fixture.DecrementBlocks(1); // 81
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx4.GetHash());
-    BOOST_CHECK(rootMerkleHash != fixture.getMerkleHash());
-
-    // redo the block, make sure it expires again
-    fixture.IncrementBlocks(1); // 82
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx2.GetHash());
-    rootMerkleHash = fixture.getMerkleHash();
-
-    // roll back some, spend the support, and make sure nothing unexpected
-    // happens at the time the support should have expired
-
-    fixture.DecrementBlocks(19); // 63
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx4.GetHash());
-    BOOST_CHECK(rootMerkleHash != fixture.getMerkleHash());
-
-    fixture.Spend(tx3);
-    fixture.IncrementBlocks(1); // 64
-
-    blocks_to_invalidate.push_back(chainActive.Tip()->GetBlockHash());
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx2.GetHash());
-
-    fixture.IncrementBlocks(20); // 84
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx2.GetHash());
-
-    //undo the spend, and make sure it still expires on time
-
-    fixture.DecrementBlocks(21); // 63
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx4.GetHash());
-
-    fixture.IncrementBlocks(18); // 81
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(!fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx4.GetHash());
-
-    fixture.IncrementBlocks(1); // 82
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName, val));
-    BOOST_CHECK_EQUAL(val.outPoint.hash, tx2.GetHash());
-
-    // roll all the way back
-    fixture.DecrementBlocks(82);
-
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.supportEmpty());
-    BOOST_CHECK(fixture.supportQueueEmpty());
-}
-
-BOOST_AUTO_TEST_CASE(get_claim_by_id_test_3)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setExpirationForkHeight(1000000, 5, 1000000);
-    const std::string name = "test";
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), name, "one", 1);
-    uint160 claimId = ClaimIdHash(tx1.GetHash(), 0);
-
-    fixture.IncrementBlocks(1);
-
-    CClaimValue claimValue;
-    std::string claimName;
-    BOOST_CHECK(getClaimById(claimId, claimName, &claimValue));
-    BOOST_CHECK_EQUAL(claimName, name);
-    BOOST_CHECK_EQUAL(claimValue.claimId, claimId);
-    // make second claim with activation delay 1
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), name, "one", 2);
-    uint160 claimId2 = ClaimIdHash(tx2.GetHash(), 0);
-
-    fixture.IncrementBlocks(1);
-    // second claim is not activated yet, but can still access by claim id
-    BOOST_CHECK(fixture.is_best_claim(name, tx1));
-    BOOST_CHECK(getClaimById(claimId2, claimName, &claimValue));
-    BOOST_CHECK_EQUAL(claimName, name);
-    BOOST_CHECK_EQUAL(claimValue.claimId, claimId2);
-
-    fixture.IncrementBlocks(1);
-    // second claim has activated
-    BOOST_CHECK(fixture.is_best_claim(name, tx2));
-    BOOST_CHECK(getClaimById(claimId2, claimName, &claimValue));
-    BOOST_CHECK_EQUAL(claimName, name);
-    BOOST_CHECK_EQUAL(claimValue.claimId, claimId2);
-
-
-    fixture.DecrementBlocks(1);
-    // second claim has been deactivated via decrement
-    // should still be accesible via claim id
-    BOOST_CHECK(fixture.is_best_claim(name, tx1));
-    BOOST_CHECK(getClaimById(claimId2, claimName, &claimValue));
-    BOOST_CHECK_EQUAL(claimName, name);
-    BOOST_CHECK_EQUAL(claimValue.claimId, claimId2);
-
-    fixture.IncrementBlocks(1);
-    // second claim should have been re activated via increment
-    BOOST_CHECK(fixture.is_best_claim(name, tx2));
-    BOOST_CHECK(getClaimById(claimId2, claimName, &claimValue));
-    BOOST_CHECK_EQUAL(claimName, name);
-    BOOST_CHECK_EQUAL(claimValue.claimId, claimId2);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
--- a/src/test/claimtriefixture.cpp
+++ b/src/test/claimtriefixture.cpp
@ -1,419 +0,0 @@
-// Copyright (c) 2015-2019 The LBRY Foundation
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://opensource.org/licenses/mit-license.php
-
-#include <functional>
-#include <test/claimtriefixture.h>
-
-using namespace std;
-
-BOOST_FIXTURE_TEST_SUITE(claimtriefixture_tests, RegTestingSetup)
-
-BOOST_AUTO_TEST_CASE(claimtriefixture_noop)
-{
-    BOOST_REQUIRE(true);
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-CMutableTransaction BuildTransaction(const CTransaction& prev, uint32_t prevout, unsigned int numOutputs, int locktime)
-{
-    CMutableTransaction tx;
-    tx.nVersion = CTransaction::CURRENT_VERSION;
-    tx.vin.resize(1);
-    tx.vout.resize(numOutputs);
-    tx.vin[0].prevout.hash = prev.GetHash();
-    tx.vin[0].prevout.n = prevout;
-    tx.vin[0].scriptSig = CScript();
-    if (locktime != 0) {
-        // Use a relative locktime for validity X blocks in the future
-        tx.nLockTime = chainActive.Height() + locktime;
-        tx.vin[0].nSequence = 0xffffffff - 1;
-    } else {
-        tx.nLockTime = 1 << 31; // Disable BIP68
-        tx.vin[0].nSequence = std::numeric_limits<unsigned int>::max();
-    }
-    CAmount valuePerOutput = prev.vout[prevout].nValue;
-    unsigned int numOutputsCopy = numOutputs;
-    while ((numOutputsCopy = numOutputsCopy >> 1) > 0)
-        valuePerOutput = valuePerOutput >> 1;
-
-    for (unsigned int i = 0; i < numOutputs; ++i) {
-        tx.vout[i].scriptPubKey = CScript();
-        tx.vout[i].nValue = valuePerOutput;
-    }
-    return tx;
-}
-
-CMutableTransaction BuildTransaction(const uint256& prevhash)
-{
-    CMutableTransaction tx;
-    tx.nVersion = 1;
-    tx.nLockTime = 0;
-    tx.vin.resize(1);
-    tx.vout.resize(1);
-    tx.vin[0].prevout.hash = prevhash;
-    tx.vin[0].prevout.n = 0;
-    tx.vin[0].scriptSig = CScript();
-    tx.vin[0].nSequence = std::numeric_limits<unsigned int>::max();
-    tx.vout[0].scriptPubKey = CScript();
-    tx.vout[0].nValue = 0;
-
-    return tx;
-}
-
-BlockAssembler AssemblerForTest()
-{
-    BlockAssembler::Options options;
-    options.nBlockMaxWeight = DEFAULT_BLOCK_MAX_WEIGHT;
-    options.blockMinFeeRate = CFeeRate(0);
-    return BlockAssembler(Params(), options);
-}
-
-ClaimTrieChainFixture::ClaimTrieChainFixture() : CClaimTrieCache(pclaimTrie),
-    unique_block_counter(0), normalization_original(-1), expirationForkHeight(-1), forkhash_original(-1)
-{
-    fRequireStandard = false;
-    BOOST_CHECK_EQUAL(nNextHeight, chainActive.Height() + 1);
-    setNormalizationForkHeight(1000000);
-
-    gArgs.ForceSetArg("-limitancestorcount", "1000000");
-    gArgs.ForceSetArg("-limitancestorsize", "1000000");
-    gArgs.ForceSetArg("-limitdescendantcount", "1000000");
-    gArgs.ForceSetArg("-limitdescendantsize", "1000000");
-
-    num_txs_for_next_block = 0;
-    coinbase_txs_used = 0;
-    unique_block_counter = 0;
-    added_unchecked = false;
-    // generate coinbases to spend
-    CreateCoinbases(40, coinbase_txs);
-}
-
-ClaimTrieChainFixture::~ClaimTrieChainFixture()
-{
-    added_unchecked = false;
-    DecrementBlocks(chainActive.Height());
-    auto& consensus = const_cast<Consensus::Params&>(Params().GetConsensus());
-    if (normalization_original >= 0)
-        consensus.nNormalizedNameForkHeight = normalization_original;
-
-    if (expirationForkHeight >= 0) {
-        consensus.nExtendedClaimExpirationForkHeight = expirationForkHeight;
-        consensus.nExtendedClaimExpirationTime = extendedExpiration;
-        consensus.nOriginalClaimExpirationTime = originalExpiration;
-    }
-    if (forkhash_original >= 0)
-        consensus.nAllClaimsInMerkleForkHeight = forkhash_original;
-}
-
-void ClaimTrieChainFixture::setExpirationForkHeight(int targetMinusCurrent, int64_t preForkExpirationTime, int64_t postForkExpirationTime)
-{
-    int target = chainActive.Height() + targetMinusCurrent;
-    auto& consensus = const_cast<Consensus::Params&>(Params().GetConsensus());
-    if (expirationForkHeight < 0) {
-        expirationForkHeight = consensus.nExtendedClaimExpirationForkHeight;
-        originalExpiration = consensus.nOriginalClaimExpirationTime;
-        extendedExpiration = consensus.nExtendedClaimExpirationTime;
-    }
-    consensus.nExtendedClaimExpirationForkHeight = target;
-    consensus.nExtendedClaimExpirationTime = postForkExpirationTime;
-    consensus.nOriginalClaimExpirationTime = preForkExpirationTime;
-    setExpirationTime(targetMinusCurrent >= 0 ? preForkExpirationTime : postForkExpirationTime);
-}
-
-void ClaimTrieChainFixture::setNormalizationForkHeight(int targetMinusCurrent)
-{
-    int target = chainActive.Height() + targetMinusCurrent;
-    auto& consensus = const_cast<Consensus::Params&>(Params().GetConsensus());
-    if (normalization_original < 0)
-        normalization_original = consensus.nNormalizedNameForkHeight;
-    consensus.nNormalizedNameForkHeight = target;
-}
-
-void ClaimTrieChainFixture::setHashForkHeight(int targetMinusCurrent)
-{
-    int target = chainActive.Height() + targetMinusCurrent;
-    auto& consensus = const_cast<Consensus::Params&>(Params().GetConsensus());
-    if (forkhash_original < 0)
-        forkhash_original = consensus.nAllClaimsInMerkleForkHeight;
-    consensus.nAllClaimsInMerkleForkHeight = target;
-}
-
-bool ClaimTrieChainFixture::CreateBlock(const std::unique_ptr<CBlockTemplate>& pblocktemplate)
-{
-    CBlock* pblock = &pblocktemplate->block;
-    {
-        LOCK(cs_main);
-        pblock->nVersion = 5;
-        pblock->hashPrevBlock = chainActive.Tip()->GetBlockHash();
-        pblock->nTime = chainActive.Tip()->GetBlockTime() + Params().GetConsensus().nPowTargetSpacing;
-        CMutableTransaction txCoinbase(*pblock->vtx[0]);
-        txCoinbase.vin[0].scriptSig = CScript() << int(chainActive.Height() + 1) << int(++unique_block_counter);
-        txCoinbase.vout[0].nValue = GetBlockSubsidy(chainActive.Height() + 1, Params().GetConsensus());
-        pblock->vtx[0] = MakeTransactionRef(std::move(txCoinbase));
-        pblock->hashMerkleRoot = BlockMerkleRoot(*pblock);
-        for (uint32_t i = 0;; ++i) {
-            pblock->nNonce = i;
-            if (CheckProofOfWork(pblock->GetPoWHash(), pblock->nBits, Params().GetConsensus()))
-                break;
-        }
-    }
-    auto success = ProcessNewBlock(Params(), std::make_shared<const CBlock>(*pblock), true, nullptr);
-    return success && pblock->GetHash() == chainActive.Tip()->GetBlockHash();
-}
-
-bool ClaimTrieChainFixture::CreateCoinbases(unsigned int num_coinbases, std::vector<CTransaction>& coinbases)
-{
-    std::unique_ptr<CBlockTemplate> pblocktemplate;
-    coinbases.clear();
-    BOOST_CHECK(pblocktemplate = AssemblerForTest().CreateNewBlock(CScript() << OP_TRUE));
-    BOOST_CHECK_EQUAL(pblocktemplate->block.vtx.size(), 1);
-    for (unsigned int i = 0; i < 100 + num_coinbases; ++i) {
-        BOOST_CHECK(CreateBlock(pblocktemplate));
-        if (coinbases.size() < num_coinbases)
-            coinbases.push_back(std::move(*pblocktemplate->block.vtx[0]));
-    }
-    return true;
-}
-
-void ClaimTrieChainFixture::CommitTx(const CMutableTransaction &tx, bool has_locktime)
-{
-    num_txs_for_next_block++;
-    if (has_locktime) {
-        added_unchecked = true;
-        TestMemPoolEntryHelper entry;
-        LOCK(mempool.cs);
-        mempool.addUnchecked(tx.GetHash(), entry.Fee(0).Time(GetTime()).SpendsCoinbase(true).FromTx(tx));
-    } else {
-        CValidationState state;
-        CAmount txFeeRate = CAmount(0);
-        LOCK(cs_main);
-        BOOST_CHECK_EQUAL(AcceptToMemoryPool(mempool, state, MakeTransactionRef(tx), nullptr, nullptr, false, txFeeRate, false), true);
-    }
-}
-
-// spend a bid into some non claimtrie related unspent
-CMutableTransaction ClaimTrieChainFixture::Spend(const CTransaction &prev)
-{
-    CMutableTransaction tx = BuildTransaction(prev, 0);
-    tx.vout[0].scriptPubKey = CScript() << OP_TRUE;
-    tx.vout[0].nValue = prev.vout[0].nValue;
-
-    CommitTx(tx);
-    return tx;
-}
-
-// make claim at the current block
-CMutableTransaction ClaimTrieChainFixture::MakeClaim(const CTransaction& prev, const std::string& name, const std::string& value, CAmount quantity, int locktime)
-{
-    uint32_t prevout = prev.vout.size() - 1;
-    while (prevout > 0 && prev.vout[prevout].nValue < quantity)
-        --prevout;
-    CMutableTransaction tx = BuildTransaction(prev, prevout, prev.vout[prevout].nValue > quantity ? 2 : 1, locktime);
-    tx.vout[0].scriptPubKey = ClaimNameScript(name, value);
-    tx.vout[0].nValue = quantity;
-    if (tx.vout.size() > 1) {
-        tx.vout[1].scriptPubKey = CScript() << OP_TRUE;
-        tx.vout[1].nValue = prev.vout[prevout].nValue - quantity;
-    }
-
-    CommitTx(tx, locktime != 0);
-    return tx;
-}
-
-CMutableTransaction ClaimTrieChainFixture::MakeClaim(const CTransaction& prev, const std::string& name, const std::string& value)
-{
-    return MakeClaim(prev, name, value, prev.vout[0].nValue, 0);
-}
-
-// make support at the current block
-CMutableTransaction ClaimTrieChainFixture::MakeSupport(const CTransaction &prev, const CTransaction &claimtx, const std::string& name, CAmount quantity)
-{
-    uint32_t prevout = prev.vout.size() - 1;
-    while (prevout > 0 && prev.vout[prevout].nValue < quantity)
-        --prevout;
-
-    CMutableTransaction tx = BuildTransaction(prev, prevout, prev.vout[prevout].nValue > quantity ? 2 : 1);
-    tx.vout[0].scriptPubKey = SupportClaimScript(name, ClaimIdHash(claimtx.GetHash(), 0));
-    tx.vout[0].nValue = quantity;
-    if (tx.vout.size() > 1) {
-        tx.vout[1].scriptPubKey = CScript() << OP_TRUE;
-        tx.vout[1].nValue = prev.vout[prevout].nValue - quantity;
-    }
-
-    CommitTx(tx);
-    return tx;
-}
-
-// make update at the current block
-CMutableTransaction ClaimTrieChainFixture::MakeUpdate(const CTransaction &prev, const std::string& name, const std::string& value, const uint160& claimId, CAmount quantity)
-{
-    CMutableTransaction tx = BuildTransaction(prev, 0);
-    tx.vout[0].scriptPubKey = UpdateClaimScript(name, claimId, value);
-    tx.vout[0].nValue = quantity;
-
-    CommitTx(tx);
-    return tx;
-}
-
-CTransaction ClaimTrieChainFixture::GetCoinbase()
-{
-    return coinbase_txs.at(coinbase_txs_used++);
-}
-
-// create i blocks
-void ClaimTrieChainFixture::IncrementBlocks(int num_blocks, bool mark)
-{
-    if (mark)
-        marks.push_back(chainActive.Height());
-
-    clear(); // clears the internal cache
-    for (int i = 0; i < num_blocks; ++i) {
-        CScript coinbase_scriptpubkey;
-        coinbase_scriptpubkey << CScriptNum(chainActive.Height());
-        std::unique_ptr<CBlockTemplate> pblocktemplate = AssemblerForTest().CreateNewBlock(coinbase_scriptpubkey);
-        BOOST_CHECK(pblocktemplate != nullptr);
-        if (!added_unchecked)
-            BOOST_CHECK_EQUAL(pblocktemplate->block.vtx.size(), num_txs_for_next_block + 1);
-        BOOST_CHECK_EQUAL(CreateBlock(pblocktemplate), true);
-        num_txs_for_next_block = 0;
-        nNextHeight = chainActive.Height() + 1;
-    }
-    setExpirationTime(Params().GetConsensus().GetExpirationTime(nNextHeight - 1));
-}
-
-// disconnect i blocks from tip
-void ClaimTrieChainFixture::DecrementBlocks(int num_blocks)
-{
-    clear(); // clears the internal cache
-    CValidationState state;
-    {
-        LOCK(cs_main);
-        CBlockIndex* pblockindex = chainActive[chainActive.Height() - num_blocks + 1];
-        BOOST_CHECK_EQUAL(InvalidateBlock(state, Params(), pblockindex), true);
-    }
-    BOOST_CHECK_EQUAL(state.IsValid(), true);
-    BOOST_CHECK_EQUAL(ActivateBestChain(state, Params()), true);
-    mempool.clear();
-    num_txs_for_next_block = 0;
-    nNextHeight = chainActive.Height() + 1;
-    setExpirationTime(Params().GetConsensus().GetExpirationTime(nNextHeight - 1));
-}
-
-// decrement back to last mark
-void ClaimTrieChainFixture::DecrementBlocks()
-{
-    int mark = marks.back();
-    marks.pop_back();
-    DecrementBlocks(chainActive.Height() - mark);
-}
-
-template <typename K>
-bool ClaimTrieChainFixture::keyTypeEmpty(uint8_t keyType)
-{
-    boost::scoped_ptr<CDBIterator> pcursor(base->db->NewIterator());
-    pcursor->SeekToFirst();
-
-    while (pcursor->Valid()) {
-        std::pair<uint8_t, K> key;
-        if (pcursor->GetKey(key))
-            if (key.first == keyType)
-                return false;
-        pcursor->Next();
-    }
-    return true;
-}
-
-bool ClaimTrieChainFixture::queueEmpty()
-{
-    for (const auto& claimQueue: claimQueueCache)
-        if (!claimQueue.second.empty())
-            return false;
-    return keyTypeEmpty<int>(CLAIM_QUEUE_ROW);
-}
-
-bool ClaimTrieChainFixture::expirationQueueEmpty()
-{
-    for (const auto& expirationQueue: expirationQueueCache)
-        if (!expirationQueue.second.empty())
-            return false;
-    return keyTypeEmpty<int>(CLAIM_EXP_QUEUE_ROW);
-}
-
-bool ClaimTrieChainFixture::supportEmpty()
-{
-    for (const auto& entry: supportCache)
-        if (!entry.second.empty())
-            return false;
-    return supportCache.empty() && keyTypeEmpty<std::string>(SUPPORT);
-}
-
-bool ClaimTrieChainFixture::supportQueueEmpty()
-{
-    for (const auto& support: supportQueueCache)
-        if (!support.second.empty())
-            return false;
-    return keyTypeEmpty<int>(SUPPORT_QUEUE_ROW);
-}
-
-int ClaimTrieChainFixture::proportionalDelayFactor()
-{
-    return base->nProportionalDelayFactor;
-}
-
-boost::test_tools::predicate_result negativeResult(const std::function<void(boost::wrap_stringstream&)>& callback)
-{
-    boost::test_tools::predicate_result res(false);
-    callback(res.message());
-    return res;
-}
-
-boost::test_tools::predicate_result negativeResult(const std::string& message)
-{
-    return negativeResult([&message](boost::wrap_stringstream& stream) {
-        stream << message;
-    });
-}
-
-// is a claim in queue
-boost::test_tools::predicate_result ClaimTrieChainFixture::is_claim_in_queue(const std::string& name, const CTransaction &tx)
-{
-    COutPoint outPoint(tx.GetHash(), 0);
-    int validAtHeight;
-    if (haveClaimInQueue(name, outPoint, validAtHeight))
-        return true;
-    return negativeResult("Is not a claim in queue");
-}
-
-// check if tx is best claim based on outpoint
-boost::test_tools::predicate_result ClaimTrieChainFixture::is_best_claim(const std::string& name, const CTransaction &tx)
-{
-    CClaimValue val;
-    COutPoint outPoint(tx.GetHash(), 0);
-    bool have_claim = haveClaim(name, outPoint);
-    bool have_info = getInfoForName(name, val);
-    if (have_claim && have_info && val.outPoint == outPoint)
-        return true;
-    return negativeResult("Is not best claim");
-}
-
-// check effective quantity of best claim
-boost::test_tools::predicate_result ClaimTrieChainFixture::best_claim_effective_amount_equals(const std::string& name, CAmount amount)
-{
-    CClaimValue val;
-    bool have_info = getInfoForName(name, val);
-    if (!have_info)
-        return negativeResult("No claim found");
-    CAmount effective_amount = getClaimsForName(name).find(val.claimId).effectiveAmount;
-    if (effective_amount != amount)
-        return negativeResult([amount, effective_amount](boost::wrap_stringstream& stream) {
-            stream << amount << " != " << effective_amount;
-        });
-    return true;
-}
-
-std::size_t ClaimTrieChainFixture::getTotalNamesInTrie() const
-{
-    return base->getTotalNamesInTrie();
-}
--- a/src/test/claimtriefixture.h
+++ b/src/test/claimtriefixture.h
@ -1,124 +0,0 @@
-// Copyright (c) 2015-2019 The LBRY Foundation
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://opensource.org/licenses/mit-license.php
-
-#ifndef _CLAIMTRIEFIXTURE_H_
-#define _CLAIMTRIEFIXTURE_H_
-
-#include <chainparams.h>
-#include <claimtrie.h>
-#include <coins.h>
-#include <consensus/merkle.h>
-#include <consensus/validation.h>
-#include <miner.h>
-#include <nameclaim.h>
-#include <policy/policy.h>
-#include <pow.h>
-#include <primitives/transaction.h>
-#include <random.h>
-#include <rpc/claimrpchelp.h>
-#include <rpc/server.h>
-#include <streams.h>
-#include <test/test_bitcoin.h>
-#include <txmempool.h>
-#include <validation.h>
-
-#include <boost/test/unit_test.hpp>
-#include <iostream>
-
-extern ::CChainState g_chainstate;
-extern ::ArgsManager gArgs;
-extern std::vector<std::string> random_strings(std::size_t count);
-extern bool getClaimById(const uint160&, std::string&, CClaimValue*);
-
-CMutableTransaction BuildTransaction(const uint256& prevhash);
-CMutableTransaction BuildTransaction(const CTransaction& prev, uint32_t prevout=0, unsigned int numOutputs=1, int locktime=0);
-
-BlockAssembler AssemblerForTest();
-
-// Test Fixtures
-struct ClaimTrieChainFixture: public CClaimTrieCache
-{
-    std::vector<CTransaction> coinbase_txs;
-    std::vector<int> marks;
-    int coinbase_txs_used;
-    int unique_block_counter;
-    int normalization_original;
-    unsigned int num_txs_for_next_block;
-    bool added_unchecked;
-
-    int64_t expirationForkHeight;
-    int64_t originalExpiration;
-    int64_t extendedExpiration;
-    int64_t forkhash_original;
-
-    using CClaimTrieCache::getSupportsForName;
-
-    ClaimTrieChainFixture();
-
-    ~ClaimTrieChainFixture();
-
-    void setExpirationForkHeight(int targetMinusCurrent, int64_t preForkExpirationTime, int64_t postForkExpirationTime);
-
-    void setNormalizationForkHeight(int targetMinusCurrent);
-
-    void setHashForkHeight(int targetMinusCurrent);
-
-    bool CreateBlock(const std::unique_ptr<CBlockTemplate>& pblocktemplate);
-
-    bool CreateCoinbases(unsigned int num_coinbases, std::vector<CTransaction>& coinbases);
-
-    void CommitTx(const CMutableTransaction &tx, bool has_locktime=false);
-
-    // spend a bid into some non claimtrie related unspent
-    CMutableTransaction Spend(const CTransaction &prev);
-
-    // make claim at the current block
-    CMutableTransaction MakeClaim(const CTransaction& prev, const std::string& name, const std::string& value, CAmount quantity, int locktime=0);
-
-    CMutableTransaction MakeClaim(const CTransaction& prev, const std::string& name, const std::string& value);
-
-    // make support at the current block
-    CMutableTransaction MakeSupport(const CTransaction &prev, const CTransaction &claimtx, const std::string& name, CAmount quantity);
-
-    // make update at the current block
-    CMutableTransaction MakeUpdate(const CTransaction &prev, const std::string& name, const std::string& value, const uint160& claimId, CAmount quantity);
-
-    CTransaction GetCoinbase();
-
-    // create i blocks
-    void IncrementBlocks(int num_blocks, bool mark = false);
-
-    // disconnect i blocks from tip
-    void DecrementBlocks(int num_blocks);
-
-    // decrement back to last mark
-    void DecrementBlocks();
-
-    bool queueEmpty();
-
-    bool expirationQueueEmpty();
-
-    bool supportEmpty();
-
-    bool supportQueueEmpty();
-
-    int proportionalDelayFactor();
-
-    // is a claim in queue
-    boost::test_tools::predicate_result is_claim_in_queue(const std::string& name, const CTransaction &tx);
-
-    // check if tx is best claim based on outpoint
-    boost::test_tools::predicate_result is_best_claim(const std::string& name, const CTransaction &tx);
-
-    // check effective quantity of best claim
-    boost::test_tools::predicate_result best_claim_effective_amount_equals(const std::string& name, CAmount amount);
-
-    std::size_t getTotalNamesInTrie() const;
-
-private:
-    template <typename K>
-    bool keyTypeEmpty(uint8_t keyType);
-};
-
-#endif // _CLAIMTRIEFIXTURE_H_
--- a/src/test/claimtriehashfork_tests.cpp
+++ b/src/test/claimtriehashfork_tests.cpp
@ -1,390 +0,0 @@
-// Copyright (c) 2015-2019 The LBRY Foundation
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://opensource.org/licenses/mit-license.php
-
-#include <test/claimtriefixture.h>
-
-using namespace std;
-
-void ValidatePairs(CClaimTrieCache& cache, const std::vector<std::pair<bool, uint256>>& pairs, uint256 claimHash)
-{
-    for (auto& pair : pairs)
-        if (pair.first) // we're on the right because we were an odd index number
-            claimHash = Hash(pair.second.begin(), pair.second.end(), claimHash.begin(), claimHash.end());
-        else
-            claimHash = Hash(claimHash.begin(), claimHash.end(), pair.second.begin(), pair.second.end());
-
-    BOOST_CHECK_EQUAL(cache.getMerkleHash(), claimHash);
-}
-
-BOOST_FIXTURE_TEST_SUITE(claimtriehashfork_tests, RegTestingSetup)
-
-BOOST_AUTO_TEST_CASE(hash_includes_all_claims_rollback_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setHashForkHeight(5);
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "test", "one", 1);
-    fixture.IncrementBlocks(1);
-
-    uint256 currentRoot = fixture.getMerkleHash();
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK_EQUAL(currentRoot, fixture.getMerkleHash());
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK_NE(currentRoot, fixture.getMerkleHash());
-    fixture.DecrementBlocks(3);
-    BOOST_CHECK_EQUAL(currentRoot, fixture.getMerkleHash());
-}
-
-BOOST_AUTO_TEST_CASE(hash_includes_all_claims_single_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setHashForkHeight(2);
-    fixture.IncrementBlocks(4);
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "test", "one", 1);
-    fixture.IncrementBlocks(1);
-
-    COutPoint outPoint(tx1.GetHash(), 0);
-    uint160 claimId = ClaimIdHash(tx1.GetHash(), 0);
-
-    CClaimTrieProof proof;
-    BOOST_CHECK(fixture.getProofForName("test", proof, [&claimId](const CClaimValue& claim) {
-        return claim.claimId == claimId;
-    }));
-    BOOST_CHECK(proof.hasValue);
-    BOOST_CHECK_EQUAL(proof.outPoint, outPoint);
-    auto claimHash = getValueHash(outPoint, proof.nHeightOfLastTakeover);
-    ValidatePairs(fixture, proof.pairs, claimHash);
-}
-
-BOOST_AUTO_TEST_CASE(hash_includes_all_claims_triple_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setHashForkHeight(2);
-    fixture.IncrementBlocks(4);
-
-    std::string names[] = {"test", "tester", "tester2"};
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), names[0], "one", 1);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), names[0], "two", 2);
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), names[0], "thr", 3);
-    CMutableTransaction tx7 = fixture.MakeClaim(fixture.GetCoinbase(), names[0], "for", 4);
-    CMutableTransaction tx8 = fixture.MakeClaim(fixture.GetCoinbase(), names[0], "fiv", 5);
-    CMutableTransaction tx4 = fixture.MakeClaim(fixture.GetCoinbase(), names[1], "two", 2);
-    CMutableTransaction tx5 = fixture.MakeClaim(fixture.GetCoinbase(), names[1], "thr", 3);
-    CMutableTransaction tx6 = fixture.MakeClaim(fixture.GetCoinbase(), names[2], "one", 1);
-    fixture.IncrementBlocks(1);
-
-    for (const auto& name : names) {
-        for (auto& claimSupports : fixture.getClaimsForName(name).claimsNsupports) {
-            CClaimTrieProof proof;
-            auto& claim = claimSupports.claim;
-            BOOST_CHECK(fixture.getProofForName(name, proof, [&claim](const CClaimValue& value) {
-                return claim.claimId == value.claimId;
-            }));
-            BOOST_CHECK(proof.hasValue);
-            BOOST_CHECK_EQUAL(proof.outPoint, claim.outPoint);
-            uint256 claimHash = getValueHash(claim.outPoint, proof.nHeightOfLastTakeover);
-            ValidatePairs(fixture, proof.pairs, claimHash);
-        }
-    }
-}
-
-BOOST_AUTO_TEST_CASE(hash_includes_all_claims_branched_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setHashForkHeight(2);
-    fixture.IncrementBlocks(4);
-
-    std::string names[] = {"test", "toast", "tot", "top", "toa", "toad"};
-    for (const auto& name : names)
-        fixture.MakeClaim(fixture.GetCoinbase(), name, "one", 1);
-
-    fixture.MakeClaim(fixture.GetCoinbase(), "toa", "two", 2);
-    fixture.MakeClaim(fixture.GetCoinbase(), "toa", "tre", 3);
-    fixture.MakeClaim(fixture.GetCoinbase(), "toa", "qua", 4);
-    fixture.MakeClaim(fixture.GetCoinbase(), "toa", "cin", 5);
-    fixture.IncrementBlocks(1);
-
-    for (const auto& name : names) {
-        for (auto& claimSupports : fixture.getClaimsForName(name).claimsNsupports) {
-            CClaimTrieProof proof;
-            auto& claim = claimSupports.claim;
-            BOOST_CHECK(fixture.getProofForName(name, proof, [&claim](const CClaimValue& value) {
-                return claim.claimId == value.claimId;
-            }));
-            BOOST_CHECK(proof.hasValue);
-            BOOST_CHECK_EQUAL(proof.outPoint, claim.outPoint);
-            uint256 claimHash = getValueHash(claim.outPoint, proof.nHeightOfLastTakeover);
-            ValidatePairs(fixture, proof.pairs, claimHash);
-        }
-    }
-}
-
-BOOST_AUTO_TEST_CASE(hash_claims_children_fuzzer_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setHashForkHeight(2);
-    fixture.IncrementBlocks(4);
-
-    std::size_t i = 0;
-    auto names = random_strings(300);
-    auto lastTx = MakeTransactionRef(fixture.GetCoinbase());
-    for (const auto& name : names) {
-        auto tx = fixture.MakeClaim(*lastTx, name, "one", 1);
-        lastTx = MakeTransactionRef(std::move(tx));
-        if (++i % 5 == 0)
-            for (std::size_t j = 0;  j < (i / 5); ++j) {
-                auto tx = fixture.MakeClaim(*lastTx, name, "one", 1);
-                lastTx = MakeTransactionRef(std::move(tx));
-            }
-        fixture.IncrementBlocks(1);
-    }
-
-    for (const auto& name : names) {
-        for (auto& claimSupports : fixture.getClaimsForName(name).claimsNsupports) {
-            CClaimTrieProof proof;
-            auto& claim = claimSupports.claim;
-            BOOST_CHECK(fixture.getProofForName(name, proof, [&claim](const CClaimValue& value) {
-                return claim.claimId == value.claimId;
-            }));
-            BOOST_CHECK(proof.hasValue);
-            BOOST_CHECK_EQUAL(proof.outPoint, claim.outPoint);
-            uint256 claimHash = getValueHash(claim.outPoint, proof.nHeightOfLastTakeover);
-            ValidatePairs(fixture, proof.pairs, claimHash);
-        }
-    }
-}
-
-bool verify_proof(const CClaimTrieProof proof, uint256 rootHash, const std::string& name)
-{
-    uint256 previousComputedHash;
-    std::string computedReverseName;
-    bool verifiedValue = false;
-
-    for (auto itNodes = proof.nodes.rbegin(); itNodes != proof.nodes.rend(); ++itNodes) {
-        bool foundChildInChain = false;
-        std::vector<unsigned char> vchToHash;
-        for (auto itChildren = itNodes->children.begin(); itChildren != itNodes->children.end(); ++itChildren) {
-            vchToHash.push_back(itChildren->first);
-            uint256 childHash;
-            if (itChildren->second.IsNull()) {
-                if (previousComputedHash.IsNull()) {
-                    return false;
-                }
-                if (foundChildInChain) {
-                    return false;
-                }
-                foundChildInChain = true;
-                computedReverseName += itChildren->first;
-                childHash = previousComputedHash;
-            } else {
-                childHash = itChildren->second;
-            }
-            vchToHash.insert(vchToHash.end(), childHash.begin(), childHash.end());
-        }
-        if (itNodes != proof.nodes.rbegin() && !foundChildInChain) {
-            return false;
-        }
-        if (itNodes->hasValue) {
-            uint256 valHash;
-            if (itNodes->valHash.IsNull()) {
-                if (itNodes != proof.nodes.rbegin()) {
-                    return false;
-                }
-                if (!proof.hasValue) {
-                    return false;
-                }
-                valHash = getValueHash(proof.outPoint,
-                                       proof.nHeightOfLastTakeover);
-
-                verifiedValue = true;
-            } else {
-                valHash = itNodes->valHash;
-            }
-            vchToHash.insert(vchToHash.end(), valHash.begin(), valHash.end());
-        } else if (proof.hasValue && itNodes == proof.nodes.rbegin()) {
-            return false;
-        }
-        CHash256 hasher;
-        std::vector<unsigned char> vchHash(hasher.OUTPUT_SIZE);
-        hasher.Write(vchToHash.data(), vchToHash.size());
-        hasher.Finalize(&(vchHash[0]));
-        uint256 calculatedHash(vchHash);
-        previousComputedHash = calculatedHash;
-    }
-    if (previousComputedHash != rootHash) {
-        return false;
-    }
-    if (proof.hasValue && !verifiedValue) {
-        return false;
-    }
-    std::string::reverse_iterator itComputedName = computedReverseName.rbegin();
-    std::string::const_iterator itName = name.begin();
-    for (; itName != name.end() && itComputedName != computedReverseName.rend(); ++itName, ++itComputedName) {
-        if (*itName != *itComputedName) {
-            return false;
-        }
-    }
-    return (!proof.hasValue || itName == name.end());
-}
-
-BOOST_AUTO_TEST_CASE(value_proof_test)
-{
-    ClaimTrieChainFixture fixture;
-
-    std::string sName1("a");
-    std::string sValue1("testa");
-
-    std::string sName2("abc");
-    std::string sValue2("testabc");
-
-    std::string sName3("abd");
-    std::string sValue3("testabd");
-
-    std::string sName4("zyx");
-    std::string sValue4("testzyx");
-
-    std::string sName5("zyxa");
-    std::string sName6("omg");
-    std::string sName7("");
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue1);
-    COutPoint tx1OutPoint(tx1.GetHash(), 0);
-
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), sName2, sValue2);
-    COutPoint tx2OutPoint(tx2.GetHash(), 0);
-
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), sName3, sValue3);
-    COutPoint tx3OutPoint(tx3.GetHash(), 0);
-
-    CMutableTransaction tx4 = fixture.MakeClaim(fixture.GetCoinbase(), sName4, sValue4);
-    COutPoint tx4OutPoint(tx4.GetHash(), 0);
-    CClaimValue val;
-
-    // create a claim. verify the expiration event has been scheduled.
-    fixture.IncrementBlocks(5, true);
-
-    BOOST_CHECK(!pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-    BOOST_CHECK(fixture.getInfoForName(sName1, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx1OutPoint);
-    BOOST_CHECK(fixture.getInfoForName(sName2, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx2OutPoint);
-    BOOST_CHECK(fixture.getInfoForName(sName3, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx3OutPoint);
-    BOOST_CHECK(fixture.getInfoForName(sName4, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx4OutPoint);
-
-    CClaimTrieProof proof;
-
-    BOOST_CHECK(fixture.getProofForName(sName1, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName1));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx1OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName2, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName2));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx2OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName3, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName3));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx3OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName4, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName4));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx4OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName5, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName5));
-    BOOST_CHECK_EQUAL(proof.hasValue, false);
-
-    BOOST_CHECK(fixture.getProofForName(sName6, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName6));
-    BOOST_CHECK_EQUAL(proof.hasValue, false);
-
-    BOOST_CHECK(fixture.getProofForName(sName7, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName7));
-    BOOST_CHECK_EQUAL(proof.hasValue, false);
-
-    CMutableTransaction tx5 = fixture.MakeClaim(fixture.GetCoinbase(), sName7, sValue4);
-    COutPoint tx5OutPoint(tx5.GetHash(), 0);
-
-    fixture.IncrementBlocks(1);
-
-    BOOST_CHECK(fixture.getInfoForName(sName7, val));
-    BOOST_CHECK_EQUAL(val.outPoint, tx5OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName1, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName1));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx1OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName2, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName2));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx2OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName3, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName3));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx3OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName4, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName4));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx4OutPoint);
-
-    BOOST_CHECK(fixture.getProofForName(sName5, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName5));
-    BOOST_CHECK_EQUAL(proof.hasValue, false);
-
-    BOOST_CHECK(fixture.getProofForName(sName6, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName6));
-    BOOST_CHECK_EQUAL(proof.hasValue, false);
-
-    BOOST_CHECK(fixture.getProofForName(sName7, proof));
-    BOOST_CHECK(verify_proof(proof, chainActive.Tip()->hashClaimTrie, sName7));
-    BOOST_CHECK_EQUAL(proof.outPoint, tx5OutPoint);
-
-    fixture.DecrementBlocks();
-    BOOST_CHECK(pclaimTrie->empty());
-    BOOST_CHECK(fixture.queueEmpty());
-}
-
-// Check that blocks with bogus calimtrie hash is rejected
-BOOST_AUTO_TEST_CASE(bogus_claimtrie_hash_test)
-    {
-            ClaimTrieChainFixture fixture;
-    std::string sName("test");
-    std::string sValue1("test");
-
-    int orig_chain_height = chainActive.Height();
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName, sValue1, 1);
-
-    std::unique_ptr<CBlockTemplate> pblockTemp;
-    BOOST_CHECK(pblockTemp = AssemblerForTest().CreateNewBlock(tx1.vout[0].scriptPubKey));
-    pblockTemp->block.hashPrevBlock = chainActive.Tip()->GetBlockHash();
-    pblockTemp->block.nVersion = 5;
-    pblockTemp->block.nTime = chainActive.Tip()->GetBlockTime() + Params().GetConsensus().nPowTargetSpacing;
-    CMutableTransaction txCoinbase(*pblockTemp->block.vtx[0]);
-    txCoinbase.vin[0].scriptSig = CScript() << int(chainActive.Height() + 1) << 1;
-    txCoinbase.vout[0].nValue = GetBlockSubsidy(chainActive.Height() + 1, Params().GetConsensus());
-    pblockTemp->block.vtx[0] = MakeTransactionRef(std::move(txCoinbase));
-    pblockTemp->block.hashMerkleRoot = BlockMerkleRoot(pblockTemp->block);
-    //create bogus hash
-
-    uint256 bogusHashClaimTrie;
-    bogusHashClaimTrie.SetHex("aaa");
-    pblockTemp->block.hashClaimTrie = bogusHashClaimTrie;
-
-    for (uint32_t i = 0;; ++i) {
-        pblockTemp->block.nNonce = i;
-        if (CheckProofOfWork(pblockTemp->block.GetPoWHash(), pblockTemp->block.nBits, Params().GetConsensus())) {
-            break;
-        }
-    }
-    bool success = ProcessNewBlock(Params(), std::make_shared<const CBlock>(pblockTemp->block), true, nullptr);
-    // will process , but will not be connected
-    BOOST_CHECK(success);
-    BOOST_CHECK(pblockTemp->block.GetHash() != chainActive.Tip()->GetBlockHash());
-    BOOST_CHECK_EQUAL(orig_chain_height, chainActive.Height());
-}
-
-BOOST_AUTO_TEST_SUITE_END()
--- a/src/test/claimtrienormalization_tests.cpp
+++ b/src/test/claimtrienormalization_tests.cpp
@ -1,494 +0,0 @@
-// Copyright (c) 2015-2019 The LBRY Foundation
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://opensource.org/licenses/mit-license.php
-
-#include <test/claimtriefixture.h>
-
-using namespace std;
-
-BOOST_FIXTURE_TEST_SUITE(claimtrienormalization_tests, RegTestingSetup)
-
-/*
-    normalization
-        test normalization function indpendent from rest of the code
-*/
-
-BOOST_AUTO_TEST_CASE(normalization_only)
-{
-    CClaimTrieCache ccache(pclaimTrie);
-
-    // basic ASCII casing tests
-    BOOST_CHECK_EQUAL("test", ccache.normalizeClaimName("TESt", true));
-    BOOST_CHECK_EQUAL("test", ccache.normalizeClaimName("tesT", true));
-    BOOST_CHECK_EQUAL("test", ccache.normalizeClaimName("TesT", true));
-    BOOST_CHECK_EQUAL("test", ccache.normalizeClaimName("test", true));
-    BOOST_CHECK_EQUAL("test this", ccache.normalizeClaimName("Test This", true));
-
-    // test invalid utf8 bytes are returned as is
-    BOOST_CHECK_EQUAL("\xFF", ccache.normalizeClaimName("\xFF", true));
-    BOOST_CHECK_EQUAL("\xC3\x28", ccache.normalizeClaimName("\xC3\x28", true));
-
-    // ohm sign unicode code point \x2126 should be transformed to equivalent
-    // unicode code point \x03C9 , greek small letter omega
-    BOOST_CHECK_EQUAL("\xCF\x89", ccache.normalizeClaimName("\xE2\x84\xA6", true));
-
-    // cyrillic capital ef code point \x0424 should be transformed to lower case
-    // \x0444
-    BOOST_CHECK_EQUAL("\xD1\x84", ccache.normalizeClaimName("\xD0\xA4", true));
-
-    // armenian capital ben code point \x0532 should be transformed to lower case
-    // \x0562
-    BOOST_CHECK_EQUAL("\xD5\xA2", ccache.normalizeClaimName("\xD4\xB2", true));
-
-    // japanese pbu code point \x3076 should be transformed by NFD decomposition
-    // into \x3075 and \x3099
-    BOOST_CHECK_EQUAL("\xE3\x81\xB5\xE3\x82\x99",
-                          ccache.normalizeClaimName("\xE3\x81\xB6", true));
-
-    // hangul ggwalg unicode code point \xAF51 should be transformed by NFD
-    // decomposition into unicode code points \x1101 \x116A \x11B0
-    // source: http://unicode.org/L2/L2009/09052-tr47.html
-    BOOST_CHECK_EQUAL("\xE1\x84\x81\xE1\x85\xAA\xE1\x86\xB0",
-                          ccache.normalizeClaimName("\xEA\xBD\x91", true));
-}
-
-/*
-    normalization
-        check claim name normalization before the fork
-        check claim name normalization after the fork
-*/
-BOOST_AUTO_TEST_CASE(claimtriebranching_normalization)
-{
-    ClaimTrieChainFixture fixture;
-
-    // check claim names are not normalized
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "normalizeTest", "one", 3);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("normalizeTest", tx1));
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.getTotalNamesInTrie() == 0);
-    fixture.CommitTx(tx1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("normalizeTest", tx1));
-
-    CMutableTransaction tx2a = fixture.MakeClaim(fixture.GetCoinbase(), "Normalizetest", "one_a", 2);
-    CMutableTransaction tx2 = fixture.MakeUpdate(tx2a, "Normalizetest", "one", ClaimIdHash(tx2a.GetHash(), 0), 2);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("normalizeTest", tx1));
-    BOOST_CHECK(fixture.is_best_claim("Normalizetest", tx2));
-
-    // Activate the fork (which rebuilds the existing claimtrie and
-    // cache), flattening all previously existing name clashes due to
-    // the normalization
-    fixture.setNormalizationForkHeight(2);
-
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("normalizeTest", tx1));
-    BOOST_CHECK(fixture.is_best_claim("Normalizetest", tx2));
-
-    fixture.IncrementBlocks(1, true);
-
-    // Post-fork, tx1 (the previous winning claim) assumes all name
-    // variants of what it originally was ...
-    BOOST_CHECK(fixture.is_best_claim("normalizetest", tx1));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("normalizetest", 3));
-
-    BOOST_CHECK(!pclaimTrie->find("normalizeTest"));
-
-    // Check equivalence of normalized claim names
-    BOOST_CHECK(fixture.is_best_claim("normalizetest", tx1)); // collapsed tx2
-    fixture.IncrementBlocks(1);
-
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), "NORMALIZETEST", "one", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(!fixture.is_best_claim("normalizetest", tx3));
-
-    CMutableTransaction s1 = fixture.MakeSupport(fixture.GetCoinbase(), tx1, "NoRmAlIzEtEsT", 2);
-    fixture.IncrementBlocks(1);
-
-    // Ensure that supports work for normalized claim names
-    BOOST_CHECK(fixture.is_best_claim("normalizetest", tx1)); // effective amount is 5
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("normalizetest", 5));
-
-    CMutableTransaction tx4 = fixture.MakeClaim(fixture.GetCoinbase(), "foo", "bar", 1);
-    CMutableTransaction s2 = fixture.MakeSupport(fixture.GetCoinbase(), tx4, "Foo", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("foo", tx4));
-
-    CMutableTransaction u1 = fixture.MakeUpdate(tx4, "foo", "baz", ClaimIdHash(tx4.GetHash(), 0), 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("foo", u1));
-
-    CMutableTransaction u2 = fixture.MakeUpdate(tx1, "nOrmalIzEtEst", "two", ClaimIdHash(tx1.GetHash(), 0), 3);
-    fixture.IncrementBlocks(1);
-
-    BOOST_CHECK(fixture.is_best_claim("normalizetest", u2));
-
-    // Add another set of unicode claims that will collapse after the fork
-    CMutableTransaction tx5 = fixture.MakeClaim(fixture.GetCoinbase(), "Ame\u0301lie", "amelie", 2);
-    fixture.IncrementBlocks(1);
-    CClaimValue nval1;
-    fixture.getInfoForName("amélie", nval1);
-    BOOST_CHECK(nval1.claimId == ClaimIdHash(tx5.GetHash(), 0));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("amélie", 2));
-
-    // Check equivalence of normalized claim names
-    BOOST_CHECK(fixture.is_best_claim("amélie", tx5));
-
-    CMutableTransaction tx7 = fixture.MakeClaim(fixture.GetCoinbase(), "あてはまる", "jn1", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("あてはまる", tx7));
-
-    CMutableTransaction tx8 = fixture.MakeClaim(fixture.GetCoinbase(), "AÑEJO", "es1", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("añejo", tx8));
-
-    // Rewind to 1 block before the fork and be sure that the fork is no longer active
-    fixture.DecrementBlocks();
-
-    // Now check that our old (non-normalized) claims are 'alive' again
-    BOOST_CHECK(fixture.is_best_claim("normalizeTest", tx1));
-    BOOST_CHECK(!fixture.is_best_claim("Normalizetest", tx1)); // no longer equivalent
-    BOOST_CHECK(fixture.is_best_claim("Normalizetest", tx2));
-
-    // Create new claim
-    CMutableTransaction tx9 = fixture.MakeClaim(fixture.GetCoinbase(), "blah", "blah", 1);
-    std::string invalidUtf8("\xFF\xFF");
-    CMutableTransaction tx10 = fixture.MakeClaim(fixture.GetCoinbase(), invalidUtf8, "blah", 1); // invalid UTF8
-
-    // Roll forward to fork height again and check again that we're normalized
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(chainActive.Height() == Params().GetConsensus().nNormalizedNameForkHeight);
-    BOOST_CHECK(fixture.is_best_claim("normalizetest", tx1)); // collapsed tx2
-    BOOST_CHECK(fixture.is_best_claim(invalidUtf8, tx10));
-
-    // Rewind to 1 block before the fork and be sure that the fork is
-    // no longer active
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("Normalizetest", tx2));
-
-    // Roll forward to fork height again and check again that we're normalized
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(chainActive.Height() == Params().GetConsensus().nNormalizedNameForkHeight);
-    BOOST_CHECK(fixture.is_best_claim("normalizetest", tx1)); // collapsed tx2
-}
-
-BOOST_AUTO_TEST_CASE(claimtriecache_normalization)
-{
-    ClaimTrieChainFixture fixture;
-
-    std::string name = "Ame\u0301lie";
-
-    std::string name_upper = "Amélie";
-    std::string name_normd = "amélie"; // this accented e is not actually the same as the one above; this has been "normalized"
-
-    BOOST_CHECK(name != name_upper);
-
-    // Add another set of unicode claims that will collapse after the fork
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), name, "amilie", 2);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), name_upper, "amelie", 2);
-    fixture.MakeClaim(fixture.GetCoinbase(), "amelie1", "amelie", 2);
-    fixture.IncrementBlocks(1);
-
-    CClaimValue lookupClaim;
-    std::string lookupName;
-    BOOST_CHECK(getClaimById(ClaimIdHash(tx2.GetHash(), 0), lookupName, &lookupClaim));
-    CClaimValue nval1;
-    BOOST_CHECK(fixture.getInfoForName("amelie1", nval1));
-    // amélie is not found cause normalization still not appear
-    BOOST_CHECK(!fixture.getInfoForName(name_normd, nval1));
-
-    // Activate the fork (which rebuilds the existing claimtrie and
-    // cache), flattening all previously existing name clashes due to
-    // the normalization
-    fixture.setNormalizationForkHeight(1);
-    int currentHeight = chainActive.Height();
-
-    fixture.IncrementBlocks(1);
-    // Ok normalization fix the name problem
-    BOOST_CHECK(fixture.getInfoForName(name_normd, nval1));
-    BOOST_CHECK(nval1.nHeight == currentHeight);
-    BOOST_CHECK(lookupClaim == nval1);
-
-    CCoinsViewCache coins(pcoinsTip.get());
-    CClaimTrieCache trieCache(pclaimTrie);
-    CBlockIndex* pindex = chainActive.Tip();
-    CBlock block;
-    int amelieValidHeight;
-    BOOST_CHECK(trieCache.shouldNormalize());
-    BOOST_CHECK(ReadBlockFromDisk(block, pindex, Params().GetConsensus()));
-    BOOST_CHECK(g_chainstate.DisconnectBlock(block, pindex, coins, trieCache) == DisconnectResult::DISCONNECT_OK);
-    BOOST_CHECK(!trieCache.shouldNormalize());
-    BOOST_CHECK(!trieCache.spendClaim(name_normd, COutPoint(tx2.GetHash(), 0), currentHeight, amelieValidHeight));
-    BOOST_CHECK(trieCache.spendClaim(name_upper, COutPoint(tx2.GetHash(), 0), currentHeight, amelieValidHeight));
-
-    BOOST_CHECK(!pclaimTrie->find(name));
-    BOOST_CHECK(trieCache.getInfoForName(name, nval1));
-    BOOST_CHECK(trieCache.addClaim(name, COutPoint(tx1.GetHash(), 0), ClaimIdHash(tx1.GetHash(), 0), CAmount(2), currentHeight + 1));
-    BOOST_CHECK(trieCache.getInfoForName(name, nval1));
-    insertUndoType insertUndo;
-    claimQueueRowType expireUndo;
-    insertUndoType insertSupportUndo;
-    supportQueueRowType expireSupportUndo;
-    std::vector<std::pair<std::string, int> > takeoverHeightUndo;
-    BOOST_CHECK(trieCache.incrementBlock(insertUndo, expireUndo, insertSupportUndo, expireSupportUndo, takeoverHeightUndo));
-    BOOST_CHECK(trieCache.shouldNormalize());
-
-    // we cannot use getXXXForName cause they will normalized name
-    for (auto it = pclaimTrie->cbegin(); it != pclaimTrie->cend(); ++it)
-        BOOST_CHECK(it.key() != name);
-}
-
-BOOST_AUTO_TEST_CASE(undo_normalization_does_not_kill_claim_order)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setNormalizationForkHeight(5);
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "1", 1);
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), "a", "3", 3);
-    fixture.IncrementBlocks(1);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "2", 2);
-    fixture.IncrementBlocks(2);
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-    fixture.IncrementBlocks(3, true);
-    BOOST_CHECK(fixture.is_best_claim("a", tx3));
-    fixture.DecrementBlocks();
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-}
-
-BOOST_AUTO_TEST_CASE(normalized_activations_fall_through)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setNormalizationForkHeight(5);
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "AB", "1", 1);
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(fixture.proportionalDelayFactor() == 1);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), "Ab", "2", 4);
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), "aB", "2", 3);
-    CMutableTransaction tx4 = fixture.MakeClaim(fixture.GetCoinbase(), "ab", "2", 2);
-    fixture.IncrementBlocks(1);
-
-    BOOST_CHECK(fixture.is_best_claim("AB", tx1));
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(fixture.is_best_claim("ab", tx2));
-    BOOST_CHECK(fixture.getClaimsForName("ab").claimsNsupports.size() == 4U);
-    fixture.DecrementBlocks(3);
-    fixture.Spend(tx1);
-    fixture.Spend(tx2);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("ab", tx3));
-    BOOST_CHECK(fixture.getClaimsForName("ab").claimsNsupports.size() == 2U);
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("AB", tx1));
-    fixture.Spend(tx1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("ab", tx2));
-
-    for (int i = 0; i < 7; ++i) {
-        fixture.IncrementBlocks(i, true); // well into normalized teritory
-        CMutableTransaction tx5 = fixture.MakeClaim(fixture.GetCoinbase(), "CD", "a", 1 + i);
-        fixture.IncrementBlocks(3);
-        CMutableTransaction tx6 = fixture.MakeClaim(fixture.GetCoinbase(), "Cd", "b", 2 + i);
-        CMutableTransaction tx7 = fixture.MakeClaim(fixture.GetCoinbase(), "cD", "c", 3 + i);
-        fixture.IncrementBlocks(1);
-        BOOST_CHECK(fixture.is_best_claim("cd", tx5));
-        fixture.Spend(tx5);
-        fixture.IncrementBlocks(1);
-        BOOST_CHECK(fixture.is_best_claim("cd", tx7));
-        fixture.DecrementBlocks();
-    }
-}
-
-BOOST_AUTO_TEST_CASE(normalization_removal_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setNormalizationForkHeight(2);
-    fixture.IncrementBlocks(3);
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "AB", "1", 1);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), "Ab", "2", 2);
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), "aB", "3", 3);
-    CMutableTransaction sx1 = fixture.MakeSupport(fixture.GetCoinbase(), tx1, "AB", 1);
-    CMutableTransaction sx2 = fixture.MakeSupport(fixture.GetCoinbase(), tx2, "Ab", 1);
-
-    CClaimTrieCache cache(pclaimTrie);
-    int height = chainActive.Height() + 1;
-    cache.addClaim("AB", COutPoint(tx1.GetHash(), 0), ClaimIdHash(tx1.GetHash(), 0), 1, height);
-    cache.addClaim("Ab", COutPoint(tx2.GetHash(), 0), ClaimIdHash(tx2.GetHash(), 0), 2, height);
-    cache.addClaim("aB", COutPoint(tx3.GetHash(), 0), ClaimIdHash(tx3.GetHash(), 0), 3, height);
-    cache.addSupport("AB", COutPoint(sx1.GetHash(), 0), 1, ClaimIdHash(tx1.GetHash(), 0), height);
-    cache.addSupport("Ab", COutPoint(sx2.GetHash(), 0), 1, ClaimIdHash(tx2.GetHash(), 0), height);
-    insertUndoType insertUndo;
-    claimQueueRowType expireUndo;
-    insertUndoType insertSupportUndo;
-    supportQueueRowType expireSupportUndo;
-    std::vector<std::pair<std::string, int> > takeoverHeightUndo;
-    BOOST_CHECK(cache.incrementBlock(insertUndo, expireUndo, insertSupportUndo, expireSupportUndo, takeoverHeightUndo));
-    BOOST_CHECK(cache.getClaimsForName("ab").claimsNsupports.size() == 3U);
-    BOOST_CHECK(cache.getClaimsForName("ab").claimsNsupports[0].supports.size() == 1U);
-    BOOST_CHECK(cache.getClaimsForName("ab").claimsNsupports[1].supports.size() == 0U);
-    BOOST_CHECK(cache.getClaimsForName("ab").claimsNsupports[2].supports.size() == 1U);
-    BOOST_CHECK(cache.decrementBlock(insertUndo, expireUndo, insertSupportUndo, expireSupportUndo));
-    BOOST_CHECK(cache.finalizeDecrement(takeoverHeightUndo));
-    BOOST_CHECK(cache.undoAddSupport("AB", COutPoint(sx1.GetHash(), 0), height));
-    BOOST_CHECK(cache.undoAddSupport("Ab", COutPoint(sx2.GetHash(), 0), height));
-    BOOST_CHECK(cache.undoAddClaim("AB", COutPoint(tx1.GetHash(), 0), height));
-    BOOST_CHECK(cache.undoAddClaim("Ab", COutPoint(tx2.GetHash(), 0), height));
-    BOOST_CHECK(cache.undoAddClaim("aB", COutPoint(tx3.GetHash(), 0), height));
-    BOOST_CHECK(cache.getClaimsForName("ab").claimsNsupports.size() == 0U);
-}
-
-BOOST_AUTO_TEST_CASE(normalization_does_not_kill_supports)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setNormalizationForkHeight(3);
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "1", 1);
-    fixture.MakeSupport(fixture.GetCoinbase(), tx1, "A", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("A", 2));
-    fixture.MakeSupport(fixture.GetCoinbase(), tx1, "A", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("A", 3));
-    fixture.MakeSupport(fixture.GetCoinbase(), tx1, "A", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("a", 4));
-    fixture.MakeSupport(fixture.GetCoinbase(), tx1, "A", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("a", 5));
-
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("a", 4));
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("A", 3));
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("A", 2));
-    fixture.IncrementBlocks(5);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("a", 3));
-}
-
-BOOST_AUTO_TEST_CASE(normalization_does_not_fail_on_spend)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setNormalizationForkHeight(2);
-
-    std::string sName1("testN");
-    std::string sName2("testn");
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, "1", 3);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim(sName1, tx1));
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, "2", 2);
-    CMutableTransaction tx1s = fixture.MakeSupport(fixture.GetCoinbase(), tx1, sName1, 2);
-    fixture.IncrementBlocks(2, true);
-    BOOST_CHECK(fixture.is_best_claim(sName2, tx1));
-
-    CMutableTransaction tx3 = fixture.Spend(tx1); // abandon the claim
-    CMutableTransaction tx3s = fixture.Spend(tx1s);
-    fixture.IncrementBlocks(2);
-    BOOST_CHECK(fixture.is_best_claim(sName2, tx2));
-    fixture.DecrementBlocks();
-    BOOST_CHECK(fixture.is_best_claim(sName1, tx1));
-}
-
-BOOST_AUTO_TEST_CASE(normalization_does_not_kill_sort_order)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setNormalizationForkHeight(2);
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "1", 1);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "2", 2);
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), "a", "3", 3);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-    BOOST_CHECK(fixture.is_best_claim("a", tx3));
-
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(!fixture.is_best_claim("A", tx2));
-    BOOST_CHECK(fixture.is_best_claim("a", tx3));
-    BOOST_CHECK(fixture.getClaimsForName("a").claimsNsupports.size() == 3U);
-
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.is_best_claim("A", tx2));
-    BOOST_CHECK(fixture.is_best_claim("a", tx3));
-}
-
-BOOST_AUTO_TEST_CASE(normalization_does_not_kill_expirations)
-{
-    ClaimTrieChainFixture fixture;
-    auto& consensus = Params().GetConsensus();
-    fixture.setExpirationForkHeight(consensus.nExtendedClaimExpirationForkHeight, 3, consensus.nExtendedClaimExpirationTime);
-    fixture.setNormalizationForkHeight(4);
-    // need to see that claims expiring on the frame when we normalize aren't kept
-    // need to see that supports expiring on the frame when we normalize aren't kept
-    // need to see that claims & supports carried through the normalization fork do expire
-    // and that they come back correctly when we roll backwards
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), "A", "1", 1);
-    fixture.MakeSupport(fixture.GetCoinbase(), tx1, "A", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("A", 2));
-
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), "B", "1", 1);
-    fixture.MakeSupport(fixture.GetCoinbase(), tx2, "B", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("A", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("B", 2));
-
-    CMutableTransaction tx3 = fixture.MakeClaim(fixture.GetCoinbase(), "C", "1", 1);
-    fixture.MakeSupport(fixture.GetCoinbase(), tx3, "C", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("A", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("B", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("C", 2));
-
-    CMutableTransaction tx4 = fixture.MakeClaim(fixture.GetCoinbase(), "D", "1", 1);
-    fixture.MakeSupport(fixture.GetCoinbase(), tx4, "D", 1);
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("a", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("b", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("c", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("d", 2));
-
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("a", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("b", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("c", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("d", 2));
-
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("a", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("b", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("c", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("d", 2));
-
-    fixture.IncrementBlocks(1);
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("a", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("b", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("c", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("d", 2));
-
-    fixture.DecrementBlocks(2);
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("a", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("b", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("c", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("d", 2));
-
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("a", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("b", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("c", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("d", 2));
-
-    fixture.DecrementBlocks(1);
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("A", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("B", 2));
-    BOOST_CHECK(fixture.best_claim_effective_amount_equals("C", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("d", 2));
-
-    fixture.IncrementBlocks(3);
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("a", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("b", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("c", 2));
-    BOOST_CHECK(!fixture.best_claim_effective_amount_equals("d", 2)); // (not re-added)
-}
-
-BOOST_AUTO_TEST_SUITE_END()
--- a/src/test/claimtrierpc_tests.cpp
+++ b/src/test/claimtrierpc_tests.cpp
@ -1,407 +0,0 @@
-// Copyright (c) 2015-2019 The LBRY Foundation
-// Distributed under the MIT software license, see the accompanying
-// file COPYING or http://opensource.org/licenses/mit-license.php
-
-#include <test/claimtriefixture.h>
-
-using namespace std;
-
-extern void ValidatePairs(CClaimTrieCache& cache, const std::vector<std::pair<bool, uint256>>& pairs, uint256 claimHash);
-
-BOOST_FIXTURE_TEST_SUITE(claimtrierpc_tests, RegTestingSetup)
-
-BOOST_AUTO_TEST_CASE(getnamesintrie_test)
-{
-    ClaimTrieChainFixture fixture;
-    std::string sName1("test");
-    std::string sValue1("test");
-
-    uint256 blockHash = chainActive.Tip()->GetBlockHash();
-
-    fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue1, 42);
-    fixture.IncrementBlocks(1);
-
-    rpcfn_type getnamesintrie = tableRPC["getnamesintrie"]->actor;
-    JSONRPCRequest req;
-    req.params = UniValue(UniValue::VARR);
-
-    UniValue results = getnamesintrie(req);
-    BOOST_CHECK_EQUAL(results.size(), 1U);
-
-    req.params.push_back(blockHash.GetHex());
-
-    results = getnamesintrie(req);
-    BOOST_CHECK_EQUAL(results.size(), 0U);
-}
-
-BOOST_AUTO_TEST_CASE(getvalueforname_test)
-{
-    ClaimTrieChainFixture fixture;
-    std::string sName1("testN");
-    std::string sValue1("testV");
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue1, 2);
-    fixture.IncrementBlocks(1);
-
-    uint256 blockHash = chainActive.Tip()->GetBlockHash();
-
-    fixture.MakeSupport(fixture.GetCoinbase(), tx1, sName1, 3);
-    fixture.IncrementBlocks(10);
-
-    rpcfn_type getvalueforname = tableRPC["getvalueforname"]->actor;
-    JSONRPCRequest req;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(sName1));
-
-    UniValue results = getvalueforname(req);
-    BOOST_CHECK_EQUAL(results[T_VALUE].get_str(), HexStr(sValue1));
-    BOOST_CHECK_EQUAL(results[T_AMOUNT].get_int(), 2);
-    BOOST_CHECK_EQUAL(results[T_EFFECTIVEAMOUNT].get_int(), 5);
-
-    req.params.push_back(blockHash.GetHex());
-
-    results = getvalueforname(req);
-    BOOST_CHECK_EQUAL(results[T_AMOUNT].get_int(), 2);
-    BOOST_CHECK_EQUAL(results[T_EFFECTIVEAMOUNT].get_int(), 2);
-}
-
-BOOST_AUTO_TEST_CASE(getclaimsforname_test)
-{
-    ClaimTrieChainFixture fixture;
-    std::string sName1("testN");
-    std::string sValue1("test1");
-    std::string sValue2("test2");
-
-    int height = chainActive.Height();
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue1, 2);
-    fixture.IncrementBlocks(1);
-
-    uint256 blockHash = chainActive.Tip()->GetBlockHash();
-
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue2, 3);
-    fixture.IncrementBlocks(1);
-
-    rpcfn_type getclaimsforname = tableRPC["getclaimsforname"]->actor;
-    JSONRPCRequest req;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(sName1));
-
-    UniValue results = getclaimsforname(req);
-    UniValue claims = results[T_CLAIMS];
-    BOOST_CHECK_EQUAL(claims.size(), 2U);
-    BOOST_CHECK_EQUAL(results[T_LASTTAKEOVERHEIGHT].get_int(), height + 1);
-    BOOST_CHECK_EQUAL(claims[0][T_EFFECTIVEAMOUNT].get_int(), 2);
-    BOOST_CHECK_EQUAL(claims[0][T_SUPPORTS].size(), 0U);
-
-    fixture.IncrementBlocks(1);
-
-    results = getclaimsforname(req);
-    claims = results[T_CLAIMS];
-    BOOST_CHECK_EQUAL(claims.size(), 2U);
-    BOOST_CHECK_EQUAL(results[T_LASTTAKEOVERHEIGHT].get_int(), height + 3);
-    BOOST_CHECK_EQUAL(claims[0][T_EFFECTIVEAMOUNT].get_int(), 3);
-    BOOST_CHECK_EQUAL(claims[1][T_EFFECTIVEAMOUNT].get_int(), 2);
-    BOOST_CHECK_EQUAL(claims[0][T_SUPPORTS].size(), 0U);
-    BOOST_CHECK_EQUAL(claims[1][T_SUPPORTS].size(), 0U);
-
-    req.params.push_back(blockHash.GetHex());
-
-    results = getclaimsforname(req);
-    claims = results[T_CLAIMS];
-    BOOST_CHECK_EQUAL(claims.size(), 1U);
-    BOOST_CHECK_EQUAL(results[T_LASTTAKEOVERHEIGHT].get_int(), height + 1);
-    BOOST_CHECK_EQUAL(claims[0][T_EFFECTIVEAMOUNT].get_int(), 2);
-    BOOST_CHECK_EQUAL(claims[0][T_SUPPORTS].size(), 0U);
-}
-
-BOOST_AUTO_TEST_CASE(claim_rpcs_rollback2_test)
-{
-    ClaimTrieChainFixture fixture;
-    std::string sName1("testN");
-    std::string sValue1("test1");
-    std::string sValue2("test2");
-
-    int height = chainActive.Height();
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue1, 1);
-    fixture.IncrementBlocks(2);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue2, 2);
-    fixture.IncrementBlocks(3);
-
-    uint256 blockHash = chainActive.Tip()->GetBlockHash();
-
-    CMutableTransaction tx3 = fixture.MakeSupport(fixture.GetCoinbase(), tx1, sValue1, 3);
-    fixture.IncrementBlocks(1);
-
-    rpcfn_type getclaimsforname = tableRPC["getclaimsforname"]->actor;
-    rpcfn_type getvalueforname = tableRPC["getvalueforname"]->actor;
-    JSONRPCRequest req;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(sName1));
-    req.params.push_back(blockHash.GetHex());
-
-    UniValue claimsResults = getclaimsforname(req);
-    BOOST_CHECK_EQUAL(claimsResults[T_LASTTAKEOVERHEIGHT].get_int(), height + 5);
-    BOOST_CHECK_EQUAL(claimsResults[T_CLAIMS][0][T_SUPPORTS].size(), 0U);
-    BOOST_CHECK_EQUAL(claimsResults[T_CLAIMS][1][T_SUPPORTS].size(), 0U);
-
-    UniValue valueResults = getvalueforname(req);
-    BOOST_CHECK_EQUAL(valueResults[T_VALUE].get_str(), HexStr(sValue2));
-    BOOST_CHECK_EQUAL(valueResults[T_AMOUNT].get_int(), 2);
-}
-
-BOOST_AUTO_TEST_CASE(claim_rpcs_rollback3_test)
-{
-    ClaimTrieChainFixture fixture;
-    std::string sName1("testN");
-    std::string sValue1("test1");
-    std::string sValue2("test2");
-
-    int height = chainActive.Height();
-
-    CMutableTransaction tx1 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue1, 3);
-    fixture.IncrementBlocks(1);
-    CMutableTransaction tx2 = fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue2, 2);
-    fixture.IncrementBlocks(2);
-
-    uint256 blockHash = chainActive.Tip()->GetBlockHash();
-
-    CMutableTransaction tx3 = fixture.Spend(tx1); // abandon the claim
-    fixture.IncrementBlocks(1);
-
-    rpcfn_type getclaimsforname = tableRPC["getclaimsforname"]->actor;
-    rpcfn_type getvalueforname = tableRPC["getvalueforname"]->actor;
-    rpcfn_type getblocktemplate = tableRPC["getblocktemplate"]->actor;
-
-    JSONRPCRequest req;
-    req.params = UniValue(UniValue::VARR);
-    UniValue templateResults = getblocktemplate(req);
-    BOOST_CHECK_EQUAL(templateResults["claimtrie"].get_str(), chainActive.Tip()->hashClaimTrie.GetHex());
-
-    req.params.push_back(UniValue(sName1));
-    req.params.push_back(blockHash.GetHex());
-
-    UniValue claimsResults = getclaimsforname(req);
-    BOOST_CHECK_EQUAL(claimsResults[T_LASTTAKEOVERHEIGHT].get_int(), height + 1);
-
-    UniValue valueResults = getvalueforname(req);
-    BOOST_CHECK_EQUAL(valueResults[T_VALUE].get_str(), HexStr(sValue1));
-    BOOST_CHECK_EQUAL(valueResults[T_AMOUNT].get_int(), 3);
-}
-
-std::vector<std::pair<bool, uint256>> jsonToPairs(const UniValue& jsonPair)
-{
-    std::vector<std::pair<bool, uint256>> pairs;
-    for (std::size_t i = 0; i < jsonPair.size(); ++i) {
-        auto& jpair = jsonPair[i];
-        pairs.emplace_back(jpair[T_ODD].get_bool(), uint256S(jpair[T_HASH].get_str()));
-    }
-    return pairs;
-}
-
-BOOST_AUTO_TEST_CASE(hash_bid_seq_claim_changes_test)
-{
-    ClaimTrieChainFixture fixture;
-    fixture.setHashForkHeight(2);
-    fixture.IncrementBlocks(4);
-
-    std::string name = "toa";
-    std::string value1 = "one", value2 = "two", value3 = "tre", value4 = "for";
-
-    auto tx1 = fixture.MakeClaim(fixture.GetCoinbase(), name, value1, 1);
-    fixture.IncrementBlocks(1);
-
-    CMutableTransaction tx2 = BuildTransaction(fixture.GetCoinbase(), 0, 2);
-    tx2.vout[0].scriptPubKey = CScript() << OP_CLAIM_NAME
-                                         << std::vector<unsigned char>(name.begin(), name.end())
-                                         << std::vector<unsigned char>(value2.begin(), value2.end()) << OP_2DROP << OP_DROP << OP_TRUE;
-    tx2.vout[0].nValue = 3;
-    tx2.vout[1].scriptPubKey = CScript() << OP_CLAIM_NAME
-                                         << std::vector<unsigned char>(name.begin(), name.end())
-                                         << std::vector<unsigned char>(value3.begin(), value3.end()) << OP_2DROP << OP_DROP << OP_TRUE;
-    tx2.vout[1].nValue = 2;
-
-    fixture.CommitTx(tx2);
-    fixture.IncrementBlocks(1);
-
-    auto tx3 = fixture.MakeClaim(fixture.GetCoinbase(), name, value4, 4);
-    fixture.IncrementBlocks(1);
-
-    int height = chainActive.Height();
-
-    auto claimId1 = ClaimIdHash(tx1.GetHash(), 0);
-    auto claimId2 = ClaimIdHash(tx2.GetHash(), 0);
-    auto claimId3 = ClaimIdHash(tx2.GetHash(), 1);
-    auto claimId4 = ClaimIdHash(tx3.GetHash(), 0);
-
-    int claim1bid = 3, claim1seq = 0;
-    int claim2bid = 1, claim2seq = 1;
-    int claim3bid = 2, claim3seq = 2;
-    int claim4bid = 0, claim4seq = 3;
-
-    auto getclaimsforname = tableRPC["getclaimsforname"]->actor;
-
-    JSONRPCRequest req;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(name));
-
-    auto result = getclaimsforname(req);
-    auto claims = result[T_CLAIMS];
-    BOOST_CHECK_EQUAL(claims.size(), 4U);
-    BOOST_CHECK_EQUAL(result[T_LASTTAKEOVERHEIGHT].get_int(), height);
-    BOOST_CHECK_EQUAL(claims[0][T_EFFECTIVEAMOUNT].get_int(), 4);
-    BOOST_CHECK_EQUAL(claims[0][T_BID].get_int(), claim4bid);
-    BOOST_CHECK_EQUAL(claims[0][T_SEQUENCE].get_int(), claim4seq);
-    BOOST_CHECK_EQUAL(claims[0][T_CLAIMID].get_str(), claimId4.GetHex());
-    BOOST_CHECK_EQUAL(claims[1][T_EFFECTIVEAMOUNT].get_int(), 3);
-    BOOST_CHECK_EQUAL(claims[1][T_BID].get_int(), claim2bid);
-    BOOST_CHECK_EQUAL(claims[1][T_SEQUENCE].get_int(), claim2seq);
-    BOOST_CHECK_EQUAL(claims[1][T_CLAIMID].get_str(), claimId2.GetHex());
-    BOOST_CHECK_EQUAL(claims[2][T_EFFECTIVEAMOUNT].get_int(), 2);
-    BOOST_CHECK_EQUAL(claims[2][T_BID].get_int(), claim3bid);
-    BOOST_CHECK_EQUAL(claims[2][T_SEQUENCE].get_int(), claim3seq);
-    BOOST_CHECK_EQUAL(claims[2][T_CLAIMID].get_str(), claimId3.GetHex());
-    BOOST_CHECK_EQUAL(claims[3][T_EFFECTIVEAMOUNT].get_int(), 1);
-    BOOST_CHECK_EQUAL(claims[3][T_BID].get_int(), claim1bid);
-    BOOST_CHECK_EQUAL(claims[3][T_SEQUENCE].get_int(), claim1seq);
-    BOOST_CHECK_EQUAL(claims[3][T_CLAIMID].get_str(), claimId1.GetHex());
-
-    auto getclaimbybid = tableRPC["getclaimbybid"]->actor;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(name));
-    req.params.push_back(UniValue(claim3bid));
-
-    result = getclaimbybid(req);
-    BOOST_CHECK_EQUAL(result[T_LASTTAKEOVERHEIGHT].get_int(), height);
-    BOOST_CHECK_EQUAL(result[T_EFFECTIVEAMOUNT].get_int(), 2);
-    BOOST_CHECK_EQUAL(result[T_BID].get_int(), claim3bid);
-    BOOST_CHECK_EQUAL(result[T_SEQUENCE].get_int(), claim3seq);
-    BOOST_CHECK_EQUAL(result[T_CLAIMID].get_str(), claimId3.GetHex());
-
-    auto getclaimbyseq = tableRPC["getclaimbyseq"]->actor;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(name));
-    req.params.push_back(UniValue(claim2seq));
-
-    result = getclaimbyseq(req);
-    BOOST_CHECK_EQUAL(result[T_LASTTAKEOVERHEIGHT].get_int(), height);
-    BOOST_CHECK_EQUAL(result[T_EFFECTIVEAMOUNT].get_int(), 3);
-    BOOST_CHECK_EQUAL(result[T_BID].get_int(), claim2bid);
-    BOOST_CHECK_EQUAL(result[T_SEQUENCE].get_int(), claim2seq);
-    BOOST_CHECK_EQUAL(result[T_CLAIMID].get_str(), claimId2.GetHex());
-
-    auto getclaimbyid = tableRPC["getclaimbyid"]->actor;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(claimId1.GetHex()));
-
-    result = getclaimbyid(req);
-    BOOST_CHECK_EQUAL(result[T_LASTTAKEOVERHEIGHT].get_int(), height);
-    BOOST_CHECK_EQUAL(result[T_EFFECTIVEAMOUNT].get_int(), 1);
-    BOOST_CHECK_EQUAL(result[T_BID].get_int(), claim1bid);
-    BOOST_CHECK_EQUAL(result[T_SEQUENCE].get_int(), claim1seq);
-    BOOST_CHECK_EQUAL(result[T_CLAIMID].get_str(), claimId1.GetHex());
-
-    // check by partial id (at least 3 chars)
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(claimId3.GetHex().substr(0, 3)));
-
-    result = getclaimbyid(req);
-    BOOST_CHECK_EQUAL(result[T_LASTTAKEOVERHEIGHT].get_int(), height);
-    BOOST_CHECK_EQUAL(result[T_EFFECTIVEAMOUNT].get_int(), 2);
-    BOOST_CHECK_EQUAL(result[T_BID].get_int(), claim3bid);
-    BOOST_CHECK_EQUAL(result[T_SEQUENCE].get_int(), claim3seq);
-    BOOST_CHECK_EQUAL(result[T_CLAIMID].get_str(), claimId3.GetHex());
-
-    auto blockhash = chainActive.Tip()->GetBlockHash();
-
-    auto getnameproof = tableRPC["getnameproof"]->actor;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(name));
-    req.params.push_back(UniValue(blockhash.GetHex()));
-    req.params.push_back(UniValue(claimId3.GetHex()));
-
-    result = getnameproof(req);
-    auto claimHash = getValueHash(COutPoint(tx2.GetHash(), 1), result[T_LASTTAKEOVERHEIGHT].get_int());
-    ValidatePairs(fixture, jsonToPairs(result[T_PAIRS]), claimHash);
-
-    // check by partial id (can be even 1 char)
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(name));
-    req.params.push_back(UniValue(blockhash.GetHex()));
-    req.params.push_back(UniValue(claimId2.GetHex().substr(0, 2)));
-
-    result = getnameproof(req);
-    claimHash = getValueHash(COutPoint(tx2.GetHash(), 0), result[T_LASTTAKEOVERHEIGHT].get_int());
-    ValidatePairs(fixture, jsonToPairs(result[T_PAIRS]), claimHash);
-
-    auto getclaimproofbybid = tableRPC["getclaimproofbybid"]->actor;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(name));
-    req.params.push_back(UniValue(claim1bid));
-
-    result = getclaimproofbybid(req);
-    claimHash = getValueHash(COutPoint(tx1.GetHash(), 0), result[T_LASTTAKEOVERHEIGHT].get_int());
-    ValidatePairs(fixture, jsonToPairs(result[T_PAIRS]), claimHash);
-
-    auto getclaimproofbyseq = tableRPC["getclaimproofbyseq"]->actor;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(name));
-    req.params.push_back(UniValue(claim4seq));
-
-    result = getclaimproofbyseq(req);
-    claimHash = getValueHash(COutPoint(tx3.GetHash(), 0), result[T_LASTTAKEOVERHEIGHT].get_int());
-    ValidatePairs(fixture, jsonToPairs(result[T_PAIRS]), claimHash);
-
-    auto getchangesinblock = tableRPC["getchangesinblock"]->actor;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(blockhash.GetHex()));
-
-    result = getchangesinblock(req);
-    BOOST_CHECK_EQUAL(result[T_CLAIMSADDEDORUPDATED].size(), 3);
-    BOOST_CHECK_EQUAL(result[T_CLAIMSADDEDORUPDATED][0].get_str(), claimId2.GetHex());
-    BOOST_CHECK_EQUAL(result[T_CLAIMSADDEDORUPDATED][1].get_str(), claimId3.GetHex());
-    BOOST_CHECK_EQUAL(result[T_CLAIMSADDEDORUPDATED][2].get_str(), claimId4.GetHex());
-    BOOST_CHECK_EQUAL(result[T_CLAIMSREMOVED].size(), 0);
-    BOOST_CHECK_EQUAL(result[T_SUPPORTSADDEDORUPDATED].size(), 0);
-    BOOST_CHECK_EQUAL(result[T_SUPPORTSREMOVED].size(), 0);
-}
-
-BOOST_AUTO_TEST_CASE(claim_rpc_pending_amount_test)
-{
-    ClaimTrieChainFixture fixture;
-    std::string sName1("test");
-    std::string sValue1("test1");
-    std::string sValue2("test2");
-
-    rpcfn_type getclaimsforname = tableRPC["getclaimsforname"]->actor;
-
-    JSONRPCRequest req;
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(UniValue(sName1));
-
-    fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue1, 1);
-    fixture.IncrementBlocks(1);
-
-    fixture.MakeClaim(fixture.GetCoinbase(), sName1, sValue2, 2);
-    fixture.IncrementBlocks(1);
-
-    auto claims = getclaimsforname(req)[T_CLAIMS];
-    BOOST_CHECK_EQUAL(claims.size(), 2U);
-    BOOST_CHECK_EQUAL(claims[0][T_EFFECTIVEAMOUNT].get_int(), 1);
-    BOOST_CHECK(!claims[0].exists(T_PENDINGAMOUNT));
-    BOOST_CHECK_EQUAL(claims[1][T_EFFECTIVEAMOUNT].get_int(), 0);
-    BOOST_CHECK(claims[1].exists(T_PENDINGAMOUNT));
-    BOOST_CHECK_EQUAL(claims[1][T_PENDINGAMOUNT].get_int(), 2);
-
-    fixture.IncrementBlocks(1);
-
-    claims = getclaimsforname(req)[T_CLAIMS];
-    BOOST_CHECK_EQUAL(claims.size(), 2U);
-    BOOST_CHECK_EQUAL(claims[0][T_EFFECTIVEAMOUNT].get_int(), 2);
-    BOOST_CHECK(!claims[0].exists(T_PENDINGAMOUNT));
-    BOOST_CHECK_EQUAL(claims[1][T_EFFECTIVEAMOUNT].get_int(), 1);
-    BOOST_CHECK(!claims[1].exists(T_PENDINGAMOUNT));
-}
-
-BOOST_AUTO_TEST_SUITE_END()
--- a/src/test/data/key_io_valid.json
+++ b/src/test/data/key_io_valid.json
@ -28,7 +28,7 @@
        "76a91453c0307d6851aa0ce7825ba883c6bd9ad242b48688ac",
        {
            "isPrivkey": false,
-            "chain": "lbrycrdreg"
+            "chain": "regtest"
        }
    ],
    [
@ -72,7 +72,7 @@
        {
            "isCompressed": false,
            "isPrivkey": true,
-            "chain": "lbrycrdreg"
+            "chain": "regtest"
        }
    ],
    [
@ -90,7 +90,7 @@
        {
            "isCompressed": true,
            "isPrivkey": true,
-            "chain": "lbrycrdreg"
+            "chain": "regtest"
        }
    ],
    [
@ -294,7 +294,7 @@
        {
            "isCompressed": false,
            "isPrivkey": true,
-            "chain": "lbrycrdreg"
+            "chain": "regtest"
        }
    ],
    [
@ -481,7 +481,7 @@
        "001428e40f9a66993a8d50b2604af71b17e1606842d8",
        {
            "isPrivkey": false,
-            "chain": "lbrycrdreg",
+            "chain": "regtest",
            "tryCaseFlip": true
        }
    ]
--- a/src/test/data/script_tests.json
+++ b/src/test/data/script_tests.json
@ -458,6 +458,9 @@
 ["NOP", "CHECKSEQUENCEVERIFY 1", "P2SH,STRICTENC", "OK"],
 ["NOP", "NOP4 1", "P2SH,STRICTENC", "OK"],
 ["NOP", "NOP5 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP6 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP7 1", "P2SH,STRICTENC", "OK"],
+["NOP", "NOP8 1", "P2SH,STRICTENC", "OK"],
 ["NOP", "NOP9 1", "P2SH,STRICTENC", "OK"],
 ["NOP", "NOP10 1", "P2SH,STRICTENC", "OK"],

@ -866,8 +869,8 @@
 ["2 2 LSHIFT", "8 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],
 ["2 1 RSHIFT", "1 EQUAL", "P2SH,STRICTENC", "DISABLED_OPCODE", "disabled"],

-["1", "NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
-["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["1", "NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 2 EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],
+["'NOP_1_to_10' NOP1 CHECKLOCKTIMEVERIFY CHECKSEQUENCEVERIFY NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_11' EQUAL", "P2SH,STRICTENC", "EVAL_FALSE"],

 ["Ensure 100% coverage of discouraged NOPS"],
 ["1", "NOP1",  "P2SH,DISCOURAGE_UPGRADABLE_NOPS", "DISCOURAGE_UPGRADABLE_NOPS"],
@ -1790,7 +1793,7 @@
    "2-of-2 with two identical keys and sigs pushed using OP_DUP"
 ],
 [
-    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP9 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
    "",
    "OK",
@ -1804,14 +1807,14 @@
    "P2PK with non-push scriptSig but with P2SH validation"
 ],
 [
-    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP9 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
    "P2SH",
    "SIG_PUSHONLY",
    "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY"
 ],
 [
-    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP9 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
+    "0x47 0x3044022018a2a81a93add5cb5f5da76305718e4ea66045ec4888b28d84cb22fae7f4645b02201e6daa5ed5d2e4b2b2027cf7ffd43d8d9844dd49f74ef86899ec8e669dfd39aa01 NOP8 0x23 0x2103363d90d447b00c9c99ceac05b6262ee053441c7e55552ffe526bad8f83ff4640ac",
    "HASH160 0x14 0x215640c2f72f0d16b4eced26762035a42ffed39a EQUAL",
    "SIGPUSHONLY",
    "SIG_PUSHONLY",
--- a/src/test/nameclaim_tests.cpp
+++ b/src/test/nameclaim_tests.cpp
@ -8,6 +8,7 @@ BOOST_FIXTURE_TEST_SUITE(nameclaim_tests, BasicTestingSetup)

 BOOST_AUTO_TEST_CASE(calc_min_claimtrie_fee)
 {
+
    CMutableTransaction tx;
    tx.vout.resize(1);
    tx.vout[0].scriptPubKey = ClaimNameScript("A","test");
@ -30,18 +31,7 @@ BOOST_AUTO_TEST_CASE(calc_min_claimtrie_fee)
    CMutableTransaction tx4;
    tx4.vout.resize(1);
    BOOST_CHECK_EQUAL(CalcMinClaimTrieFee(tx4,MIN_FEE_PER_NAMECLAIM_CHAR), 0);
-}

-BOOST_AUTO_TEST_CASE(support_handles_value)
-{
-    auto script = SupportClaimScript("s1", uint160(), "me value");
-    int op = 0;
-    std::vector<std::vector<unsigned char>> params;
-    BOOST_CHECK(!DecodeClaimScript(script, op, params, false));
-    params.clear();
-    BOOST_CHECK(DecodeClaimScript(script, op, params));
-    BOOST_CHECK(params[0][0] == 's');
-    BOOST_CHECK(std::string(params[2].begin(), params[2].end()) == "me value");
 }

 BOOST_AUTO_TEST_CASE(scriptToAsmStr_output)
--- a/src/test/prefixtrie_tests.cpp
+++ b/src/test/prefixtrie_tests.cpp
@ -3,7 +3,6 @@
 #include <random.h>

 #include <boost/test/unit_test.hpp>
-#include <test/claimtriefixture.h>
 #include <test/test_bitcoin.h>

 #include <chrono>
@ -38,79 +37,7 @@ std::vector<std::string> random_strings(std::size_t count)

 using namespace std;

-BOOST_FIXTURE_TEST_SUITE(prefixtrie_tests, RegTestingSetup)
-
-#ifndef MAC_OSX // can't find a random number generator that produces the same sequence on OSX
-BOOST_AUTO_TEST_CASE(triehash_fuzzer_test)
-{
-    ClaimTrieChainFixture fixture;
-
-    auto envClaims = std::getenv("TRIEHASH_FUZZER_CLAIMS");
-    auto envBlocks = std::getenv("TRIEHASH_FUZZER_BLOCKS");
-
-    const int claimsPerBlock = envClaims ? std::atoi(envClaims) : 100;
-    const int blocks = envBlocks ? std::atoi(envBlocks) : 13;
-
-    auto names = random_strings(blocks * claimsPerBlock);
-
-    FastRandomContext frc(true);
-    std::unordered_map<std::string, std::vector<CMutableTransaction>> existingClaims;
-    std::vector<CMutableTransaction> existingSupports;
-    std::string value(1024, 'c');
-
-    std::vector<CTransaction> cb {fixture.GetCoinbase()};
-    for (int i = 0; i < blocks; ++i) {
-        for (int j = 0; j < claimsPerBlock; ++j) {
-            auto name = names[i * claimsPerBlock + j];
-            auto supportFront = frc.randrange(4) == 0;
-            auto supportBack = frc.randrange(4) == 0;
-            auto removeClaim = frc.randrange(4) == 0;
-            auto removeSupport = frc.randrange(4) == 0;
-            auto hit = existingClaims.find(name);
-            if (supportFront && hit != existingClaims.end() && hit->second.size()) {
-                auto tx = fixture.MakeSupport(cb.back(), hit->second[frc.rand64() % hit->second.size()], name, 2);
-                existingSupports.push_back(tx);
-                cb.emplace_back(std::move(tx));
-            }
-            if (removeClaim && hit != existingClaims.end() && hit->second.size()) {
-                auto idx = frc.rand64() % hit->second.size();
-                fixture.Spend(hit->second[idx]);
-                hit->second.erase(hit->second.begin() + idx);
-            } else {
-                auto tx = fixture.MakeClaim(cb.back(), name, value, 2);
-                existingClaims[name].push_back(tx);
-                hit = existingClaims.find(name);
-                cb.emplace_back(std::move(tx));
-            }
-            if (supportBack && hit != existingClaims.end() && hit->second.size()) {
-                auto tx = fixture.MakeSupport(cb.back(), hit->second[frc.rand64() % hit->second.size()], name, 2);
-                existingSupports.push_back(tx);
-                cb.emplace_back(std::move(tx));
-            }
-            if (removeSupport && (i & 7) == 7 && !existingSupports.empty()) {
-                const auto tidx = frc.rand64() % existingSupports.size();
-                const auto tx = existingSupports[tidx];
-                fixture.Spend(tx);
-                existingSupports.erase(existingSupports.begin() + tidx);
-            }
-            if (cb.back().GetValueOut() < 10 || cb.size() > 40000) {
-                cb.clear();
-                cb.push_back(fixture.GetCoinbase());
-            }
-        }
-        fixture.IncrementBlocks(1);
-        if (blocks > 13 && i % 50 == 0) // travisCI needs some periodic output
-            std::cerr << "In triehash_fuzzer_test with " << fixture.getTotalNamesInTrie() << " names at block " << i << std::endl;
-    }
-
-    if (blocks == 1000 && claimsPerBlock == 100)
-        BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "28825257a129eef69cab87d6255c8359fc6dc083ca7f09222526e3a7971f382d");
-    else if (blocks == 13 && claimsPerBlock == 100)
-        BOOST_CHECK_EQUAL(fixture.getMerkleHash().GetHex(), "4e5984d6984f5f05d50e821e6228d56bcfbd16ca2093cd0308f6ff1c2bc8689a");
-    else
-        std::cerr << "Hash: "  << fixture.getMerkleHash().GetHex() << std::endl;
-}
-#endif
+BOOST_FIXTURE_TEST_SUITE(prefixtrie_tests, BasicTestingSetup)

 BOOST_AUTO_TEST_CASE(insert_erase_test)
 {
--- a/src/test/script_tests.cpp
+++ b/src/test/script_tests.cpp
@ -719,16 +719,16 @@ BOOST_AUTO_TEST_CASE(script_build)
                               ).Num(0).PushSig(keys.key1).Add(CScript() << OP_DUP).ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
                                "P2SH(P2PK) with non-push scriptSig but no P2SH or SIGPUSHONLY", 0, true
-                               ).PushSig(keys.key2).Add(CScript() << OP_NOP9).PushRedeem());
+                               ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem());
    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
                                "P2PK with non-push scriptSig but with P2SH validation", 0
                               ).PushSig(keys.key2).Add(CScript() << OP_NOP9));
    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
                                "P2SH(P2PK) with non-push scriptSig but no SIGPUSHONLY", SCRIPT_VERIFY_P2SH, true
-                               ).PushSig(keys.key2).Add(CScript() << OP_NOP9).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
+                               ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
    tests.push_back(TestBuilder(CScript() << ToByteVector(keys.pubkey2C) << OP_CHECKSIG,
                                "P2SH(P2PK) with non-push scriptSig but not P2SH", SCRIPT_VERIFY_SIGPUSHONLY, true
-                               ).PushSig(keys.key2).Add(CScript() << OP_NOP9).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
+                               ).PushSig(keys.key2).Add(CScript() << OP_NOP8).PushRedeem().ScriptError(SCRIPT_ERR_SIG_PUSHONLY));
    tests.push_back(TestBuilder(CScript() << OP_2 << ToByteVector(keys.pubkey1C) << ToByteVector(keys.pubkey1C) << OP_2 << OP_CHECKMULTISIG,
                                "2-of-2 with two identical keys and sigs pushed", SCRIPT_VERIFY_SIGPUSHONLY
                               ).Num(0).PushSig(keys.key1).PushSig(keys.key1));
--- a/src/test/transaction_tests.cpp
+++ b/src/test/transaction_tests.cpp
@ -701,7 +701,7 @@ BOOST_AUTO_TEST_CASE(test_IsStandard)

    // Check dust with default relay fee:
    CAmount nDustThreshold = 182 * dustRelayFee.GetFeePerK()/1000;
-    BOOST_CHECK_EQUAL(nDustThreshold, 182);
+    BOOST_CHECK_EQUAL(nDustThreshold, 546);
    // dust:
    t.vout[0].nValue = nDustThreshold - 1;
    BOOST_CHECK(!IsStandardTx(t, reason));
--- a/src/test/util_tests.cpp
+++ b/src/test/util_tests.cpp
@ -4,7 +4,6 @@

 #include <util.h>

-#include <chainparamsbase.h>
 #include <clientversion.h>
 #include <primitives/transaction.h>
 #include <sync.h>
@ -559,27 +558,27 @@ BOOST_AUTO_TEST_CASE(util_GetChainName)
    std::string error;

    test_args.ParseParameters(0, (char**)argv_testnet, error);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::MAIN);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrd");

    test_args.ParseParameters(2, (char**)argv_testnet, error);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::TESTNET);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrdtest");

    test_args.ParseParameters(2, (char**)argv_regtest, error);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::REGTEST);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "regtest");

    test_args.ParseParameters(3, (char**)argv_test_no_reg, error);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::TESTNET);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrdtest");

    test_args.ParseParameters(3, (char**)argv_both, error);
    BOOST_CHECK_THROW(test_args.GetChainName(), std::runtime_error);

    test_args.ParseParameters(0, (char**)argv_testnet, error);
    test_args.ReadConfigString(testnetconf);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::TESTNET);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrdtest");

    test_args.ParseParameters(2, (char**)argv_testnet, error);
    test_args.ReadConfigString(testnetconf);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::TESTNET);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrdtest");

    test_args.ParseParameters(2, (char**)argv_regtest, error);
    test_args.ReadConfigString(testnetconf);
@ -587,7 +586,7 @@ BOOST_AUTO_TEST_CASE(util_GetChainName)

    test_args.ParseParameters(3, (char**)argv_test_no_reg, error);
    test_args.ReadConfigString(testnetconf);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::TESTNET);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrdtest");

    test_args.ParseParameters(3, (char**)argv_both, error);
    test_args.ReadConfigString(testnetconf);
@ -599,11 +598,11 @@ BOOST_AUTO_TEST_CASE(util_GetChainName)

    test_args.ParseParameters(0, (char**)argv_testnet, error);
    test_args.ReadConfigString(testnetconf);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::TESTNET);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrdtest");

    test_args.ParseParameters(2, (char**)argv_testnet, error);
    test_args.ReadConfigString(testnetconf);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::TESTNET);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrdtest");

    test_args.ParseParameters(2, (char**)argv_regtest, error);
    test_args.ReadConfigString(testnetconf);
@ -611,7 +610,7 @@ BOOST_AUTO_TEST_CASE(util_GetChainName)

    test_args.ParseParameters(2, (char**)argv_test_no_reg, error);
    test_args.ReadConfigString(testnetconf);
-    BOOST_CHECK_EQUAL(test_args.GetChainName(), CBaseChainParams::TESTNET);
+    BOOST_CHECK_EQUAL(test_args.GetChainName(), "lbrycrdtest");

    test_args.ParseParameters(3, (char**)argv_both, error);
    test_args.ReadConfigString(testnetconf);
--- a/src/txdb.h
+++ b/src/txdb.h
@ -26,7 +26,7 @@ struct CDiskTxPos;
 //! No need to periodic flush if at least this much space still available.
 static constexpr int MAX_BLOCK_COINSDB_USAGE = 10;
 //! -dbcache default (MiB)
-static const int64_t nDefaultDbCache = 560;
+static const int64_t nDefaultDbCache = sizeof(void*) > 4 ? 700 : 450;
 //! -dbbatchsize default (bytes)
 static const int64_t nDefaultDbBatchSize = 16 << 20;
 //! max. -dbcache (MiB)
@ -34,13 +34,13 @@ static const int64_t nMaxDbCache = sizeof(void*) > 4 ? 16384 : 1024;
 //! min. -dbcache (MiB)
 static const int64_t nMinDbCache = 4;
 //! Max memory allocated to block tree DB specific cache, if no -txindex (MiB)
-static const int64_t nMaxBlockDBCache = 16;
+static const int64_t nMaxBlockDBCache = 8;
 //! Max memory allocated to block tree DB specific cache, if -txindex (MiB)
 // Unlike for the UTXO database, for the txindex scenario the leveldb cache make
 // a meaningful difference: https://github.com/bitcoin/bitcoin/pull/8273#issuecomment-229601991
 static const int64_t nMaxTxIndexCache = 1024;
 //! Max memory allocated to coin DB specific cache (MiB)
-static const int64_t nMaxCoinsDBCache = 32;
+static const int64_t nMaxCoinsDBCache = 8;

 /** CCoinsView backed by the coin database (chainstate/) */
 class CCoinsViewDB final : public CCoinsView
--- a/src/univalue/autogen.sh
+++ b/src/univalue/autogen.sh
@ -2,7 +2,7 @@
 set -e
 srcdir="$(dirname $0)"
 cd "$srcdir"
-if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="$(which glibtoolize 2>/dev/null)"; then
+if [ -z ${LIBTOOLIZE} ] && GLIBTOOLIZE="`which glibtoolize 2>/dev/null`"; then
  LIBTOOLIZE="${GLIBTOOLIZE}"
  export LIBTOOLIZE
 fi
--- a/src/validation.cpp
+++ b/src/validation.cpp
@ -1351,7 +1351,36 @@ bool CheckInputs(const CTransaction& tx, CValidationState &state, const CCoinsVi
    return true;
 }

-bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex *pindex)
+namespace {
+
+bool UndoWriteToDisk(const CBlockUndo& blockundo, CDiskBlockPos& pos, const uint256& hashBlock, const CMessageHeader::MessageStartChars& messageStart)
+{
+    // Open history file to append
+    CAutoFile fileout(OpenUndoFile(pos), SER_DISK, CLIENT_VERSION);
+    if (fileout.IsNull())
+        return error("%s: OpenUndoFile failed", __func__);
+
+    // Write index header
+    unsigned int nSize = GetSerializeSize(fileout, blockundo);
+    fileout << messageStart << nSize;
+
+    // Write undo data
+    long fileOutPos = ftell(fileout.Get());
+    if (fileOutPos < 0)
+        return error("%s: ftell failed", __func__);
+    pos.nPos = (unsigned int)fileOutPos;
+    fileout << blockundo;
+
+    // calculate & write checksum
+    CHashWriter hasher(SER_GETHASH, PROTOCOL_VERSION);
+    hasher << hashBlock;
+    hasher << blockundo;
+    fileout << hasher.GetHash();
+
+    return true;
+}
+
+static bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex *pindex)
 {
    CDiskBlockPos pos = pindex->GetUndoPos();
    if (pos.IsNull()) {
@ -1382,35 +1411,6 @@ bool UndoReadFromDisk(CBlockUndo& blockundo, const CBlockIndex *pindex)
    return true;
 }

-namespace {
-
-bool UndoWriteToDisk(const CBlockUndo& blockundo, CDiskBlockPos& pos, const uint256& hashBlock, const CMessageHeader::MessageStartChars& messageStart)
-{
-    // Open history file to append
-    CAutoFile fileout(OpenUndoFile(pos), SER_DISK, CLIENT_VERSION);
-    if (fileout.IsNull())
-        return error("%s: OpenUndoFile failed", __func__);
-
-    // Write index header
-    unsigned int nSize = GetSerializeSize(fileout, blockundo);
-    fileout << messageStart << nSize;
-
-    // Write undo data
-    long fileOutPos = ftell(fileout.Get());
-    if (fileOutPos < 0)
-        return error("%s: ftell failed", __func__);
-    pos.nPos = (unsigned int)fileOutPos;
-    fileout << blockundo;
-
-    // calculate & write checksum
-    CHashWriter hasher(SER_GETHASH, PROTOCOL_VERSION);
-    hasher << hashBlock;
-    hasher << blockundo;
-    fileout << hasher.GetHash();
-
-    return true;
-}
-
 /** Abort with a message */
 static bool AbortNode(const std::string& strMessage, const std::string& userMessage="")
 {
@ -1562,12 +1562,18 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock& block, const CBlockI
    assert(trieCache.finalizeDecrement(blockUndo.takeoverHeightUndo));
    auto merkleHash = trieCache.getMerkleHash();
    if (merkleHash != pindex->pprev->hashClaimTrie) {
-        if (!trieCache.empty())
-            trieCache.dumpToLog(trieCache.find({}));
+        for (auto cit = trieCache.begin(); cit != trieCache.end(); ++cit) {
+            if (cit->claims.size() && cit->nHeightOfLastTakeover <= 0)
+                LogPrintf("Invalid takeover height discovered in cache for %s\n", cit.key());
+            if (cit->hash.IsNull())
+                LogPrintf("Invalid hash discovered in cache for %s\n", cit.key());
+        }
        LogPrintf("Hash comparison failure at block %d\n", pindex->nHeight);
        assert(merkleHash == pindex->pprev->hashClaimTrie);
    }

+    trieCache.expirationForkActive(pindex->nHeight, false);
+
    return fClean ? DISCONNECT_OK : DISCONNECT_UNCLEAN;
 }

@ -1925,6 +1931,8 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
    // Get the script flags for this block
    unsigned int flags = GetBlockScriptFlags(pindex, chainparams.GetConsensus());

+    trieCache.expirationForkActive(pindex->nHeight, true);
+
    int64_t nTime2 = GetTimeMicros(); nTimeForks += nTime2 - nTime1;
    LogPrint(BCLog::BENCH, "    - Fork checks: %.2fms [%.2fs (%.2fms/blk)]\n", MILLI * (nTime2 - nTime1), nTimeForks * MICRO, nTimeForks * MILLI / nBlocksTotal);

@ -1932,8 +1940,6 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl

    CCheckQueueControl<CScriptCheck> control(fScriptChecks && nScriptCheckThreads ? &scriptcheckqueue : nullptr);

-    trieCache.initializeIncrement();
-
    std::vector<int> prevheights;
    CAmount nFees = 0;
    int nInputs = 0;
@ -2041,7 +2047,7 @@ bool CChainState::ConnectBlock(const CBlock& block, CValidationState& state, CBl
    if (trieCache.getMerkleHash() != block.hashClaimTrie)
    {
        if (!trieCache.empty()) // we could run checkConsistency here, but it would take a while
-            trieCache.dumpToLog(trieCache.find({}));
+            trieCache.dumpToLog(trieCache.begin());
        return state.DoS(100, error("ConnectBlock() : the merkle root of the claim trie does not match "
                               "(actual=%s vs block=%s on height=%d)", trieCache.getMerkleHash().GetHex(),
                               block.hashClaimTrie.GetHex(), pindex->nHeight), REJECT_INVALID, "bad-claim-merkle-hash");
@ -2184,7 +2190,7 @@ bool static FlushStateToDisk(const CChainParams& chainparams, CValidationState &
            // overwrite one. Still, use a conservative safety factor of 2.
            if (!CheckDiskSpace(48 * 2 * 2 * pcoinsTip->GetCacheSize()))
                return state.Error("out of disk space");
-            if (mode == FlushStateMode::ALWAYS && !pclaimTrie->SyncToDisk())
+            if (!pclaimTrie->SyncToDisk())
                return state.Error("Failed to write to claim trie database");
            // Flush the chainstate (which may refer to block index entries).
            if (!pcoinsTip->Flush())
@ -2250,8 +2256,7 @@ void static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainPar
    }

    std::string warningMessages;
-    auto isInitialBlockDownload = IsInitialBlockDownload();
-    if (!isInitialBlockDownload)
+    if (!IsInitialBlockDownload())
    {
        int nUpgraded = 0;
        const CBlockIndex* pindex = pindexNew;
@ -2286,7 +2291,8 @@ void static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainPar
    }
    static int64_t lastBlockPrintTime = 0;
    auto currentTime = GetAdjustedTime();
-    if (!warningMessages.empty() || !isInitialBlockDownload || lastBlockPrintTime < currentTime - 15 || LogAcceptCategory(BCLog::CLAIMS)) {
+    auto oldBlock = pindexNew->nTime + MAX_FUTURE_BLOCK_TIME < currentTime;
+    if (!warningMessages.empty() || !oldBlock || lastBlockPrintTime < currentTime - 15 || LogAcceptCategory(BCLog::CLAIMS)) {
        lastBlockPrintTime = currentTime;
        LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g txb=%lu tx=%lu date='%s' progress=%f cache=%.1fMiB(%utxo)%s",
                __func__, pindexNew->GetBlockHash().ToString(), pindexNew->nHeight, pindexNew->nVersion,
@ -2294,11 +2300,12 @@ void static UpdateTip(const CBlockIndex *pindexNew, const CChainParams& chainPar
                (unsigned long) pindexNew->nChainTx, FormatISO8601DateTime(pindexNew->GetBlockTime()),
                GuessVerificationProgress(chainParams.TxData(), pindexNew),
                pcoinsTip->DynamicMemoryUsage() * (1.0 / (1U << 20U)), pcoinsTip->GetCacheSize(),
-                isInitialBlockDownload ? " IBD" : "");
+                oldBlock ? " (synchronizing)" : "");
        if (!warningMessages.empty())
            LogPrintf(" warning='%s'", warningMessages); /* Continued */
        LogPrintf("\n");
    }
+
 }

 /** Disconnect chainActive's tip.
@ -2772,15 +2779,13 @@ bool CChainState::ActivateBestChain(CValidationState &state, const CChainParams&
        if (ShutdownRequested())
            break;
    } while (pindexNewTip != pindexMostWork);
-
-    auto& consensus = chainparams.GetConsensus();
-    CheckBlockIndex(consensus);
+    CheckBlockIndex(chainparams.GetConsensus());

    auto flushMode = FlushStateMode::PERIODIC;
-    if (pindexNewTip && chainparams.NetworkIDString() != CBaseChainParams::REGTEST 
-        && pindexNewTip->nTime + consensus.nPowTargetSpacing > GetAdjustedTime()) {
+    if (pindexNewTip && pindexNewTip->nTime + chainparams.GetConsensus().nPowTargetSpacing > GetAdjustedTime()) {
        // trying to ensure that we flush to disk after new blocks when we're caught up to the chain
        // they're technically allowed to be two hours late, but experience says one minute is more likely
+        // LogPrintf("Added tip with time %d but it is now %ll\n", pindexNewTip->nTime, GetAdjustedTime());
        flushMode = FlushStateMode::ALWAYS;
    }
    return FlushStateToDisk(chainparams, state, flushMode);
--- a/src/validation.h
+++ b/src/validation.h
@ -57,7 +57,7 @@ static const bool DEFAULT_WHITELISTFORCERELAY = true;
 /** Default for -minrelaytxfee, minimum relay fee for transactions */
 static const unsigned int DEFAULT_MIN_RELAY_TX_FEE = 1000;
 //! -maxtxfee default
-static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.5 * COIN;
+static const CAmount DEFAULT_TRANSACTION_MAXFEE = 0.1 * COIN;
 //! Discourage users to set fees higher than this amount (in satoshis) per kB
 static const CAmount HIGH_TX_FEE_PER_KB = 0.01 * COIN;
 //! -maxtxfee will warn if called with a higher fee than this amount (in satoshis)
--- a/src/versionbits.cpp
+++ b/src/versionbits.cpp
@ -203,12 +203,6 @@ public:

 ThresholdState VersionBitsState(const CBlockIndex* pindexPrev, const Consensus::Params& params, Consensus::DeploymentPos pos, VersionBitsCache& cache)
 {
-    // Check if we've past a hardfork state for segwit.
-    if (pos == Consensus::DEPLOYMENT_SEGWIT) {
-        return pindexPrev != nullptr && pindexPrev->nHeight + 1 >= params.nWitnessForkHeight ?
-            ThresholdState::ACTIVE : ThresholdState::FAILED;
-    }
-
    return VersionBitsConditionChecker(pos).GetStateFor(pindexPrev, params, cache.caches[pos]);
 }

--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@ -469,10 +469,10 @@ bool BerkeleyEnvironment::Salvage(const std::string& strFile, bool fAggressive,
 }


-void BerkeleyEnvironment::CheckpointLSN(const std::string& strFile, bool lsnReset)
+void BerkeleyEnvironment::CheckpointLSN(const std::string& strFile)
 {
    dbenv->txn_checkpoint(0, 0, 0);
-    if (fMockDb || !lsnReset)
+    if (fMockDb)
        return;
    dbenv->lsn_reset(strFile.c_str(), 0);
 }
@ -799,7 +799,7 @@ bool BerkeleyBatch::PeriodicFlush(BerkeleyDatabase& database)

                // Flush wallet file so it's self contained
                env->CloseDb(strFile);
-                env->CheckpointLSN(strFile, false); // too expensive to reset LSN periodically (and it's triggered on flush or backup
+                env->CheckpointLSN(strFile);

                env->mapFileUseCount.erase(mi++);
                LogPrint(BCLog::DB, "Flushed %s %dms\n", strFile, GetTimeMillis() - nStart);
--- a/src/wallet/db.h
+++ b/src/wallet/db.h
@ -83,7 +83,7 @@ public:
    bool Open(bool retry);
    void Close();
    void Flush(bool fShutdown);
-    void CheckpointLSN(const std::string& strFile, bool lsnReset = true);
+    void CheckpointLSN(const std::string& strFile);

    void CloseDb(const std::string& strFile);
    void ReloadDbEnv();
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@ -218,7 +218,7 @@ UniValue abortrescan(const JSONRPCRequest& request)
 static void ImportAddress(CWallet*, const CTxDestination& dest, const std::string& strLabel);
 static void ImportScript(CWallet* const pwallet, const CScript& script, const std::string& strLabel, bool isRedeemScript) EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)
 {
-    if (!isRedeemScript && (::IsMine(*pwallet, script) & ISMINE_SPENDABLE)) {
+    if (!isRedeemScript && ::IsMine(*pwallet, script) == ISMINE_SPENDABLE) {
        throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
    }

@ -902,7 +902,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con

            CScript redeemDestination = GetScriptForDestination(redeem_id);

-            if (::IsMine(*pwallet, redeemDestination) & ISMINE_SPENDABLE) {
+            if (::IsMine(*pwallet, redeemDestination) == ISMINE_SPENDABLE) {
                throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
            }

@ -986,7 +986,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con

                CScript pubKeyScript = GetScriptForDestination(pubkey_dest);

-                if (::IsMine(*pwallet, pubKeyScript) & ISMINE_SPENDABLE) {
+                if (::IsMine(*pwallet, pubKeyScript) == ISMINE_SPENDABLE) {
                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
                }

@ -1005,7 +1005,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
                // TODO Is this necessary?
                CScript scriptRawPubKey = GetScriptForRawPubKey(pubKey);

-                if (::IsMine(*pwallet, scriptRawPubKey) & ISMINE_SPENDABLE) {
+                if (::IsMine(*pwallet, scriptRawPubKey) == ISMINE_SPENDABLE) {
                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
                }

@ -1071,7 +1071,7 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con

            // Import scriptPubKey only.
            if (pubKeys.size() == 0 && keys.size() == 0) {
-                if (::IsMine(*pwallet, script) & ISMINE_SPENDABLE) {
+                if (::IsMine(*pwallet, script) == ISMINE_SPENDABLE) {
                    throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");
                }

--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@ -480,7 +480,7 @@ static CTransactionRef SendMoney(CWallet * const pwallet, const CTxDestination &
    }

    // Parse Bitcoin address
-    const CScript scriptPubKey = prefix + GetScriptForDestination(address);
+    CScript scriptPubKey = prefix + GetScriptForDestination(address);

    // Create and send the transaction
    CReserveKey reservekey(pwallet);
@ -513,7 +513,7 @@ UniValue claimname(const JSONRPCRequest& request)
        return NullUniValue;
    }

-    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4))
+    if (request.fHelp || request.params.size() != 3)
        throw std::runtime_error(
            "claimname \"name\" \"value\" amount\n"
            "\nCreate a transaction which issues a claim assigning a value to a name. The claim will be authoritative if the transaction amount is greater than the transaction amount of all other unspent transactions which issue a claim over the same name, and it will remain au\
@ -545,13 +545,9 @@ thoritative as long as it remains unspent and there are no other greater unspent
    if (!pwallet->GetKeyFromPool(newKey))
        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");

-    OutputType output_type = pwallet->m_default_address_type;
-    pwallet->LearnRelatedScripts(newKey, output_type);
-    CTxDestination dest = GetDestinationForKey(newKey, output_type);
-
    CCoinControl cc;
-    cc.m_change_type = pwallet->m_default_change_type;
-    auto tx = SendMoney(pwallet, dest, nAmount, false, cc, {}, {}, claimScript);
+    cc.m_change_type = DEFAULT_ADDRESS_TYPE;
+    auto tx = SendMoney(pwallet, CTxDestination(newKey.GetID()), nAmount, false, cc, {}, {}, claimScript);
    return tx->GetHash().GetHex();
 }

@ -564,7 +560,7 @@ UniValue updateclaim(const JSONRPCRequest& request)
        return NullUniValue;
    }

-    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4))
+    if (request.fHelp || request.params.size() != 3)
        throw std::runtime_error(
            "updateclaim \"txid\" \"value\" amount\n"
            "Create a transaction which issues a claim assigning a value to a name, spending the previous txout which issued a claim over the same name and therefore superseding that claim. The claim will be authoritative if the transaction amount is greater than the transaction amount of all other unspent transactions which issue a claim over the same name, and it will remain authoritative as long as it remains unspent and there are no greater unspent transactions issuing a claim over the same name.\n"
@ -625,15 +621,11 @@ UniValue updateclaim(const JSONRPCRequest& request)
                if (!pwallet->GetKeyFromPool(newKey))
                    throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");

-                OutputType output_type = pwallet->m_default_address_type;
-                pwallet->LearnRelatedScripts(newKey, output_type);
-                CTxDestination dest = GetDestinationForKey(newKey, output_type);
-
                CCoinControl cc;
-                cc.m_change_type = pwallet->m_default_change_type;
+                cc.m_change_type = DEFAULT_ADDRESS_TYPE;
                cc.Select(COutPoint(wtx.tx->GetHash(), i));
-                cc.fAllowOtherInputs = true; // when selecting a coin, that's the only one used without this flag (and we need to cover the fee)
-                wtxNew = SendMoney(pwallet, dest, nAmount, false, cc, {}, {}, updateScript);
+                cc.fAllowOtherInputs = true; // the doc comment on this parameter says it should be false; experience says otherwise
+                wtxNew = SendMoney(pwallet, CTxDestination(newKey.GetID()), nAmount, false, cc, {}, {}, updateScript);
                break;
            }
        }
@ -666,7 +658,8 @@ UniValue abandonclaim(const JSONRPCRequest& request)
    uint256 hash;
    hash.SetHex(request.params[0].get_str());

-    CTxDestination address = DecodeDestination(request.params[1].get_str());
+    CKeyID address;
+    address.SetHex(request.params[1].get_str());

    pwallet->BlockUntilSyncedToCurrentChain();
    LOCK2(cs_main, pwallet->cs_wallet);
@ -684,7 +677,7 @@ UniValue abandonclaim(const JSONRPCRequest& request)
        {
            EnsureWalletIsUnlocked(pwallet);
            CCoinControl cc;
-            cc.m_change_type = pwallet->m_default_change_type;
+            cc.m_change_type = DEFAULT_ADDRESS_TYPE;
            cc.Select(COutPoint(wtx.tx->GetHash(), i));
            wtxNew = SendMoney(pwallet, address, wtx.tx->vout[i].nValue, true, cc, {}, {});
            break;
@ -707,13 +700,16 @@ void ListNameClaims(const CWalletTx& wtx, CWallet* const pwallet, const std::str
    std::list<COutputEntry> listSent;
    std::list<COutputEntry> listReceived;

-    wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount, isminetype::ISMINE_ALL);
+    isminefilter filter = isminetype::ISMINE_CLAIM;
+    if (include_supports)
+        filter |= isminetype::ISMINE_SUPPORT;
+    wtx.GetAmounts(listReceived, listSent, nFee, strSentAccount, filter);

    bool fAllAccounts = (strAccount == std::string("*"));
-    if (!fAllAccounts && wtx.strFromAccount != strAccount)
-        return;

-    for (const auto& s: listSent)
+    if ((!listSent.empty() || nFee != 0) && (fAllAccounts || strAccount == strSentAccount))
+    {
+        for (const COutputEntry& s: listSent)
        {
            if (!list_spent && pwallet->IsSpent(wtx.GetHash(), s.vout))
                continue;
@ -725,9 +721,6 @@ void ListNameClaims(const CWalletTx& wtx, CWallet* const pwallet, const std::str
            if (!DecodeClaimScript(scriptPubKey, op, vvchParams)) {
                continue;
            }
-        if (!include_supports && op == OP_SUPPORT_CLAIM)
-            continue;
-
            std::string sName (vvchParams[0].begin(), vvchParams[0].end());
            entry.pushKV("name", escapeNonUtf8(sName));
            if (op == OP_CLAIM_NAME)
@ -753,8 +746,6 @@ void ListNameClaims(const CWalletTx& wtx, CWallet* const pwallet, const std::str
                    entry.pushKV("value", HexStr(vvchParams[2].begin(), vvchParams[2].end()));
                }
            }
-        else
-            throw JSONRPCError(RPC_INTERNAL_ERROR, "Undefined claim operator.");
            entry.pushKV("txid", wtx.GetHash().ToString());
            entry.pushKV("account", strSentAccount);
            MaybePushAddress(entry, s.destination);
@ -795,6 +786,7 @@ void ListNameClaims(const CWalletTx& wtx, CWallet* const pwallet, const std::str
            }
            ret.push_back(entry);
        }
+    }
 }

 UniValue listnameclaims(const JSONRPCRequest& request)
@ -808,11 +800,12 @@ UniValue listnameclaims(const JSONRPCRequest& request)

    if (request.fHelp || request.params.size() > 3)
        throw std::runtime_error(
-            "listnameclaims ( includesuppports activeonly minconf )\n"
+            "listnameclaims includesuppports activeonly minconf\n"
            "Return a list of all transactions claiming names.\n"
            "\nArguments\n"
            "1. includesupports  (bool, optional) Whether to also include claim supports. Default is true.\n"
-            "2. activeonly       (bool, optional) Whether to only include transactions which are still active, i.e. have not been spent. Default is true.\n"
+            "2. activeonly       (bool, optional, not implemented) Whether to only include transactions which are still active, i.e. have n\
+ot been spent. Default is false.\n"
            "3. minconf          (numeric, optional, default=1) Only include transactions confirmed at least this many times.\n"
            "\nResult:\n"
            "[\n"
@ -842,7 +835,7 @@ UniValue listnameclaims(const JSONRPCRequest& request)
    std::string strAccount = "*";

    auto include_supports = request.params.size() < 1 || request.params[0].get_bool();
-    bool fListSpent = request.params.size() > 1 && !request.params[1].get_bool();
+    bool fListSpent = request.params.size() > 1 && request.params[1].get_bool();

    // Minimum confirmations
    int nMinDepth = 1;
@ -880,101 +873,60 @@ UniValue supportclaim(const JSONRPCRequest& request)
        return NullUniValue;
    }

-    if (request.fHelp || request.params.size() < 1 || request.params.size() > 5)
+    if (request.fHelp || (request.params.size() != 3 && request.params.size() != 4))
        throw std::runtime_error(
-            "supportclaim \"name\" ( \"claimid\" amount \"value\" isTip ) \n"
+            "supportclaim \"name\" \"claimid\" \"amount\" \"value\"\n"
            "Increase the value of a claim. Whichever claim has the greatest value, including all support values, will be the authoritative claim, according to the rest of the rules. The name is the name which is claimed by the claim that will be supported, the txid is the txid\
 of the claim that will be supported, nout is the transaction output which contains the claim to be supported, and amount is the amount which will be added to the value of the claim. If the claim is currently the authoritative claim, this support will go into effect immediately \
 . Otherwise, it will go into effect after 100 blocks. The support will be in effect until it is spent, and will lose its effect when the claim is spent or expires. The amount is a real and is rounded to the nearest .00000001\n"
            + HelpRequiringPassphrase(pwallet) +
            "\nArguments:\n"
            "1. \"name\"  (string, required) The name claimed by the claim to support.\n"
-            "2. \"claimid\"      (string, optional) The claimid or partialid of the claim to support.\n"
-            "3. \"amount\"       (numeric, optional) The amount in LBC to use to support the claim.\n"
+            "2. \"claimid\"  (string, required) The claimid of the claim to support. This can be obtained by TODO PUT IN PLACE THAT SHOWS THIS.\n"
+            "3. \"amount\"  (numeric, required) The amount in LBC to use to support the claim.\n"
            "4. \"value\"  (string, optional) The metadata of the support encoded in hexadecimal.\n"
-            "5. \"isTip\"        (boolean, optional, defaults to false) spendable by owning claim's address when true.\n"
-            "\nResult: [\n"
-                "\"txId\"        (string) The transaction id of the support.\n"
-                "\"address\"     (string) The destination address of the claim.\n"
-            "\n]");
+            "\nResult:\n"
+            "\"transactionid\"  (string) The transaction id of the support.\n");

    auto sName = request.params[0].get_str();
-    std::string sClaimId;
-    if (request.params.size() > 1)
-        sClaimId = request.params[1].get_str();
+    auto sClaimId = request.params[1].get_str();

    const size_t claimLength = 40;

-    if (!IsHexNumber(sClaimId))
+    if (!IsHex(sClaimId))
        throw JSONRPCError(RPC_INVALID_PARAMETER, "claimid must be a 20-character hexadecimal string (not '" + sClaimId + "')");
+    if (sClaimId.length() != claimLength)
+        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("claimid must be of length %d", claimLength));

-    if (sClaimId.length() > claimLength)
-        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("claimid must be maximum of length %d", claimLength));
+    uint160 claimId;
+    claimId.SetHex(sClaimId);
+    std::vector<unsigned char> vchName (sName.begin(), sName.end());
+    std::vector<unsigned char> vchClaimId (claimId.begin(), claimId.end());
+    CAmount nAmount = AmountFromValue(request.params[2]);

    pwallet->BlockUntilSyncedToCurrentChain();
    LOCK2(cs_main, pwallet->cs_wallet);
    EnsureWalletIsUnlocked(pwallet);
-
-    CClaimTrieCache trieCache(pclaimTrie);
-    auto csToName = trieCache.getClaimsForName(sName);
-    if (csToName.claimsNsupports.empty())
-        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Unable to find a claim named %s", sName));
-    auto& claimNsupports = !sClaimId.empty() ? csToName.find(sClaimId) : csToName.claimsNsupports[0];
-    if (claimNsupports.IsNull())
-        throw JSONRPCError(RPC_INVALID_PARAMETER, strprintf("Unable to find a claimid that starts with %s", sClaimId));
-    auto& claimId = claimNsupports.claim.claimId;
-
-    std::vector<unsigned char> vchName (sName.begin(), sName.end());
-    std::vector<unsigned char> vchClaimId (claimId.begin(), claimId.end());
-    CAmount nAmount = AmountFromValue(request.params.size() > 2 ? request.params[2] : "0.00000001");
-
    CScript supportScript = CScript() << OP_SUPPORT_CLAIM << vchName << vchClaimId;
    auto lastOp = OP_DROP;
    if (request.params.size() > 3) {
        auto hex = request.params[3].get_str();
-        if (!hex.empty()) {
        if (!IsHex(hex))
            throw JSONRPCError(RPC_INVALID_PARAMETER, "value/metadata must be of hexadecimal data");
-            if (!trieCache.allowSupportMetadata())
-                throw JSONRPCError(RPC_INVALID_PARAMETER, "value/metadata on supports is not enabled yet");
        supportScript = supportScript << ParseHex(hex);
        lastOp = OP_2DROP;
    }
-    }

    supportScript = supportScript << OP_2DROP << lastOp;

-    auto isTip = false;
-    if (request.params.size() > 4)
-        isTip = request.params[4].get_bool();
-
-    CTxDestination dest;
-    if (isTip) {
-        CTransactionRef ref;
-        uint256 block;
-        if (!GetTransaction(claimNsupports.claim.outPoint.hash, ref, Params().GetConsensus(), block, true))
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Unable to locate the TX with the claim's output.");
-        if (!ExtractDestination(ref->vout[claimNsupports.claim.outPoint.n].scriptPubKey, dest))
-            throw JSONRPCError(RPC_INVALID_PARAMETER, "Unable to extract the destination from the chosen claim.");
-    }
-    else {
    CPubKey newKey;
    if (!pwallet->GetKeyFromPool(newKey))
        throw JSONRPCError(RPC_WALLET_KEYPOOL_RAN_OUT, "Error: Keypool ran out, please call keypoolrefill first");

-        OutputType output_type = pwallet->m_default_address_type;
-        pwallet->LearnRelatedScripts(newKey, output_type);
-        dest = GetDestinationForKey(newKey, output_type);
-    }
-
    CCoinControl cc;
-    cc.m_change_type = pwallet->m_default_change_type;
-    auto tx = SendMoney(pwallet, dest, nAmount, false, cc, {}, {}, supportScript);
-
-    UniValue result(UniValue::VOBJ);
-    result.pushKV("txId", tx->GetHash().GetHex());
-    result.pushKV("address", EncodeDestination(dest));
-    return result;
+    cc.m_change_type = DEFAULT_ADDRESS_TYPE;
+    auto tx = SendMoney(pwallet, CTxDestination(newKey.GetID()), nAmount, false, cc, {}, {}, supportScript);
+    return tx->GetHash().GetHex();
 }

 UniValue abandonsupport(const JSONRPCRequest& request)
@ -1000,7 +952,8 @@ UniValue abandonsupport(const JSONRPCRequest& request)
    uint256 hash;
    hash.SetHex(request.params[0].get_str());

-    CTxDestination address = DecodeDestination(request.params[1].get_str());
+    CKeyID address;
+    address.SetHex(request.params[1].get_str());

    pwallet->BlockUntilSyncedToCurrentChain();
    LOCK2(cs_main, pwallet->cs_wallet);
@ -1018,7 +971,7 @@ UniValue abandonsupport(const JSONRPCRequest& request)
        {
            EnsureWalletIsUnlocked(pwallet);
            CCoinControl cc;
-            cc.m_change_type = pwallet->m_default_change_type;
+            cc.m_change_type = DEFAULT_ADDRESS_TYPE;
            cc.Select(COutPoint(wtx.tx->GetHash(), i));
            wtxNew = SendMoney(pwallet, address, wtx.tx->vout[i].nValue, true, cc, {}, {});
            break;
@ -1914,68 +1867,6 @@ static UniValue addmultisigaddress(const JSONRPCRequest& request)
    return result;
 }

-static UniValue addtimelockedaddress(const JSONRPCRequest& request)
-{
-    std::shared_ptr<CWallet> const wallet = GetWalletForJSONRPCRequest(request);
-    CWallet* const pwallet = wallet.get();
-
-    if (!EnsureWalletIsAvailable(pwallet, request.fHelp)) {
-        return NullUniValue;
-    }
-
-    if (request.fHelp || request.params.size() < 2 || request.params.size() > 4) {
-        std::string msg = "addtimelockedaddress timelock address ( \"label\" \"address_type\" )\n"
-                          "\nAdd an address that can't be redeemed until timelock. Requires a new wallet backup.\n"
-                          "See `importaddress` for watchonly p2sh address support.\n"
-                          "If 'label' is specified, assign address to that label.\n"
-
-                          "\nArguments:\n"
-                          "1. timelock                      (numeric, required) Block height if < 500 million or unix timestamp if greater.\n"
-                          "1. \"address\"                   (string, required) The destination wallet address.\n"
-                          "2. \"label\"                     (string, optional) A label to assign the addresses to.\n"
-                          "3. \"address_type\"              (string, optional) The address type to use. Options are \"legacy\", \"p2sh-segwit\", and \"bech32\". Default is set by -addresstype.\n"
-
-                          "\nResult:\n"
-                          "{\n"
-                          "  \"address\":\"address\",       (string) The value of the new P2SH address.\n"
-                          "  \"redeemScript\":\"script\"    (string) The string value of the hex-encoded redemption script.\n"
-                          "}\n"
-        ;
-        throw std::runtime_error(msg);
-    }
-
-    auto timelock = request.params[0].get_int();
-    std::string label;
-    if (!request.params[2].isNull())
-        label = LabelFromValue(request.params[2]);
-
-    LOCK2(cs_main, pwallet->cs_wallet);
-
-    auto address = request.params[1].get_str();
-    CTxDestination destination = DecodeDestination(address);
-    if (!IsValidDestination(destination)) {
-        throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid LBRY address: ") + address);
-    }
-    auto destinationScript = GetScriptForDestination(destination);
-
-    OutputType output_type = pwallet->m_default_address_type;
-    if (!request.params[3].isNull()) {
-        if (!ParseOutputType(request.params[3].get_str(), output_type)) {
-            throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, strprintf("Unknown address type '%s'", request.params[3].get_str()));
-        }
-    }
-
-    // Construct using pay-to-script-hash:
-    CScript inner = (CScript() << CScriptNum(timelock) << OP_CHECKLOCKTIMEVERIFY << OP_DROP) + destinationScript;
-    CTxDestination dest = AddAndGetDestinationForScript(*pwallet, inner, output_type);
-    pwallet->SetAddressBook(dest, label, "timelock");
-
-    UniValue result(UniValue::VOBJ);
-    result.pushKV("address", EncodeDestination(dest));
-    result.pushKV("redeemScript", HexStr(inner.begin(), inner.end()));
-    return result;
-}
-
 class Witnessifier : public boost::static_visitor<bool>
 {
 public:
@ -3600,9 +3491,6 @@ static UniValue getwalletinfo(const JSONRPCRequest& request)
            "  \"walletname\": xxxxx,               (string) the wallet name\n"
            "  \"walletversion\": xxxxx,            (numeric) the wallet version\n"
            "  \"balance\": xxxxxxx,                (numeric) the total confirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
-            "  \"available_balance\": xxxxxxx,      (numeric) balance minus stakes in " + CURRENCY_UNIT + "\n"
-            "  \"staked_claim_balance\": xxxxxxx,   (numeric) total in claim reservations in " + CURRENCY_UNIT + "\n"
-            "  \"staked_support_balance\": xxxxxxx, (numeric) total in support reservations in " + CURRENCY_UNIT + "\n"
            "  \"unconfirmed_balance\": xxx,        (numeric) the total unconfirmed balance of the wallet in " + CURRENCY_UNIT + "\n"
            "  \"immature_balance\": xxxxxx,        (numeric) the total immature balance of the wallet in " + CURRENCY_UNIT + "\n"
            "  \"txcount\": xxxxxxx,                (numeric) the total number of transactions in the wallet\n"
@ -3631,13 +3519,7 @@ static UniValue getwalletinfo(const JSONRPCRequest& request)
    size_t kpExternalSize = pwallet->KeypoolCountExternalKeys();
    obj.pushKV("walletname", pwallet->GetName());
    obj.pushKV("walletversion", pwallet->GetVersion());
-    auto balance = pwallet->GetBalance();
-    auto claims = pwallet->GetBalance(ISMINE_CLAIM);
-    auto supports = pwallet->GetBalance(ISMINE_SUPPORT);
-    obj.pushKV("balance",       ValueFromAmount(balance));
-    obj.pushKV("available_balance",       ValueFromAmount(balance - claims - supports));
-    obj.pushKV("staked_claim_balance", ValueFromAmount(claims));
-    obj.pushKV("staked_support_balance",  ValueFromAmount(supports));
+    obj.pushKV("balance",       ValueFromAmount(pwallet->GetBalance()));
    obj.pushKV("unconfirmed_balance", ValueFromAmount(pwallet->GetUnconfirmedBalance()));
    obj.pushKV("immature_balance",    ValueFromAmount(pwallet->GetImmatureBalance()));
    obj.pushKV("txcount",       (int)pwallet->mapWallet.size());
@ -4806,8 +4688,6 @@ UniValue getaddressinfo(const JSONRPCRequest& request)
    isminetype mine = IsMine(*pwallet, dest);
    ret.pushKV("ismine", bool(mine & ISMINE_SPENDABLE));
    ret.pushKV("iswatchonly", bool(mine & ISMINE_WATCH_ONLY));
-    ret.pushKV("isclaim", bool(mine & ISMINE_CLAIM));
-    ret.pushKV("issupport", bool(mine & ISMINE_SUPPORT));
    UniValue detail = DescribeWalletAddress(pwallet, dest);
    ret.pushKVs(detail);
    if (pwallet->mapAddressBook.count(dest)) {
@ -5367,7 +5247,6 @@ static const CRPCCommand commands[] =
    { "wallet",             "abandontransaction",               &abandontransaction,            {"txid"} },
    { "wallet",             "abortrescan",                      &abortrescan,                   {} },
    { "wallet",             "addmultisigaddress",               &addmultisigaddress,            {"nrequired","keys","label|account","address_type"} },
-    { "wallet",             "addtimelockedaddress",             &addtimelockedaddress,          {"timelock", "address", "label|account","address_type"} },
    { "hidden",             "addwitnessaddress",                &addwitnessaddress,             {"address","p2sh"} },
    { "wallet",             "backupwallet",                     &backupwallet,                  {"destination"} },
    { "wallet",             "bumpfee",                          &bumpfee,                       {"txid", "options"} },
--- a/src/wallet/test/claim_rpc_tests.cpp
+++ b/src/wallet/test/claim_rpc_tests.cpp
@ -7,8 +7,6 @@
 #include <wallet/wallet.h>

 #include <consensus/validation.h>
-#include <core_io.h>
-#include <key_io.h>
 #include <rpc/server.h>
 #include <test/test_bitcoin.h>
 #include <validation.h>
@ -63,10 +61,6 @@ uint256 ClaimAName(const std::string& name, const std::string& data, const std::
    UniValue results = rpc_method(req);
    auto txid = results.get_str();
    uint256 ret;
-    if (txid.find(' ') != std::string::npos) {
-        fprintf(stderr, "Error creating claim: %s\n", txid.c_str());
-        return ret;
-    }
    ret.SetHex(txid);
    return ret;
 }
@ -82,7 +76,7 @@ uint256 SupportAName(const std::string& name, const std::string& claimId, const
    req.params.push_back(price);

    UniValue results = rpc_method(req);
-    auto txid = results["txId"].get_str();
+    auto txid = results.get_str();
    uint256 ret;
    ret.SetHex(txid);
    return ret;
@ -155,20 +149,11 @@ uint256 AbandonAClaim(const uint256& txid, bool isSupport = false) {
    }
 }

-void ValidateBalance(double claims, double supports) {
-    rpcfn_type rpc_method = tableRPC["getwalletinfo"]->actor;
-    JSONRPCRequest req;
-    req.URI = "/wallet/tester_wallet";
-    req.params = UniValue(UniValue::VARR);
-    UniValue results = rpc_method(req);
-    BOOST_CHECK_EQUAL(claims, results["staked_claim_balance"].get_real());
-    BOOST_CHECK_EQUAL(supports, results["staked_support_balance"].get_real());
-    BOOST_CHECK_EQUAL(claims + supports, results["balance"].get_real() - results["available_balance"].get_real());
-}
+BOOST_AUTO_TEST_CASE(claim_op_runthrough)
+{
+    generateBlock(105);

-void AddClaimSupportThenRemove() {
-    generateBlock(155);
-    BOOST_CHECK_EQUAL(AvailableBalance(), 55.0);
+    BOOST_CHECK_GE(AvailableBalance(), 2.0);

    // ops for test: claimname, updateclaim, abandonclaim, listnameclaims, supportclaim, abandonsupport
    // order of ops:
@ -186,7 +171,7 @@ void AddClaimSupportThenRemove() {
    BOOST_CHECK_EQUAL(looked[0]["value"].get_str(), "deadbeef");
    BOOST_CHECK_EQUAL(looked[0]["txid"].get_str(), txid.GetHex());

-    // update it
+    // udpate it
    auto txid2 = ClaimAName(txid.GetHex(), "deadbeef02", "1.0", true);
    auto g2 = generateBlock();
    looked = LookupAllNames().get_array();
@ -205,8 +190,6 @@ void AddClaimSupportThenRemove() {
    BOOST_CHECK_EQUAL(looked[1]["txid"].get_str(), spid.GetHex());
    BOOST_CHECK_EQUAL(looked[1]["supported_claimid"].get_str(), clid);

-    ValidateBalance(1.0, 0.5);
-
    // abandon support
    auto aid1 = AbandonAClaim(spid, true);
    BOOST_CHECK(!aid1.IsNull());
@ -269,227 +252,4 @@ void AddClaimSupportThenRemove() {
    */
 }

-BOOST_AUTO_TEST_CASE(claim_op_runthrough_legacy)
-{
-    for (auto& wallet: GetWallets())
-        wallet->m_default_address_type = OutputType::LEGACY;
-    AddClaimSupportThenRemove();
-}
-
-BOOST_AUTO_TEST_CASE(claim_op_runthrough_p2sh)
-{
-    for (auto& wallet: GetWallets()) {
-        BOOST_CHECK(DEFAULT_ADDRESS_TYPE == wallet->m_default_address_type); // BOOST_CHECK_EQUAL no compile here
-        wallet->m_default_address_type = OutputType::P2SH_SEGWIT;
-    }
-    AddClaimSupportThenRemove();
-}
-
-BOOST_AUTO_TEST_CASE(claim_op_runthrough_bech32)
-{
-    for (auto& wallet: GetWallets()) {
-        BOOST_CHECK(DEFAULT_ADDRESS_TYPE == wallet->m_default_address_type); // BOOST_CHECK_EQUAL no compile here
-        wallet->m_default_address_type = OutputType::BECH32;
-    }
-    AddClaimSupportThenRemove();
-}
-
-std::vector<COutPoint> SpendableCoins() {
-    rpcfn_type rpc_method = tableRPC["listunspent"]->actor;
-    JSONRPCRequest req;
-    req.URI = "/wallet/tester_wallet";
-    req.params = UniValue(UniValue::VARR);
-    UniValue unspents = rpc_method(req);
-    std::vector<COutPoint> ret;
-    for (uint32_t i = 0; i < unspents.size(); ++i)
-        ret.emplace_back(uint256S(unspents[i]["txid"].get_str()), unspents[i]["vout"].get_int());
-    return ret;
-}
-
-CTxDestination NewAddress(OutputType t) {
-    rpcfn_type rpc_method = tableRPC["getnewaddress"]->actor;
-    JSONRPCRequest req;
-    req.URI = "/wallet/tester_wallet";
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back("");
-    req.params.push_back(FormatOutputType(t));
-    UniValue address = rpc_method(req);
-    return DecodeDestination(address.get_str());
-}
-
-std::string SignRawTransaction(const std::string& tx) {
-    rpcfn_type rpc_method = tableRPC["signrawtransactionwithwallet"]->actor;
-    JSONRPCRequest req;
-    req.URI = "/wallet/tester_wallet";
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(tx);
-    UniValue results = rpc_method(req);
-    BOOST_CHECK(results["complete"].get_bool());
-    BOOST_CHECK(!results.exists("errors"));
-    if (results.exists("errors"))
-        fprintf(stderr, "Errors: %s\n", results.write(2).c_str());
-    return results["hex"].get_str();
-}
-
-std::string SendRawTransaction(const std::string& tx) {
-    rpcfn_type rpc_method = tableRPC["sendrawtransaction"]->actor;
-    JSONRPCRequest req;
-    req.URI = "/wallet/tester_wallet";
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(tx);
-    req.params.push_back(UniValue(true)); // allow high fees
-    UniValue results = rpc_method(req);
-    return results.get_str();
-}
-
-std::string FundRawTransaction(const std::string& tx) {
-    rpcfn_type rpc_method = tableRPC["fundrawtransaction"]->actor;
-    JSONRPCRequest req;
-    req.URI = "/wallet/tester_wallet";
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(tx);
-    UniValue results = rpc_method(req);
-    return results["hex"].get_str();
-}
-
-std::string ProcessPsbt(const PartiallySignedTransaction& pst) {
-    BOOST_CHECK(pst.IsSane());
-    rpcfn_type rpc_method = tableRPC["walletprocesspsbt"]->actor;
-    JSONRPCRequest req;
-    req.URI = "/wallet/tester_wallet";
-    req.params = UniValue(UniValue::VARR);
-
-    CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
-    ssTx << pst;
-    auto base64 = EncodeBase64((unsigned char*)ssTx.data(), ssTx.size());
-    req.params.push_back(base64);
-    UniValue results = rpc_method(req);
-    BOOST_CHECK(results["complete"].get_bool());
-    return results["psbt"].get_str();
-}
-
-std::string FinalizePsbt(const std::string& pst) {
-    rpcfn_type rpc_method = tableRPC["finalizepsbt"]->actor;
-    JSONRPCRequest req;
-    req.URI = "/wallet/tester_wallet";
-    req.params = UniValue(UniValue::VARR);
-    req.params.push_back(pst);
-    req.params.push_back(UniValue(true));
-    UniValue results = rpc_method(req);
-    BOOST_CHECK(results["complete"].get_bool());
-    return results["hex"].get_str();
-}
-
-BOOST_AUTO_TEST_CASE(can_sign_all_addr)
-{
-    generateBlock(110);
-    BOOST_CHECK_EQUAL(AvailableBalance(), 10.0);
-    auto coins = SpendableCoins();
-
-    std::vector<std::string> txids;
-    std::vector<std::string> spends;
-    for (uint32_t i = 0; i < 3; ++i) {
-        CMutableTransaction claimTx, spendTx;
-        CTxIn in(coins[i]);
-        claimTx.vin.push_back(in);
-        auto destination = NewAddress(OutputType(i));
-        CScript scriptPubKey = ClaimNameScript("name" + std::to_string(i), "value", false)
-                + GetScriptForDestination(destination);
-        CTxOut out(100000, scriptPubKey);
-        claimTx.vout.push_back(out);
-        auto hex = EncodeHexTx(claimTx);
-        hex = SignRawTransaction(hex);
-        txids.push_back(SendRawTransaction(hex));
-        CTxIn spendIn(uint256S(txids.back()), 0);
-        auto destination2 = NewAddress(OutputType(i));
-        CTxOut spendOut(90000, GetScriptForDestination(destination2));
-        spendTx.vin.push_back(spendIn);
-        spendTx.vout.push_back(spendOut);
-        hex = EncodeHexTx(spendTx);
-        spends.push_back(hex);
-    }
-    generateBlock(1);
-    auto looked = LookupAllNames().get_array();
-
-    for (std::size_t i = 0; i < 3; ++i) {
-        BOOST_CHECK_EQUAL(looked[i]["name"].get_str(), "name" + std::to_string(i));
-        BOOST_CHECK_EQUAL(looked[i]["value"].get_str(), HexStr(std::string("value")));
-        BOOST_CHECK_EQUAL(looked[i]["txid"].get_str(), txids[i]);
-    }
-    for (auto& s: spends) {
-        auto hex = FundRawTransaction(s); // redundant
-        hex = SignRawTransaction(hex);
-        txids.push_back(SendRawTransaction(hex));
-    }
-    generateBlock(1);
-    looked = LookupAllNames().get_array();
-    BOOST_CHECK_EQUAL(looked.size(), 0U);
-}
-
-BOOST_AUTO_TEST_CASE(can_sign_all_pbst)
-{
-    generateBlock(110);
-    BOOST_CHECK_EQUAL(AvailableBalance(), 10.0);
-    auto coins = SpendableCoins();
-
-    std::vector<std::string> txids;
-    std::vector<PartiallySignedTransaction> spends;
-    for (uint32_t i = 0; i < 3; ++i) {
-        CMutableTransaction claimTx, spendTx;
-        CTxIn in(coins[i]);
-        claimTx.vin.push_back(in);
-        auto destination = NewAddress(OutputType(i));
-        CScript scriptPubKey = ClaimNameScript("name" + std::to_string(i), "value", false)
-                               + GetScriptForDestination(destination);
-        CTxOut out(100000, scriptPubKey);
-        claimTx.vout.push_back(out);
-        PartiallySignedTransaction pst(claimTx);
-        auto result = ProcessPsbt(pst);
-        auto hex = FinalizePsbt(result);
-        txids.push_back(SendRawTransaction(hex));
-        CTxIn spendIn(uint256S(txids.back()), 0);
-        auto destination2 = NewAddress(OutputType(i));
-        CTxOut spendOut(90000, GetScriptForDestination(destination2));
-        spendTx.vin.push_back(spendIn);
-        spendTx.vout.push_back(spendOut);
-        spends.push_back(PartiallySignedTransaction(spendTx));
-    }
-    generateBlock(1);
-    auto looked = LookupAllNames().get_array();
-
-    for (std::size_t i = 0; i < 3; ++i) {
-        BOOST_CHECK_EQUAL(looked[i]["name"].get_str(), "name" + std::to_string(i));
-        BOOST_CHECK_EQUAL(looked[i]["value"].get_str(), HexStr(std::string("value")));
-        BOOST_CHECK_EQUAL(looked[i]["txid"].get_str(), txids[i]);
-    }
-    for (auto& s: spends) {
-        auto result = ProcessPsbt(s);
-        auto hex = FinalizePsbt(result);
-        txids.push_back(SendRawTransaction(hex));
-    }
-    generateBlock(1);
-    looked = LookupAllNames().get_array();
-    BOOST_CHECK_EQUAL(looked.size(), 0U);
-}
-
-BOOST_AUTO_TEST_CASE(can_claim_after_each_fork)
-{
-    generateBlock(140);
-    auto txid = ClaimAName("tester", "deadbeef", "1.0");
-    BOOST_CHECK(!txid.IsNull());
-    generateBlock(100);
-    txid = ClaimAName("tester2", "deadbeef", "1.0");
-    BOOST_CHECK(!txid.IsNull());
-    generateBlock(100);
-    txid = ClaimAName("tester3", "deadbeef", "10.0");
-    BOOST_CHECK(!txid.IsNull());
-    generateBlock(15);
-    txid = ClaimAName("tester4", "deadbeef", "10.0");
-    BOOST_CHECK(!txid.IsNull());
-    generateBlock(1);
-    auto looked = LookupAllNames().get_array();
-    BOOST_CHECK_EQUAL(looked.size(), 4U);
-}
-
 BOOST_AUTO_TEST_SUITE_END()
-
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@ -166,7 +166,7 @@ public:
        txnouttype type;
        std::vector<CTxDestination> vDest;
        int nRequired;
-        if (ExtractDestinations(StripClaimScriptPrefix(script), type, vDest, nRequired)) {
+        if (ExtractDestinations(script, type, vDest, nRequired)) {
            for (const CTxDestination &dest : vDest)
                boost::apply_visitor(*this, dest);
        }
@ -1401,15 +1401,16 @@ bool CWallet::IsChange(const CTxOut& txout) const
    // a better way of identifying which outputs are 'the send' and which are
    // 'the change' will need to be implemented (maybe extend CWalletTx to remember
    // which output, if any, was change).
-    auto isMine = ::IsMine(*this, txout.scriptPubKey);
-    if (isMine && !(isMine & ISMINE_STAKE)) // stakes are never change
+    if (::IsMine(*this, txout.scriptPubKey))
    {
        CTxDestination address;
-        if (!ExtractDestination(txout.scriptPubKey, address))
+        const CScript& scriptPubKey = StripClaimScriptPrefix(txout.scriptPubKey);
+
+        if (!ExtractDestination(scriptPubKey, address))
            return true;

        LOCK(cs_wallet);
-        if (!mapAddressBook.count(address))
+        if (!mapAddressBook.count(address) && (scriptPubKey == txout.scriptPubKey))
            return true;
    }
    return false;
@ -1692,9 +1693,11 @@ void CWalletTx::GetAmounts(std::list<COutputEntry>& listReceived,

        // In either case, we need to get the destination address
        CTxDestination address;
-        if (!ExtractDestination(txout.scriptPubKey, address) && !txout.scriptPubKey.IsUnspendable())
+        const CScript& scriptPubKey = StripClaimScriptPrefix(txout.scriptPubKey);
+
+        if (!ExtractDestination(scriptPubKey, address) && !scriptPubKey.IsUnspendable())
        {
-            pwallet->WalletLogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",
+            LogPrintf("CWalletTx::GetAmounts: Unknown transaction type found, txid %s\n",
                     this->GetHash().ToString());
            address = CNoDestination();
        }
@ -1702,7 +1705,7 @@ void CWalletTx::GetAmounts(std::list<COutputEntry>& listReceived,
        COutputEntry output = {address, txout.nValue, (int)i};

        // If we are debited by the transaction, add the output as a "sent" entry
-        if (nDebit > 0)
+        if (nDebit > 0 || filter & ISMINE_CLAIM || filter & ISMINE_SUPPORT)
            listSent.push_back(output);

        // If we are receiving the output, add it as a "received" entry
@ -2078,7 +2081,7 @@ bool CWalletTx::IsTrusted() const
        if (parent == nullptr)
            return false;
        const CTxOut& parentOut = parent->tx->vout[txin.prevout.n];
-        if (!(pwallet->IsMine(parentOut) & ISMINE_SPENDABLE))
+        if (pwallet->IsMine(parentOut) != ISMINE_SPENDABLE)
            return false;
    }
    return true;
@ -2372,15 +2375,15 @@ void CWallet::AvailableCoins(std::vector<COutput> &vCoins, bool fOnlySafe, const
                continue;
            }

-            bool solvable = IsSolvable(*this, pcoin->tx->vout[i].scriptPubKey);
-            bool spendable = (mine & ISMINE_SPENDABLE) || (((mine & ISMINE_WATCH_ONLY) != ISMINE_NO) && (coinControl && coinControl->fAllowWatchOnly && solvable));
-
            // spending claims or supports requires specific selection:
            auto isClaimCoin = (mine & ISMINE_CLAIM) || (mine & ISMINE_SUPPORT);
            auto claimSpendRequested = isClaimCoin && coinControl && coinControl->IsSelected(COutPoint(entry.first, i));

+            bool solvable = IsSolvable(*this, pcoin->tx->vout[i].scriptPubKey);
+            bool spendable = claimSpendRequested || ((mine & ISMINE_SPENDABLE) != ISMINE_NO) || (((mine & ISMINE_WATCH_ONLY) != ISMINE_NO) && (coinControl && coinControl->fAllowWatchOnly && solvable));
+
            if (spendable && isClaimCoin && !claimSpendRequested)
-                continue;
+                continue; // double check

            vCoins.push_back(COutput(pcoin, i, nDepth, spendable, solvable, safeTx, (coinControl && coinControl->fAllowWatchOnly)));

@ -2434,7 +2437,7 @@ std::map<CTxDestination, std::vector<COutput>> CWallet::ListCoins() const
        if (it != mapWallet.end()) {
            int depth = it->second.GetDepthInMainChain();
            if (depth >= 0 && output.n < it->second.tx->vout.size() &&
-                IsMine(it->second.tx->vout[output.n]) & ISMINE_SPENDABLE) {
+                IsMine(it->second.tx->vout[output.n]) == ISMINE_SPENDABLE) {
                CTxDestination address;
                if (ExtractDestination(FindNonChangeParentOutput(*it->second.tx, output.n).scriptPubKey, address)) {
                    result[address].emplace_back(
@ -2701,8 +2704,7 @@ OutputType CWallet::TransactionChangeType(OutputType change_type, const std::vec
        // Check if any destination contains a witness program:
        int witnessversion = 0;
        std::vector<unsigned char> witnessprogram;
-        const auto stripped = StripClaimScriptPrefix(recipient.scriptPubKey);
-        if (stripped.IsWitnessProgram(witnessversion, witnessprogram)) {
+        if (recipient.scriptPubKey.IsWitnessProgram(witnessversion, witnessprogram)) {
            return OutputType::BECH32;
        }
    }
@ -2985,7 +2987,6 @@ bool CWallet::CreateTransaction(const std::vector<CRecipient>& vecSend, CTransac
                    if (nChangePosInOut == -1 && nSubtractFeeFromAmount == 0 && pick_new_inputs) {
                        unsigned int tx_size_with_change = nBytes + coin_selection_params.change_output_size + 2; // Add 2 as a buffer in case increasing # of outputs changes compact size
                        CAmount fee_needed_with_change = GetMinimumFee(*this, tx_size_with_change, coin_control, ::mempool, ::feeEstimator, nullptr);
-                        fee_needed_with_change = std::max(minClaimTrieFee, fee_needed_with_change);
                        CAmount minimum_value_for_change = GetDustThreshold(change_prototype_txout, discard_rate);
                        if (nFeeRet >= fee_needed_with_change + minimum_value_for_change) {
                            pick_new_inputs = false;
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
Brannon King	558d834f4b	changed so each LDB key was in its own DB	2019-08-19 08:29:56 -06:00
Brannon King	83319b7f31	optimized a little	2019-08-02 17:27:28 -06:00
Brannon King	6b8935718e	first pass at not loading full claimtrie into RAM tweaks	2019-08-01 18:35:58 -06:00
Brannon King	05d89e91cf	fix unit test crash on OSX pulled in some fixes from v18	2019-08-01 15:44:05 -06:00