From efd04b920bbfe9914f869a301ff897b39f48c189 Mon Sep 17 00:00:00 2001
From: Jack Grigg <jack@z.cash>
Date: Sat, 6 Jun 2020 09:46:45 +1200
Subject: [PATCH 01/36] Implement zip-207 and zip-214.

Add funding streams to consensus parameters.

Add funding stream payments to coinbase txns generated by the miner.
* Reduce valueBalance for shielded outputs to funding streams.
* Ensure we produce binding signatures in any case where shielded
  outputs go to either a funding stream or the miner.
---
 qa/pull-tester/rpc-tests.sh              |   1 +
 qa/rpc-tests/coinbase_funding_streams.py | 106 +++++++++++++++++
 qa/rpc-tests/mining_shielded_coinbase.py |   7 +-
 qa/rpc-tests/test_framework/mininode.py  |   3 +
 src/Makefile.am                          |   2 +
 src/chainparams.cpp                      |  40 ++++++-
 src/chainparams.h                        |   5 +
 src/consensus/funding.cpp                |  70 ++++++++++++
 src/consensus/funding.h                  |  37 ++++++
 src/consensus/params.cpp                 | 126 +++++++++++++++++++--
 src/consensus/params.h                   |  99 +++++++++++++++-
 src/gtest/test_foundersreward.cpp        |  40 +++++++
 src/init.cpp                             |  41 +++++++
 src/main.cpp                             |  67 +++++++++--
 src/main.h                               |   7 +-
 src/miner.cpp                            | 138 +++++++++++++++++------
 src/rpc/mining.cpp                       |   1 +
 src/transaction_builder.h                |   6 +-
 18 files changed, 729 insertions(+), 67 deletions(-)
 create mode 100755 qa/rpc-tests/coinbase_funding_streams.py
 create mode 100644 src/consensus/funding.cpp
 create mode 100644 src/consensus/funding.h

diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh
index b6454a304..1a330c819 100755
--- a/qa/pull-tester/rpc-tests.sh
+++ b/qa/pull-tester/rpc-tests.sh
@@ -82,6 +82,7 @@ testScripts=(
     'sprout_sapling_migration.py'
     'turnstile.py'
     'mining_shielded_coinbase.py'
+    'coinbase_funding_streams.py'
     'framework.py'
     'sapling_rewind_check.py'
     'feature_zip221.py'
diff --git a/qa/rpc-tests/coinbase_funding_streams.py b/qa/rpc-tests/coinbase_funding_streams.py
new file mode 100755
index 000000000..b5c3bf7be
--- /dev/null
+++ b/qa/rpc-tests/coinbase_funding_streams.py
@@ -0,0 +1,106 @@
+#!/usr/bin/env python3
+# Copyright (c) 2019 The Zcash developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+from decimal import Decimal
+from test_framework.authproxy import JSONRPCException
+from test_framework.test_framework import BitcoinTestFramework
+from test_framework.mininode import (
+    nuparams,
+    fundingstream,
+)
+from test_framework.util import (
+    assert_equal,
+    assert_raises,
+    bitcoind_processes,
+    connect_nodes,
+    initialize_chain_clean,
+    start_node,
+    wait_and_assert_operationid_status,
+    check_node_log,
+    BLOSSOM_BRANCH_ID,
+    HEARTWOOD_BRANCH_ID,
+    CANOPY_BRANCH_ID,
+)
+
+class CoinbaseFundingStreamsTest (BitcoinTestFramework):
+    def setup_chain(self):
+        print("Initializing test directory "+self.options.tmpdir)
+        initialize_chain_clean(self.options.tmpdir, 4)
+
+    def start_node_with(self, index, extra_args=[]):
+        args = [
+            nuparams(BLOSSOM_BRANCH_ID, 1),
+            nuparams(HEARTWOOD_BRANCH_ID, 2),
+            nuparams(CANOPY_BRANCH_ID, 5),
+            "-nurejectoldversions=false",
+        ]
+        return start_node(index, self.options.tmpdir, args + extra_args)
+
+    def setup_network(self, split=False):
+        self.nodes = []
+        self.nodes.append(self.start_node_with(0))
+        self.nodes.append(self.start_node_with(1))
+        connect_nodes(self.nodes[1], 0)
+        self.is_network_split=False
+        self.sync_all()
+
+    def run_test (self):
+        # Generate a shielded address for node 1 for miner rewards,
+        miner_addr = self.nodes[1].z_getnewaddress('sapling')
+
+        # Generate a shielded address (belonging to node 0) for funding stream
+        # rewards.
+        fs_addr = self.nodes[0].z_getnewaddress('sapling')
+
+        # Generate past heartwood activation we won't need node 1 from this
+        # point onward except to check miner reward balances
+        self.nodes[1].generate(2) 
+        self.sync_all()
+
+        # Restart node 0 with funding streams.
+        self.nodes[0].stop()
+        bitcoind_processes[0].wait()
+        self.nodes[0] = self.start_node_with(0, [
+            "-mineraddress=%s" % miner_addr,
+            "-minetolocalwallet=0",
+            fundingstream(0, 5, 9, [fs_addr, fs_addr, fs_addr]),
+            fundingstream(1, 5, 9, [fs_addr, fs_addr, fs_addr]),
+            fundingstream(2, 5, 9, [fs_addr, fs_addr, fs_addr]),
+        ])
+        connect_nodes(self.nodes[1], 0)
+        self.sync_all()
+
+        print("Generate to just prior to Canopy activation")
+        self.nodes[0].generate(2)
+        self.sync_all()
+
+        # All miner addresses belong to node 1; check balances
+        walletinfo = self.nodes[1].getwalletinfo()
+        assert_equal(walletinfo['immature_balance'], 10)
+        assert_equal(walletinfo['balance'], 0)
+        assert_equal(self.nodes[1].z_getbalance(miner_addr, 0), 10)
+        assert_equal(self.nodes[1].z_getbalance(miner_addr), 10)
+
+        print("Activating Canopy")
+        self.nodes[0].generate(4)
+        self.sync_all()
+
+        # check that miner payments made it to node 1's wallet
+        walletinfo = self.nodes[1].getwalletinfo()
+        assert_equal(walletinfo['immature_balance'], 10)
+        assert_equal(walletinfo['balance'], 0)
+        assert_equal(self.nodes[1].z_getbalance(miner_addr, 0), 30)
+        assert_equal(self.nodes[1].z_getbalance(miner_addr), 30)
+
+        # check that the node 0 private balance has been augmented by the
+        # funding stream payments
+        assert_equal(self.nodes[0].z_getbalance(fs_addr, 0), 5)
+        assert_equal(self.nodes[0].z_getbalance(fs_addr), 5)
+        assert_equal(self.nodes[0].z_gettotalbalance()['private'], '5.00')
+        assert_equal(self.nodes[0].z_gettotalbalance()['total'], '5.00')
+
+if __name__ == '__main__':
+    CoinbaseFundingStreamsTest().main()
+
diff --git a/qa/rpc-tests/mining_shielded_coinbase.py b/qa/rpc-tests/mining_shielded_coinbase.py
index 64b73c772..bef3493be 100755
--- a/qa/rpc-tests/mining_shielded_coinbase.py
+++ b/qa/rpc-tests/mining_shielded_coinbase.py
@@ -6,7 +6,10 @@
 from decimal import Decimal
 from test_framework.authproxy import JSONRPCException
 from test_framework.test_framework import BitcoinTestFramework
+from test_framework.mininode import nuparams
 from test_framework.util import (
+    BLOSSOM_BRANCH_ID,
+    HEARTWOOD_BRANCH_ID,
     assert_equal,
     assert_raises,
     bitcoind_processes,
@@ -25,8 +28,8 @@ class ShieldCoinbaseTest (BitcoinTestFramework):
 
     def start_node_with(self, index, extra_args=[]):
         args = [
-            "-nuparams=2bb40e60:1", # Blossom
-            "-nuparams=f5b9230b:10", # Heartwood
+            nuparams(BLOSSOM_BRANCH_ID, 1),
+            nuparams(HEARTWOOD_BRANCH_ID, 10),
             "-nurejectoldversions=false",
         ]
         return start_node(index, self.options.tmpdir, args + extra_args)
diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py
index 32eceeb79..ca55f6d9b 100755
--- a/qa/rpc-tests/test_framework/mininode.py
+++ b/qa/rpc-tests/test_framework/mininode.py
@@ -80,6 +80,9 @@ def hash256(s):
 def nuparams(branch_id, height):
     return '-nuparams=%x:%d' % (branch_id, height)
 
+def fundingstream(idx, start_height, end_height, addrs):
+    return '-fundingstream=%d:%d:%d:%s' % (idx, start_height, end_height, ",".join(addrs))
+
 def ser_compactsize(n):
     if n < 253:
         return struct.pack("B", n)
diff --git a/src/Makefile.am b/src/Makefile.am
index 3b911af92..a86943e80 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -181,6 +181,7 @@ BITCOIN_CORE_H = \
   compat/sanity.h \
   compressor.h \
   consensus/consensus.h \
+  consensus/funding.h \
   consensus/params.h \
   consensus/upgrades.h \
   consensus/validation.h \
@@ -413,6 +414,7 @@ libbitcoin_common_a_SOURCES = \
   chainparams.cpp \
   coins.cpp \
   compressor.cpp \
+  consensus/funding.cpp \
   consensus/params.cpp \
   consensus/upgrades.cpp \
   core_read.cpp \
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 9ecb1eb52..fdc3cae5c 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -87,7 +87,7 @@ public:
         consensus.fCoinbaseMustBeShielded = true;
         consensus.nSubsidySlowStartInterval = 20000;
         consensus.nPreBlossomSubsidyHalvingInterval = Consensus::PRE_BLOSSOM_HALVING_INTERVAL;
-        consensus.nPostBlossomSubsidyHalvingInterval = Consensus::POST_BLOSSOM_HALVING_INTERVAL;
+        consensus.nPostBlossomSubsidyHalvingInterval = POST_BLOSSOM_HALVING_INTERVAL(Consensus::PRE_BLOSSOM_HALVING_INTERVAL);
         consensus.nMajorityEnforceBlockUpgrade = 750;
         consensus.nMajorityRejectBlockOutdated = 950;
         consensus.nMajorityWindow = 4000;
@@ -125,6 +125,8 @@ public:
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight =
             Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
+        consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("000000000000000000000000000000000000000000000000017e73a331fae01c");
 
@@ -288,7 +290,7 @@ public:
         consensus.fCoinbaseMustBeShielded = true;
         consensus.nSubsidySlowStartInterval = 20000;
         consensus.nPreBlossomSubsidyHalvingInterval = Consensus::PRE_BLOSSOM_HALVING_INTERVAL;
-        consensus.nPostBlossomSubsidyHalvingInterval = Consensus::POST_BLOSSOM_HALVING_INTERVAL;
+        consensus.nPostBlossomSubsidyHalvingInterval = POST_BLOSSOM_HALVING_INTERVAL(Consensus::PRE_BLOSSOM_HALVING_INTERVAL);
         consensus.nMajorityEnforceBlockUpgrade = 51;
         consensus.nMajorityRejectBlockOutdated = 75;
         consensus.nMajorityWindow = 400;
@@ -330,6 +332,24 @@ public:
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight =
             Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
+        consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;
+
+        // TODO: This `if` can be removed once canopy activation height is set.
+        if (consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
+            consensus.AddZIP207FundingStream(
+                Consensus::FS_ZIP214_ECC,
+                consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
+                {/*TODO*/});
+            consensus.AddZIP207FundingStream(
+                Consensus::FS_ZIP214_ZF,
+                consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
+                {/*TODO*/});
+            consensus.AddZIP207FundingStream(
+                Consensus::FS_ZIP214_MG,
+                consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
+                {/*TODO*/});
+        }
+
         // On testnet we activate this rule 6 blocks after Blossom activation. From block 299188 and
         // prior to Blossom activation, the testnet minimum-difficulty threshold was 15 minutes (i.e.
         // a minimum difficulty block can be mined if no block is mined normally within 15 minutes):
@@ -452,7 +472,7 @@ public:
         consensus.fCoinbaseMustBeShielded = false;
         consensus.nSubsidySlowStartInterval = 0;
         consensus.nPreBlossomSubsidyHalvingInterval = Consensus::PRE_BLOSSOM_REGTEST_HALVING_INTERVAL;
-        consensus.nPostBlossomSubsidyHalvingInterval = Consensus::POST_BLOSSOM_REGTEST_HALVING_INTERVAL;
+        consensus.nPostBlossomSubsidyHalvingInterval = POST_BLOSSOM_HALVING_INTERVAL(Consensus::PRE_BLOSSOM_REGTEST_HALVING_INTERVAL);
         consensus.nMajorityEnforceBlockUpgrade = 750;
         consensus.nMajorityRejectBlockOutdated = 950;
         consensus.nMajorityWindow = 1000;
@@ -490,6 +510,9 @@ public:
         consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight =
             Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
 
+        consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;
+        // Defined funding streams can be enabled with node config flags.
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00");
 
@@ -553,6 +576,12 @@ public:
         consensus.vUpgrades[idx].nActivationHeight = nActivationHeight;
     }
 
+    void UpdateFundingStreamParameters(Consensus::FundingStreamIndex idx, Consensus::FundingStream fs)
+    {
+        assert(idx >= Consensus::FIRST_FUNDING_STREAM && idx < Consensus::MAX_FUNDING_STREAMS);
+        consensus.vFundingStreams[idx] = fs;
+    }
+
     void UpdateRegtestPow(int64_t nPowMaxAdjustDown, int64_t nPowMaxAdjustUp, uint256 powLimit)
     {
         consensus.nPowMaxAdjustDown = nPowMaxAdjustDown;
@@ -644,6 +673,11 @@ void UpdateNetworkUpgradeParameters(Consensus::UpgradeIndex idx, int nActivation
     regTestParams.UpdateNetworkUpgradeParameters(idx, nActivationHeight);
 }
 
+void UpdateFundingStreamParameters(Consensus::FundingStreamIndex idx, Consensus::FundingStream fs)
+{
+    regTestParams.UpdateFundingStreamParameters(idx, fs);
+}
+
 void UpdateRegtestPow(int64_t nPowMaxAdjustDown, int64_t nPowMaxAdjustUp, uint256 powLimit) {
     regTestParams.UpdateRegtestPow(nPowMaxAdjustDown, nPowMaxAdjustUp, powLimit);
 }
diff --git a/src/chainparams.h b/src/chainparams.h
index 7bb38a6ae..11dbacd96 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -158,4 +158,9 @@ void UpdateNetworkUpgradeParameters(Consensus::UpgradeIndex idx, int nActivation
 
 void UpdateRegtestPow(int64_t nPowMaxAdjustDown, int64_t nPowMaxAdjustUp, uint256 powLimit);
 
+/**
+ * Allows modifying the regtest funding stream parameters.
+ */
+void UpdateFundingStreamParameters(Consensus::FundingStreamIndex idx, Consensus::FundingStream fs);
+
 #endif // BITCOIN_CHAINPARAMS_H
diff --git a/src/consensus/funding.cpp b/src/consensus/funding.cpp
new file mode 100644
index 000000000..f0a9283ee
--- /dev/null
+++ b/src/consensus/funding.cpp
@@ -0,0 +1,70 @@
+// Copyright (c) 2020 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#include <consensus/funding.h>
+
+namespace Consensus
+{
+/**
+ * General information about each funding stream.
+ * Ordered by Consensus::FundingStreamIndex.
+ */
+const struct FSInfo FundingStreamInfo[Consensus::MAX_FUNDING_STREAMS] = {
+    {
+        /*.recipient =*/ "Electric Coin Company",
+        /*.specification =*/ "https://zips.z.cash/zip-0214",
+        /*.valueNumerator =*/ 7,
+        /*.valueDenominator =*/ 100,
+    },
+    {
+        /*.recipient =*/ "Zcash Foundation",
+        /*.specification =*/ "https://zips.z.cash/zip-0214",
+        /*.valueNumerator =*/ 5,
+        /*.valueDenominator =*/ 100,
+    },
+    {
+        /*.recipient =*/ "Major Grants",
+        /*.specification =*/ "https://zips.z.cash/zip-0214",
+        /*.valueNumerator =*/ 8,
+        /*.valueDenominator =*/ 100,
+    }
+};
+
+CAmount FSInfo::Value(CAmount blockSubsidy) const
+{
+    // Integer division is floor division for nonnegative integers in C++
+    return CAmount((blockSubsidy * valueNumerator) / valueDenominator);
+}
+
+std::set<FundingStreamShare> GetActiveFundingStreamShares(
+    int nHeight,
+    CAmount blockSubsidy,
+    const Consensus::Params& params)
+{
+    std::set<std::pair<FundingStreamAddress, CAmount>> requiredShares;
+    for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+        auto fs = params.vFundingStreams[idx];
+        // Funding period is [startHeight, endHeight)
+        if (fs && nHeight >= fs.get().GetStartHeight() && nHeight < fs.get().GetEndHeight()) {
+            requiredShares.insert(std::make_pair(
+                fs.get().RecipientAddress(params, nHeight),
+                FundingStreamInfo[idx].Value(blockSubsidy)));
+        }
+    }
+    return requiredShares;
+};
+
+int GetMaxFundingStreamHeight(const Consensus::Params& params) {
+    int result = 0;
+    for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+        auto fs = params.vFundingStreams[idx];
+        if (fs && result < fs.get().GetEndHeight()) {
+            result = fs.get().GetEndHeight();
+        }
+    }
+
+    return result;
+}
+
+} // namespace Consensus
diff --git a/src/consensus/funding.h b/src/consensus/funding.h
new file mode 100644
index 000000000..f789e2ec4
--- /dev/null
+++ b/src/consensus/funding.h
@@ -0,0 +1,37 @@
+// Copyright (c) 2020 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_CONSENSUS_FUNDING_H
+#define ZCASH_CONSENSUS_FUNDING_H
+
+#include <amount.h>
+#include <consensus/params.h>
+
+#include <boost/variant.hpp>
+
+namespace Consensus
+{
+
+struct FSInfo {
+    std::string recipient;
+    std::string specification;
+    uint64_t valueNumerator;
+    uint64_t valueDenominator;
+
+    CAmount Value(CAmount blockSubsidy) const;
+};
+
+extern const struct FSInfo FundingStreamInfo[];
+
+typedef std::pair<FundingStreamAddress, CAmount> FundingStreamShare;
+
+std::set<FundingStreamShare> GetActiveFundingStreamShares(
+    int nHeight,
+    CAmount blockSubsidy,
+    const Consensus::Params& params);
+
+int GetMaxFundingStreamHeight(const Consensus::Params& params);
+} // namespace Consensus
+
+#endif // ZCASH_CONSENSUS_FUNDING_H
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 076866add..7cce1e251 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -4,6 +4,9 @@
 
 #include "params.h"
 
+#include <amount.h>
+#include <key_io.h>
+#include <script/standard.h>
 #include "upgrades.h"
 
 namespace Consensus {
@@ -21,6 +24,7 @@ namespace Consensus {
         // floor((height - SlowStartShift) / PreBlossomHalvingInterval), if not IsBlossomActivated(height)
         // floor((BlossomActivationHeight - SlowStartShift) / PreBlossomHalvingInterval + (height - BlossomActivationHeight) / PostBlossomHalvingInterval), otherwise
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
+
             int64_t blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
             // Ideally we would say:
             // halvings = (blossomActivationHeight - consensusParams.SubsidySlowStartShift()) / consensusParams.nPreBlossomSubsidyHalvingInterval 
@@ -36,32 +40,138 @@ namespace Consensus {
         }
     }
 
-     int Params::GetLastFoundersRewardBlockHeight(int nHeight) const {
+    int Params::HalvingHeight(int nHeight, int halvingIndex) const {
         // zip208
         // FoundersRewardLastBlockHeight := max({ height ⦂ N | Halving(height) < 1 })
+        //
         // Halving(h) is defined as floor(f(h)) where f is a strictly increasing rational
         // function, so it's sufficient to solve for f(height) = 1 in the rationals and
         // then take ceiling(height - 1).
-        // H := blossom activation height; SS := SubsidySlowStartShift(); R := BLOSSOM_POW_TARGET_SPACING_RATIO
+        //
+        // H := blossom activation height; 
+        // SS := SubsidySlowStartShift(); 
+        // R := 1 / (postInterval / preInterval) = BLOSSOM_POW_TARGET_SPACING_RATIO
+        // (The following calculation depends on BLOSSOM_POW_TARGET_SPACING_RATIO being an integer.) 
+        //
         // preBlossom:
         // 1 = (height - SS) / preInterval
         // height = preInterval + SS
+        //
         // postBlossom:
         // 1 = (H - SS) / preInterval + (height - H) / postInterval
         // height = H + postInterval - (H - SS) * (postInterval / preInterval)
         // height = H + postInterval - (H - SS) * R
+        //
         // Note: This depends on R being an integer
-        bool blossomActive = NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM);
-        if (blossomActive) {
+        if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
             int blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
-            // The following calculation depends on BLOSSOM_POW_TARGET_SPACING_RATIO being an integer. 
-            return blossomActivationHeight + nPostBlossomSubsidyHalvingInterval
-                - (blossomActivationHeight - SubsidySlowStartShift()) * BLOSSOM_POW_TARGET_SPACING_RATIO - 1;
+            return blossomActivationHeight 
+                - ((blossomActivationHeight - SubsidySlowStartShift()) * BLOSSOM_POW_TARGET_SPACING_RATIO)
+                + (nPostBlossomSubsidyHalvingInterval * (halvingIndex - Halving(blossomActivationHeight)));
         } else {
-            return nPreBlossomSubsidyHalvingInterval + SubsidySlowStartShift() - 1;
+            return (halvingIndex * nPreBlossomSubsidyHalvingInterval) + SubsidySlowStartShift();
         }
     }
 
+    int Params::GetLastFoundersRewardBlockHeight(int nHeight) const {
+        return HalvingHeight(nHeight, 1) - 1;
+    }
+
+    int Params::FundingPeriodIndex(int fundingStreamStartHeight, int nHeight) const {
+        int firstHalvingHeight = HalvingHeight(fundingStreamStartHeight, 1);
+
+        // If the start height of the funding period is not aligned to a multiple of the 
+        // funding period length, the first funding period will be shorter than the
+        // funding period length. 
+        auto startPeriodOffset = (fundingStreamStartHeight - firstHalvingHeight) % nFundingPeriodLength;
+        if (startPeriodOffset < 0) startPeriodOffset += nFundingPeriodLength; // C++ '%' is remainder, not modulus!
+
+        return (nHeight - fundingStreamStartHeight + startPeriodOffset) / nFundingPeriodLength;
+    }
+
+    boost::variant<FundingStream, FundingStreamError> FundingStream::ValidateFundingStream(
+        const Consensus::Params& params,
+        int startHeight,
+        int endHeight,
+        std::vector<FundingStreamAddress> addresses
+    ) {
+        if (!params.NetworkUpgradeActive(startHeight, Consensus::UPGRADE_CANOPY)) {
+            return FundingStreamError::CANOPY_NOT_ACTIVE;
+        }
+
+        if (endHeight < startHeight) {
+            return FundingStreamError::ILLEGAL_RANGE;
+        }
+
+        if (params.FundingPeriodIndex(startHeight, endHeight) >= addresses.size()) {
+            return FundingStreamError::INSUFFICIENT_ADDRESSES;
+        }
+
+        return FundingStream(startHeight, endHeight, addresses);
+    };
+
+    class GetFundingStreamOrThrow: public boost::static_visitor<FundingStream> {
+    public:
+        FundingStream operator()(const FundingStream& fs) const {
+            return fs;
+        }
+
+        FundingStream operator()(const FundingStreamError& e) const {
+            switch (e) {
+                case FundingStreamError::CANOPY_NOT_ACTIVE:
+                    throw std::runtime_error("Canopy network upgrade not active at funding stream start height.");
+                case FundingStreamError::ILLEGAL_RANGE:
+                    throw std::runtime_error("Illegal start/end height combination for funding stream.");
+                case FundingStreamError::INSUFFICIENT_ADDRESSES:
+                    throw std::runtime_error("Insufficient payment addresses to fully exhaust funding stream.");
+                default:
+                    throw std::runtime_error("Unrecognized error validating funding stream.");
+            };
+        }
+    };
+
+    FundingStream FundingStream::ParseFundingStream(
+        const Consensus::Params& params,
+        int startHeight,
+        int endHeight,
+        const std::vector<std::string> strAddresses)
+    {
+        // Parse the address strings into concrete types.
+        std::vector<FundingStreamAddress> addresses;
+        for (auto addr : strAddresses) {
+            auto taddr = DecodeDestination(addr);
+            if (IsValidDestination(taddr)) {
+                addresses.push_back(GetScriptForDestination(taddr));
+            } else {
+                auto zaddr = DecodePaymentAddress(addr);
+                // If the string is not a valid transparent or Sapling address, we will
+                // throw here. 
+                
+                addresses.push_back(boost::get<libzcash::SaplingPaymentAddress>(zaddr));
+            }
+        }
+
+        auto validationResult = FundingStream::ValidateFundingStream(params, startHeight, endHeight, addresses);
+        return boost::apply_visitor(GetFundingStreamOrThrow(), validationResult);
+    };
+
+    void Params::AddZIP207FundingStream(
+        FundingStreamIndex idx,
+        int startHeight,
+        int endHeight,
+        const std::vector<std::string> strAddresses)
+    {
+        vFundingStreams[idx] = FundingStream::ParseFundingStream(*this, startHeight, endHeight, strAddresses);
+    };
+
+    FundingStreamAddress FundingStream::RecipientAddress(const Consensus::Params& params, int nHeight) const 
+    {
+        auto addressIndex = params.FundingPeriodIndex(startHeight, nHeight);
+
+        assert(addressIndex >= 0 && addressIndex < addresses.size());
+        return addresses[addressIndex];
+    };
+
     int64_t Params::PoWTargetSpacing(int nHeight) const {
         // zip208
         // PoWTargetSpacing(height) :=
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 0a03a1e1d..1f43442d4 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -6,12 +6,17 @@
 #ifndef BITCOIN_CONSENSUS_PARAMS_H
 #define BITCOIN_CONSENSUS_PARAMS_H
 
+#include <script/script.h>
 #include "uint256.h"
+#include <zcash/address/sapling.hpp>
 
 #include <boost/optional.hpp>
 
 namespace Consensus {
 
+// Early declaration to ensure it is accessible.
+struct Params;
+
 /**
  * Index into Params.vUpgrades and NetworkUpgradeInfo
  *
@@ -75,16 +80,76 @@ struct NetworkUpgrade {
     boost::optional<uint256> hashActivationBlock;
 };
 
+typedef boost::variant<libzcash::SaplingPaymentAddress, CScript> FundingStreamAddress;
+
+/**
+ * Index into Params.vFundingStreams.
+ *
+ * Being array indices, these MUST be numbered consecutively.
+ */
+enum FundingStreamIndex : uint32_t {
+    FS_ZIP214_ECC,
+    FS_ZIP214_ZF,
+    FS_ZIP214_MG,
+    MAX_FUNDING_STREAMS,
+};
+const auto FIRST_FUNDING_STREAM = FS_ZIP214_ECC;
+
+enum FundingStreamError {
+    CANOPY_NOT_ACTIVE,
+    ILLEGAL_RANGE,
+    INSUFFICIENT_ADDRESSES,
+};
+
+class FundingStream
+{
+private:
+    int startHeight;
+    int endHeight;
+    std::vector<FundingStreamAddress> addresses;
+
+    FundingStream(int startHeight, int endHeight, std::vector<FundingStreamAddress> addresses):
+        startHeight(startHeight), endHeight(endHeight), addresses(addresses) { }
+public:
+    FundingStream(const FundingStream& fs):
+        startHeight(fs.startHeight), endHeight(fs.endHeight), addresses(fs.addresses) { }
+
+    static boost::variant<FundingStream, FundingStreamError> ValidateFundingStream(
+        const Consensus::Params& params,
+        int startHeight,
+        int endHeight,
+        std::vector<FundingStreamAddress> addresses
+    );
+
+    static FundingStream ParseFundingStream(
+        const Consensus::Params& params,
+        int startHeight,
+        int endHeight,
+        const std::vector<std::string> strAddresses);
+
+    int GetStartHeight() const { return startHeight; };
+    int GetEndHeight() const { return endHeight; };
+    const std::vector<FundingStreamAddress>& GetAddresses() const {
+        return addresses;
+    };
+
+    FundingStreamAddress RecipientAddress(const Params& params, int nHeight) const;
+};
+
 /** ZIP208 block target interval in seconds. */
 static const unsigned int PRE_BLOSSOM_POW_TARGET_SPACING = 150;
 static const unsigned int POST_BLOSSOM_POW_TARGET_SPACING = 75;
-static_assert(POST_BLOSSOM_POW_TARGET_SPACING < PRE_BLOSSOM_POW_TARGET_SPACING, "Blossom target spacing must be less than pre-Blossom target spacing.");
-static const unsigned int PRE_BLOSSOM_HALVING_INTERVAL = 840000;
-static const unsigned int PRE_BLOSSOM_REGTEST_HALVING_INTERVAL = 150;
+static_assert(PRE_BLOSSOM_POW_TARGET_SPACING > POST_BLOSSOM_POW_TARGET_SPACING, "Blossom target spacing must be less than pre-Blossom target spacing.");
+static_assert(PRE_BLOSSOM_POW_TARGET_SPACING % POST_BLOSSOM_POW_TARGET_SPACING == 0, "Blossom target spacing must exactly divide pre-blossom target spacing.");
+
 static const int BLOSSOM_POW_TARGET_SPACING_RATIO = PRE_BLOSSOM_POW_TARGET_SPACING / POST_BLOSSOM_POW_TARGET_SPACING;
 static_assert(BLOSSOM_POW_TARGET_SPACING_RATIO * POST_BLOSSOM_POW_TARGET_SPACING == PRE_BLOSSOM_POW_TARGET_SPACING, "Invalid BLOSSOM_POW_TARGET_SPACING_RATIO");
-static const unsigned int POST_BLOSSOM_HALVING_INTERVAL = PRE_BLOSSOM_HALVING_INTERVAL * BLOSSOM_POW_TARGET_SPACING_RATIO;
-static const unsigned int POST_BLOSSOM_REGTEST_HALVING_INTERVAL = PRE_BLOSSOM_REGTEST_HALVING_INTERVAL * BLOSSOM_POW_TARGET_SPACING_RATIO;
+
+static const unsigned int PRE_BLOSSOM_HALVING_INTERVAL = 840000;
+static const unsigned int PRE_BLOSSOM_REGTEST_HALVING_INTERVAL = 144;
+
+#define POST_BLOSSOM_HALVING_INTERVAL(preBlossomInterval) \
+    (preBlossomInterval * Consensus::BLOSSOM_POW_TARGET_SPACING_RATIO)
 
 /**
  * Parameters that influence chain consensus.
@@ -120,16 +185,39 @@ struct Params {
     int nPreBlossomSubsidyHalvingInterval;
     int nPostBlossomSubsidyHalvingInterval;
 
+    /**
+     * Identify the halving index at the specified height. The result will be
+     * negative during the slow-start period.
+     */
     int Halving(int nHeight) const;
 
+    /**
+     * Get the block height of the specified halving.
+     */
+    int HalvingHeight(int nHeight, int halvingIndex) const;
+
     int GetLastFoundersRewardBlockHeight(int nHeight) const;
 
+    int FundingPeriodIndex(int fundingStreamStartHeight, int nHeight) const;
+
+    bool FundingStreamsActive(int nHeight) const {
+        return nHeight > GetLastFoundersRewardBlockHeight(nHeight);
+    }
+
     /** Used to check majorities for block version upgrade */
     int nMajorityEnforceBlockUpgrade;
     int nMajorityRejectBlockOutdated;
     int nMajorityWindow;
     NetworkUpgrade vUpgrades[MAX_NETWORK_UPGRADES];
 
+    int nFundingPeriodLength;
+    boost::optional<FundingStream> vFundingStreams[MAX_FUNDING_STREAMS];
+    void AddZIP207FundingStream(
+        FundingStreamIndex idx,
+        int startHeight,
+        int endHeight,
+        const std::vector<std::string> addresses);
+
     /**
      * Default block height at which the future timestamp soft fork rule activates.
      *
@@ -188,6 +276,7 @@ struct Params {
 
     uint256 nMinimumChainWork;
 };
+
 } // namespace Consensus
 
 #endif // BITCOIN_CONSENSUS_PARAMS_H
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index fcdd976d2..309b380ea 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -3,6 +3,8 @@
 #include "main.h"
 #include "utilmoneystr.h"
 #include "chainparams.h"
+#include "consensus/funding.h"
+#include "key_io.h"
 #include "utilstrencodings.h"
 #include "zcash/Address.hpp"
 #include "wallet/wallet.h"
@@ -216,3 +218,41 @@ TEST(FoundersRewardTest, PerAddressRewardTestnet) {
     SelectParams(CBaseChainParams::TESTNET);
     verifyNumberOfRewards();
 }
+
+// Verify that post-canopy, block rewards are split according to Zip207
+TEST(FundingStreamsRewardTest, Zip207Distribution) {
+    auto consensus = RegtestActivateCanopy(false, 200);
+
+    int minHeight = GetLastFoundersRewardHeight(consensus) + 1;
+
+    auto sk = libzcash::SaplingSpendingKey(uint256());
+    for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+        // we can just use the same addresses for all streams, all we're trying to do here
+        // is validate that the streams add up to the 20% of block reward.
+        UpdateFundingStreamParameters(
+            (Consensus::FundingStreamIndex) idx,
+            Consensus::FundingStream::ParseFundingStream(
+                consensus,
+                minHeight, 
+                minHeight + 100, 
+                {
+                    "t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi",
+                    EncodePaymentAddress(sk.default_address())
+                }
+            )
+        );
+    }
+
+    int maxHeight = GetMaxFundingStreamHeight(consensus);
+    std::map<std::string, CAmount> ms;
+    for (int nHeight = minHeight; nHeight <= maxHeight; nHeight++) {
+        auto blockSubsidy = GetBlockSubsidy(nHeight, consensus);
+        auto shares = GetActiveFundingStreamShares(nHeight, blockSubsidy, consensus);
+
+        CAmount totalFunding = 0;
+        BOOST_FOREACH(Consensus::FundingStreamShare share, shares) {
+            totalFunding += share.second;
+        }
+        EXPECT_EQ(totalFunding, blockSubsidy / 5);
+    }
+}
diff --git a/src/init.cpp b/src/init.cpp
index 1671dba90..3b675b67a 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -439,6 +439,9 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-stopafterblockimport", strprintf("Stop running after importing blocks from disk (default: %u)", DEFAULT_STOPAFTERBLOCKIMPORT));
         strUsage += HelpMessageOpt("-nuparams=hexBranchId:activationHeight", "Use given activation height for specified network upgrade (regtest-only)");
         strUsage += HelpMessageOpt("-nurejectoldversions", strprintf("Reject peers that don't know about the current epoch (regtest-only) (default: %u)", DEFAULT_NU_REJECT_OLD_VERSIONS));
+        strUsage += HelpMessageOpt(
+                "-fundingstream=streamId:startHeight:endHeight:comma_delimited_addresses", 
+                "Use given addresses for block subsidy shared paid to the funding stream with id <streamId>");
     }
     string debugCategories = "addrman, alert, bench, coindb, db, estimatefee, http, libevent, lock, mempool, net, partitioncheck, pow, proxy, prune, "
                              "rand, reindex, rpc, selectcoins, tor, zmq, zrpc, zrpcunsafe (implies zrpc)"; // Don't translate these
@@ -1092,6 +1095,44 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         }
     }
 
+    if (!mapMultiArgs["-fundingstream"].empty()) {
+        // Allow overriding network upgrade parameters for testing
+        if (Params().NetworkIDString() != "regtest") {
+            return InitError("Funding stream parameters may only be overridden on regtest.");
+        }
+        const vector<string>& streams = mapMultiArgs["-fundingstream"];
+        for (auto i : streams) {
+            std::vector<std::string> vStreamParams;
+            boost::split(vStreamParams, i, boost::is_any_of(":"));
+            if (vStreamParams.size() != 4) {
+                return InitError("Funding stream parameters malformed, expecting streamId:startHeight:endHeight:comma_delimited_addresses");
+            }
+            int nFundingStreamId;
+            if (!ParseInt32(vStreamParams[0], &nFundingStreamId) || 
+                    nFundingStreamId < Consensus::FIRST_FUNDING_STREAM || 
+                    nFundingStreamId >= Consensus::MAX_FUNDING_STREAMS) {
+                return InitError(strprintf("Invalid streamId (%s)", vStreamParams[0]));
+            }
+
+            int nStartHeight;
+            if (!ParseInt32(vStreamParams[1], &nStartHeight)) {
+                return InitError(strprintf("Invalid funding stream start height (%s)", vStreamParams[1]));
+            }
+
+            int nEndHeight;
+            if (!ParseInt32(vStreamParams[2], &nEndHeight)) {
+                return InitError(strprintf("Invalid funding stream end height (%s)", vStreamParams[2]));
+            }
+
+            std::vector<std::string> vStreamAddrs;
+            boost::split(vStreamAddrs, vStreamParams[3], boost::is_any_of(","));
+
+            auto fs = Consensus::FundingStream::ParseFundingStream(Params().GetConsensus(), nStartHeight, nEndHeight, vStreamAddrs);
+
+            UpdateFundingStreamParameters((Consensus::FundingStreamIndex) nFundingStreamId, fs);
+        }
+    }
+
     // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
 
     // Initialize libsodium
diff --git a/src/main.cpp b/src/main.cpp
index d11ca5bae..73da80d77 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -15,11 +15,13 @@
 #include "checkpoints.h"
 #include "checkqueue.h"
 #include "consensus/consensus.h"
+#include "consensus/funding.h"
 #include "consensus/upgrades.h"
 #include "consensus/validation.h"
 #include "deprecation.h"
 #include "experimental_features.h"
 #include "init.h"
+#include "key_io.h"
 #include "merkleblock.h"
 #include "metrics.h"
 #include "net.h"
@@ -792,6 +794,7 @@ bool ContextualCheckTransaction(
     bool saplingActive = chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_SAPLING);
     bool isSprout = !overwinterActive;
     bool heartwoodActive = chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_HEARTWOOD);
+    bool canopyActive = chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY);
 
     // If Sprout rules apply, reject transactions which are intended for Overwinter and beyond
     if (isSprout && tx.fOverwintered) {
@@ -900,6 +903,15 @@ bool ContextualCheckTransaction(
         }
     }
 
+    // From Canopy onward, coinbase transaction must include outputs corresponding to the
+    // ZIP 207 consensus funding streams active at the current block height. To avoid
+    // double-decrypting, we detect any shielded funding streams during the Heartwood
+    // consensus check. If Canopy is not yet active, requiredStream will be empty.
+    auto requiredShares = Consensus::GetActiveFundingStreamShares(
+        nHeight,
+        GetBlockSubsidy(nHeight, chainparams.GetConsensus()),
+        chainparams.GetConsensus());
+
     // Rules that apply to Heartwood or later:
     if (heartwoodActive) {
         if (tx.IsCoinBase()) {
@@ -919,19 +931,54 @@ bool ContextualCheckTransaction(
                 }
 
                 // SaplingNotePlaintext::decrypt() checks note commitment validity.
-                if (!SaplingNotePlaintext::decrypt(
+                auto notePlaintext = SaplingNotePlaintext::decrypt(
                     output.encCiphertext,
                     output.ephemeralKey,
                     outPlaintext->esk,
                     outPlaintext->pk_d,
-                    output.cmu)
-                ) {
+                    output.cmu);
+
+                if (!notePlaintext) {
                     return state.DoS(
                         DOS_LEVEL_BLOCK,
                         error("CheckTransaction(): coinbase output description has invalid encCiphertext"),
                         REJECT_INVALID,
                         "bad-cb-output-desc-invalid-encct");
                 }
+
+                // Detect any ZIP 207 shielded funding streams.
+                if (canopyActive) {
+                    libzcash::SaplingPaymentAddress zaddr(notePlaintext->d, outPlaintext->pk_d);
+                    for (auto it = requiredShares.begin(); it != requiredShares.end(); ++it) {
+                        const libzcash::SaplingPaymentAddress* streamAddr = boost::get<libzcash::SaplingPaymentAddress>(&(it->first));
+                        if (streamAddr && zaddr == *streamAddr && notePlaintext->value() == it->second) {
+                            requiredShares.erase(it);
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    // Rules that apply to Canopy or later:
+    if (canopyActive) {
+        if (tx.IsCoinBase()) {
+            // Detect transparent funding streams.
+            for (const CTxOut& output : tx.vout) {
+                for (auto it = requiredShares.begin(); it != requiredShares.end(); ++it) {
+                    const CScript* taddr = boost::get<CScript>(&(it->first));
+                    if (taddr && output.scriptPubKey == *taddr && output.nValue == it->second) {
+                        requiredShares.erase(it);
+                        break;
+                    }
+                }
+            }
+
+            if (!requiredShares.empty()) {
+                std::cout << "\nFunding stream missing at height " << nHeight;
+                return state.DoS(100, error("%s: funding stream missing", __func__),
+                                 REJECT_INVALID, "cb-funding-stream-missing");
             }
         }
     }
@@ -4101,12 +4148,14 @@ bool ContextualCheckBlock(
         }
     }
 
-    // Coinbase transaction must include an output sending 20% of
-    // the block subsidy to a Founders' Reward script, until the last Founders'
-    // Reward block is reached, with exception of the genesis block.
-    // The last Founders' Reward block is defined as the block just before the
-    // first subsidy halving block, which occurs at halving_interval + slow_start_shift.
-    if ((nHeight > 0) && (nHeight <= consensusParams.GetLastFoundersRewardBlockHeight(nHeight))) {
+    if (consensusParams.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
+        // Funding streams are checked inside ContextualCheckTransaction.
+    } else if ((nHeight > 0) && (nHeight <= consensusParams.GetLastFoundersRewardBlockHeight(nHeight))) {
+        // Coinbase transaction must include an output sending 20% of
+        // the block subsidy to a Founders' Reward script, until the last Founders'
+        // Reward block is reached, with exception of the genesis block.
+        // The last Founders' Reward block is defined as the block just before the
+        // first subsidy halving block, which occurs at halving_interval + slow_start_shift.
         bool found = false;
 
         BOOST_FOREACH(const CTxOut& output, block.vtx[0].vout) {
diff --git a/src/main.h b/src/main.h
index 193d06c56..8b61249f2 100644
--- a/src/main.h
+++ b/src/main.h
@@ -465,7 +465,12 @@ bool ContextualCheckBlock(const CBlock& block, CValidationState& state,
 bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pindex, CCoinsViewCache& coins,
                   const CChainParams& chainparams, bool fJustCheck = false);
 
-/** Check a block is completely valid from start to finish (only works on top of our current best block, with cs_main held) */
+/** 
+ * Check a block is completely valid from start to finish (only works on top
+ * of our current best block, with cs_main held) 
+ *
+ * Returns an error if block validation fails, boost::none otherwise.
+ */
 bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
 
 
diff --git a/src/miner.cpp b/src/miner.cpp
index 89f52175a..194551a44 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -11,6 +11,7 @@
 #include "amount.h"
 #include "chainparams.h"
 #include "consensus/consensus.h"
+#include "consensus/funding.h"
 #include "consensus/upgrades.h"
 #include "consensus/validation.h"
 #ifdef ENABLE_MINING
@@ -119,6 +120,37 @@ bool IsValidMinerAddress(const MinerAddress& minerAddr) {
     return minerAddr.which() != 0;
 }
 
+class AddFundingStreamShareToTx : public boost::static_visitor<bool>
+{
+private:
+    CMutableTransaction &mtx;
+    void* ctx; 
+    const CAmount fundingStreamValue;
+public:
+    AddFundingStreamShareToTx(CMutableTransaction &mtx, void* ctx, const CAmount fundingStreamValue): mtx(mtx), ctx(ctx), fundingStreamValue(fundingStreamValue) {}
+
+    bool operator()(const libzcash::SaplingPaymentAddress& pa) const {
+        uint256 ovk;
+        auto note = libzcash::SaplingNote(pa, fundingStreamValue);
+        auto output = OutputDescriptionInfo(ovk, note, NO_MEMO);
+
+        auto odesc = output.Build(ctx);
+        if (odesc) {
+            mtx.vShieldedOutput.push_back(odesc.get());
+            mtx.valueBalance -= fundingStreamValue;
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    bool operator()(const CScript& scriptPubKey) const {
+        mtx.vout.push_back(CTxOut(fundingStreamValue, scriptPubKey));
+        return true;
+    }
+};
+
+
 class AddOutputsToCoinbaseTxAndSign : public boost::static_visitor<>
 {
 private:
@@ -134,41 +166,40 @@ public:
         const int nHeight,
         const CAmount nFees) : mtx(mtx), chainparams(chainparams), nHeight(nHeight), nFees(nFees) {}
 
-    CAmount SetFoundersRewardAndGetMinerValue() const {
-        auto value = GetBlockSubsidy(nHeight, chainparams.GetConsensus());
+    CAmount SetFoundersRewardAndGetMinerValue(void* ctx) const {
+        auto miner_reward = GetBlockSubsidy(nHeight, chainparams.GetConsensus());
 
-        if ((nHeight > 0) && (nHeight <= chainparams.GetConsensus().GetLastFoundersRewardBlockHeight(nHeight))) {
-            // Founders reward is 20% of the block subsidy
-            auto vFoundersReward = value / 5;
-            // Take some reward away from us
-            value -= vFoundersReward;
-            // And give it to the founders
-            mtx.vout.push_back(CTxOut(vFoundersReward, chainparams.GetFoundersRewardScriptAtHeight(nHeight)));
+        if (nHeight > 0) {
+            if (chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
+                auto requiredShares = Consensus::GetActiveFundingStreamShares(
+                    nHeight,
+                    miner_reward,
+                    chainparams.GetConsensus());
+
+                BOOST_FOREACH(Consensus::FundingStreamShare share, requiredShares) {
+                    miner_reward -= share.second;
+                    bool added = boost::apply_visitor(AddFundingStreamShareToTx(mtx, ctx, share.second), share.first);
+                    if (!added) {
+                        librustzcash_sapling_proving_ctx_free(ctx);
+                        throw new std::runtime_error("Failed to add funding stream output.");
+                    }
+                }
+            } else {
+                if (nHeight <= chainparams.GetConsensus().GetLastFoundersRewardBlockHeight(nHeight)) {
+                    // Founders reward is 20% of the block subsidy
+                    auto vFoundersReward = miner_reward / 5;
+                    // Take some reward away from us
+                    miner_reward -= vFoundersReward;
+                    // And give it to the founders
+                    mtx.vout.push_back(CTxOut(vFoundersReward, chainparams.GetFoundersRewardScriptAtHeight(nHeight)));
+                }
+            }
         }
 
-        return value + nFees;
+        return miner_reward + nFees;
     }
 
-    void operator()(const InvalidMinerAddress &invalid) const {}
-
-    // Create shielded output
-    void operator()(const libzcash::SaplingPaymentAddress &pa) const {
-        auto value = SetFoundersRewardAndGetMinerValue();
-        mtx.valueBalance = -value;
-
-        uint256 ovk;
-        auto note = libzcash::SaplingNote(pa, value);
-        auto output = OutputDescriptionInfo(ovk, note, {{0xF6}});
-
-        auto ctx = librustzcash_sapling_proving_ctx_init();
-
-        auto odesc = output.Build(ctx);
-        if (!odesc) {
-            librustzcash_sapling_proving_ctx_free(ctx);
-            throw new std::runtime_error("Failed to create shielded output for miner");
-        }
-        mtx.vShieldedOutput.push_back(odesc.get());
-
+    void ComputeBindingSig(void* ctx) const {
         // Empty output script.
         uint256 dataToBeSigned;
         CScript scriptCode;
@@ -181,24 +212,57 @@ public:
             throw ex;
         }
 
-        librustzcash_sapling_binding_sig(
+        bool success = librustzcash_sapling_binding_sig(
             ctx,
             mtx.valueBalance,
             dataToBeSigned.begin(),
             mtx.bindingSig.data());
 
+        if (!success) {
+            librustzcash_sapling_proving_ctx_free(ctx);
+            throw new std::runtime_error("An error occurrec computing the binding signature.");
+        }
+    }
+
+    void operator()(const InvalidMinerAddress &invalid) const {}
+
+    // Create shielded output
+    void operator()(const libzcash::SaplingPaymentAddress &pa) const {
+        auto ctx = librustzcash_sapling_proving_ctx_init();
+
+        auto miner_reward = SetFoundersRewardAndGetMinerValue(ctx);
+        mtx.valueBalance -= miner_reward;
+
+        uint256 ovk;
+        auto note = libzcash::SaplingNote(pa, miner_reward);
+        auto output = OutputDescriptionInfo(ovk, note, NO_MEMO);
+
+        auto odesc = output.Build(ctx);
+        if (!odesc) {
+            librustzcash_sapling_proving_ctx_free(ctx);
+            throw new std::runtime_error("Failed to create shielded output for miner");
+        }
+        mtx.vShieldedOutput.push_back(odesc.get());
+
+        ComputeBindingSig(ctx);
+
         librustzcash_sapling_proving_ctx_free(ctx);
     }
 
     // Create transparent output
     void operator()(const boost::shared_ptr<CReserveScript> &coinbaseScript) const {
-        // Create the miner's output.
-        mtx.vout.resize(1);
         // Add the FR output and fetch the miner's output value.
-        auto value = SetFoundersRewardAndGetMinerValue();
+        auto ctx = librustzcash_sapling_proving_ctx_init();
+        auto value = SetFoundersRewardAndGetMinerValue(ctx);
+
         // Now fill in the miner's output.
-        mtx.vout[0].nValue = value;
-        mtx.vout[0].scriptPubKey = coinbaseScript->reserveScript;
+        mtx.vout.push_back(CTxOut(value, coinbaseScript->reserveScript));
+
+        if (mtx.vShieldedOutput.size() > 0) {
+            ComputeBindingSig(ctx);
+        }
+
+        librustzcash_sapling_proving_ctx_free(ctx);
     }
 };
 
@@ -536,7 +600,7 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const MinerAddre
 
         CValidationState state;
         if (!TestBlockValidity(state, chainparams, *pblock, pindexPrev, false, false))
-            throw std::runtime_error("CreateNewBlock(): TestBlockValidity failed");
+            throw std::runtime_error(std::string("CreateNewBlock(): TestBlockValidity failed: ") + state.GetRejectReason());
     }
 
     return pblocktemplate.release();
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 00de5f54d..097dd316a 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -527,6 +527,7 @@ UniValue getblocktemplate(const UniValue& params, bool fHelp)
             // TestBlockValidity only supports blocks built on the current Tip
             if (block.hashPrevBlock != pindexPrev->GetBlockHash())
                 return "inconclusive-not-best-prevblk";
+
             CValidationState state;
             TestBlockValidity(state, Params(), block, pindexPrev, false, true);
             return BIP22ValidationResult(state);
diff --git a/src/transaction_builder.h b/src/transaction_builder.h
index 652d5fc48..b84820d00 100644
--- a/src/transaction_builder.h
+++ b/src/transaction_builder.h
@@ -20,6 +20,8 @@
 
 #include <boost/optional.hpp>
 
+#define NO_MEMO {{0xF6}}
+
 struct SpendDescriptionInfo {
     libzcash::SaplingExpandedSpendingKey expsk;
     libzcash::SaplingNote note;
@@ -118,7 +120,7 @@ public:
         uint256 ovk,
         libzcash::SaplingPaymentAddress to,
         CAmount value,
-        std::array<unsigned char, ZC_MEMO_SIZE> memo = {{0xF6}});
+        std::array<unsigned char, ZC_MEMO_SIZE> memo = NO_MEMO);
 
     // Throws if the anchor does not match the anchor used by
     // previously-added Sprout inputs.
@@ -130,7 +132,7 @@ public:
     void AddSproutOutput(
         libzcash::SproutPaymentAddress to,
         CAmount value,
-        std::array<unsigned char, ZC_MEMO_SIZE> memo = {{0xF6}});
+        std::array<unsigned char, ZC_MEMO_SIZE> memo = NO_MEMO);
 
     // Assumes that the value correctly corresponds to the provided UTXO.
     void AddTransparentInput(COutPoint utxo, CScript scriptPubKey, CAmount value);

From 1c00a0b5414baae9a977c165a4b1a7214fdd03a9 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Mon, 29 Jun 2020 15:42:45 -0600
Subject: [PATCH 02/36] Identify `-fundingstream` parameter as being
 regtest-only

Co-authored-by: str4d <thestr4d@gmail.com>
---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 3b675b67a..751fea627 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -441,7 +441,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-nurejectoldversions", strprintf("Reject peers that don't know about the current epoch (regtest-only) (default: %u)", DEFAULT_NU_REJECT_OLD_VERSIONS));
         strUsage += HelpMessageOpt(
                 "-fundingstream=streamId:startHeight:endHeight:comma_delimited_addresses", 
-                "Use given addresses for block subsidy shared paid to the funding stream with id <streamId>");
+                "Use given addresses for block subsidy shared paid to the funding stream with id <streamId> (regtest-only)");
     }
     string debugCategories = "addrman, alert, bench, coindb, db, estimatefee, http, libevent, lock, mempool, net, partitioncheck, pow, proxy, prune, "
                              "rand, reindex, rpc, selectcoins, tor, zmq, zrpc, zrpcunsafe (implies zrpc)"; // Don't translate these

From 665b8c647b14dc40a6add010932f919db325b288 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Mon, 29 Jun 2020 15:53:41 -0600
Subject: [PATCH 03/36] Use for..: rather than BOOST_FOREACH

Co-authored-by: str4d <thestr4d@gmail.com>
---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 194551a44..4bec080ae 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -176,7 +176,7 @@ public:
                     miner_reward,
                     chainparams.GetConsensus());
 
-                BOOST_FOREACH(Consensus::FundingStreamShare share, requiredShares) {
+                for (Consensus::FundingStreamShare share : requiredShares) {
                     miner_reward -= share.second;
                     bool added = boost::apply_visitor(AddFundingStreamShareToTx(mtx, ctx, share.second), share.first);
                     if (!added) {

From 074d054e84b23feb660938f6f634d9acf73e47ae Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Mon, 29 Jun 2020 15:54:07 -0600
Subject: [PATCH 04/36] Trivial error message fix.

Co-authored-by: str4d <thestr4d@gmail.com>
---
 src/miner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index 4bec080ae..83648e2af 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -220,7 +220,7 @@ public:
 
         if (!success) {
             librustzcash_sapling_proving_ctx_free(ctx);
-            throw new std::runtime_error("An error occurrec computing the binding signature.");
+            throw new std::runtime_error("An error occurred computing the binding signature.");
         }
     }
 

From 92cec200ee781a8de4ea761ff324baabc93270f4 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Mon, 29 Jun 2020 16:13:08 -0600
Subject: [PATCH 05/36] Minor fixes for ZIP-207 review comments.

---
 qa/rpc-tests/coinbase_funding_streams.py |  2 +-
 src/consensus/params.h                   |  4 ----
 src/main.h                               |  2 --
 src/miner.cpp                            | 17 +++++++++--------
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/qa/rpc-tests/coinbase_funding_streams.py b/qa/rpc-tests/coinbase_funding_streams.py
index b5c3bf7be..5778f932f 100755
--- a/qa/rpc-tests/coinbase_funding_streams.py
+++ b/qa/rpc-tests/coinbase_funding_streams.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019 The Zcash developers
+# Copyright (c) 2020 The Zcash developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 1f43442d4..c39799d4a 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -200,10 +200,6 @@ struct Params {
 
     int FundingPeriodIndex(int fundingStreamStartHeight, int nHeight) const;
 
-    bool FundingStreamsActive(int nHeight) const {
-        return nHeight > GetLastFoundersRewardBlockHeight(nHeight);
-    }
-
     /** Used to check majorities for block version upgrade */
     int nMajorityEnforceBlockUpgrade;
     int nMajorityRejectBlockOutdated;
diff --git a/src/main.h b/src/main.h
index 8b61249f2..ef515f1eb 100644
--- a/src/main.h
+++ b/src/main.h
@@ -468,8 +468,6 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
 /** 
  * Check a block is completely valid from start to finish (only works on top
  * of our current best block, with cs_main held) 
- *
- * Returns an error if block validation fails, boost::none otherwise.
  */
 bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
 
diff --git a/src/miner.cpp b/src/miner.cpp
index 83648e2af..cee692a75 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -184,15 +184,16 @@ public:
                         throw new std::runtime_error("Failed to add funding stream output.");
                     }
                 }
+            } else if (nHeight <= chainparams.GetConsensus().GetLastFoundersRewardBlockHeight(nHeight)) {
+                // Founders reward is 20% of the block subsidy
+                auto vFoundersReward = miner_reward / 5;
+                // Take some reward away from us
+                miner_reward -= vFoundersReward;
+                // And give it to the founders
+                mtx.vout.push_back(CTxOut(vFoundersReward, chainparams.GetFoundersRewardScriptAtHeight(nHeight)));
             } else {
-                if (nHeight <= chainparams.GetConsensus().GetLastFoundersRewardBlockHeight(nHeight)) {
-                    // Founders reward is 20% of the block subsidy
-                    auto vFoundersReward = miner_reward / 5;
-                    // Take some reward away from us
-                    miner_reward -= vFoundersReward;
-                    // And give it to the founders
-                    mtx.vout.push_back(CTxOut(vFoundersReward, chainparams.GetFoundersRewardScriptAtHeight(nHeight)));
-                }
+                // Founders reward ends without replacement if Canopy is not activated by the
+                // last Founders' Reward block height + 1.
             }
         }
 

From bf381ad58019bd21bf0e7f1c07655cea7bbad408 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Wed, 1 Jul 2020 16:05:30 -0600
Subject: [PATCH 06/36] Replace BOOST_FOREACH with for..:

Co-authored-by: str4d <thestr4d@gmail.com>
---
 src/gtest/test_foundersreward.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index 309b380ea..dfd09f274 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -250,7 +250,7 @@ TEST(FundingStreamsRewardTest, Zip207Distribution) {
         auto shares = GetActiveFundingStreamShares(nHeight, blockSubsidy, consensus);
 
         CAmount totalFunding = 0;
-        BOOST_FOREACH(Consensus::FundingStreamShare share, shares) {
+        for (Consensus::FundingStreamShare share : shares) {
             totalFunding += share.second;
         }
         EXPECT_EQ(totalFunding, blockSubsidy / 5);

From aff38f75f3de4d68fe6149c580c1a0782cd341ab Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Wed, 1 Jul 2020 16:06:27 -0600
Subject: [PATCH 07/36] Qualified imports of std:: types

Co-authored-by: str4d <thestr4d@gmail.com>
---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 751fea627..170fc0791 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1100,7 +1100,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
         if (Params().NetworkIDString() != "regtest") {
             return InitError("Funding stream parameters may only be overridden on regtest.");
         }
-        const vector<string>& streams = mapMultiArgs["-fundingstream"];
+        const std::vector<std::string>& streams = mapMultiArgs["-fundingstream"];
         for (auto i : streams) {
             std::vector<std::string> vStreamParams;
             boost::split(vStreamParams, i, boost::is_any_of(":"));

From b17f263c20f712f524cffd817020a539ec2b0cc5 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Thu, 2 Jul 2020 09:58:12 -0600
Subject: [PATCH 08/36] Capitalization fixes from code review

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
---
 src/consensus/params.h            | 2 +-
 src/gtest/test_foundersreward.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/consensus/params.h b/src/consensus/params.h
index c39799d4a..4c6710fd9 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -140,7 +140,7 @@ public:
 static const unsigned int PRE_BLOSSOM_POW_TARGET_SPACING = 150;
 static const unsigned int POST_BLOSSOM_POW_TARGET_SPACING = 75;
 static_assert(PRE_BLOSSOM_POW_TARGET_SPACING > POST_BLOSSOM_POW_TARGET_SPACING, "Blossom target spacing must be less than pre-Blossom target spacing.");
-static_assert(PRE_BLOSSOM_POW_TARGET_SPACING % POST_BLOSSOM_POW_TARGET_SPACING == 0, "Blossom target spacing must exactly divide pre-blossom target spacing.");
+static_assert(PRE_BLOSSOM_POW_TARGET_SPACING % POST_BLOSSOM_POW_TARGET_SPACING == 0, "Blossom target spacing must exactly divide pre-Blossom target spacing.");
 
 static const int BLOSSOM_POW_TARGET_SPACING_RATIO = PRE_BLOSSOM_POW_TARGET_SPACING / POST_BLOSSOM_POW_TARGET_SPACING;
 static_assert(BLOSSOM_POW_TARGET_SPACING_RATIO * POST_BLOSSOM_POW_TARGET_SPACING == PRE_BLOSSOM_POW_TARGET_SPACING, "Invalid BLOSSOM_POW_TARGET_SPACING_RATIO");
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index dfd09f274..1c3c0d544 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -219,7 +219,7 @@ TEST(FoundersRewardTest, PerAddressRewardTestnet) {
     verifyNumberOfRewards();
 }
 
-// Verify that post-canopy, block rewards are split according to Zip207
+// Verify that post-Canopy, block rewards are split according to ZIP 207.
 TEST(FundingStreamsRewardTest, Zip207Distribution) {
     auto consensus = RegtestActivateCanopy(false, 200);
 

From 5f20ef3c9d148de2d83959fc9ebc68bf4690fbdb Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Thu, 2 Jul 2020 12:15:26 -0600
Subject: [PATCH 09/36] Minor naming change FundingStreamShare ->
 FundingStreamElement

---
 src/consensus/funding.cpp         |  8 ++++----
 src/consensus/funding.h           |  4 ++--
 src/gtest/test_foundersreward.cpp |  6 +++---
 src/main.cpp                      | 12 ++++++------
 src/miner.cpp                     | 12 ++++++------
 5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/consensus/funding.cpp b/src/consensus/funding.cpp
index f0a9283ee..ddb8bacca 100644
--- a/src/consensus/funding.cpp
+++ b/src/consensus/funding.cpp
@@ -37,22 +37,22 @@ CAmount FSInfo::Value(CAmount blockSubsidy) const
     return CAmount((blockSubsidy * valueNumerator) / valueDenominator);
 }
 
-std::set<FundingStreamShare> GetActiveFundingStreamShares(
+std::set<FundingStreamElement> GetActiveFundingStreamElements(
     int nHeight,
     CAmount blockSubsidy,
     const Consensus::Params& params)
 {
-    std::set<std::pair<FundingStreamAddress, CAmount>> requiredShares;
+    std::set<std::pair<FundingStreamAddress, CAmount>> requiredElements;
     for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
         auto fs = params.vFundingStreams[idx];
         // Funding period is [startHeight, endHeight)
         if (fs && nHeight >= fs.get().GetStartHeight() && nHeight < fs.get().GetEndHeight()) {
-            requiredShares.insert(std::make_pair(
+            requiredElements.insert(std::make_pair(
                 fs.get().RecipientAddress(params, nHeight),
                 FundingStreamInfo[idx].Value(blockSubsidy)));
         }
     }
-    return requiredShares;
+    return requiredElements;
 };
 
 int GetMaxFundingStreamHeight(const Consensus::Params& params) {
diff --git a/src/consensus/funding.h b/src/consensus/funding.h
index f789e2ec4..3e37f118a 100644
--- a/src/consensus/funding.h
+++ b/src/consensus/funding.h
@@ -24,9 +24,9 @@ struct FSInfo {
 
 extern const struct FSInfo FundingStreamInfo[];
 
-typedef std::pair<FundingStreamAddress, CAmount> FundingStreamShare;
+typedef std::pair<FundingStreamAddress, CAmount> FundingStreamElement;
 
-std::set<FundingStreamShare> GetActiveFundingStreamShares(
+std::set<FundingStreamElement> GetActiveFundingStreamElements(
     int nHeight,
     CAmount blockSubsidy,
     const Consensus::Params& params);
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index 1c3c0d544..d190d50a6 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -247,11 +247,11 @@ TEST(FundingStreamsRewardTest, Zip207Distribution) {
     std::map<std::string, CAmount> ms;
     for (int nHeight = minHeight; nHeight <= maxHeight; nHeight++) {
         auto blockSubsidy = GetBlockSubsidy(nHeight, consensus);
-        auto shares = GetActiveFundingStreamShares(nHeight, blockSubsidy, consensus);
+        auto elems = GetActiveFundingStreamElements(nHeight, blockSubsidy, consensus);
 
         CAmount totalFunding = 0;
-        for (Consensus::FundingStreamShare share : shares) {
-            totalFunding += share.second;
+        for (Consensus::FundingStreamElement elem : elems) {
+            totalFunding += elem.second;
         }
         EXPECT_EQ(totalFunding, blockSubsidy / 5);
     }
diff --git a/src/main.cpp b/src/main.cpp
index 73da80d77..415d308c6 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -907,7 +907,7 @@ bool ContextualCheckTransaction(
     // ZIP 207 consensus funding streams active at the current block height. To avoid
     // double-decrypting, we detect any shielded funding streams during the Heartwood
     // consensus check. If Canopy is not yet active, requiredStream will be empty.
-    auto requiredShares = Consensus::GetActiveFundingStreamShares(
+    auto fundingStreamElements = Consensus::GetActiveFundingStreamElements(
         nHeight,
         GetBlockSubsidy(nHeight, chainparams.GetConsensus()),
         chainparams.GetConsensus());
@@ -949,10 +949,10 @@ bool ContextualCheckTransaction(
                 // Detect any ZIP 207 shielded funding streams.
                 if (canopyActive) {
                     libzcash::SaplingPaymentAddress zaddr(notePlaintext->d, outPlaintext->pk_d);
-                    for (auto it = requiredShares.begin(); it != requiredShares.end(); ++it) {
+                    for (auto it = fundingStreamElements.begin(); it != fundingStreamElements.end(); ++it) {
                         const libzcash::SaplingPaymentAddress* streamAddr = boost::get<libzcash::SaplingPaymentAddress>(&(it->first));
                         if (streamAddr && zaddr == *streamAddr && notePlaintext->value() == it->second) {
-                            requiredShares.erase(it);
+                            fundingStreamElements.erase(it);
                             break;
                         }
                     }
@@ -966,16 +966,16 @@ bool ContextualCheckTransaction(
         if (tx.IsCoinBase()) {
             // Detect transparent funding streams.
             for (const CTxOut& output : tx.vout) {
-                for (auto it = requiredShares.begin(); it != requiredShares.end(); ++it) {
+                for (auto it = fundingStreamElements.begin(); it != fundingStreamElements.end(); ++it) {
                     const CScript* taddr = boost::get<CScript>(&(it->first));
                     if (taddr && output.scriptPubKey == *taddr && output.nValue == it->second) {
-                        requiredShares.erase(it);
+                        fundingStreamElements.erase(it);
                         break;
                     }
                 }
             }
 
-            if (!requiredShares.empty()) {
+            if (!fundingStreamElements.empty()) {
                 std::cout << "\nFunding stream missing at height " << nHeight;
                 return state.DoS(100, error("%s: funding stream missing", __func__),
                                  REJECT_INVALID, "cb-funding-stream-missing");
diff --git a/src/miner.cpp b/src/miner.cpp
index cee692a75..bb4940f33 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -120,14 +120,14 @@ bool IsValidMinerAddress(const MinerAddress& minerAddr) {
     return minerAddr.which() != 0;
 }
 
-class AddFundingStreamShareToTx : public boost::static_visitor<bool>
+class AddFundingStreamValueToTx : public boost::static_visitor<bool>
 {
 private:
     CMutableTransaction &mtx;
     void* ctx; 
     const CAmount fundingStreamValue;
 public:
-    AddFundingStreamShareToTx(CMutableTransaction &mtx, void* ctx, const CAmount fundingStreamValue): mtx(mtx), ctx(ctx), fundingStreamValue(fundingStreamValue) {}
+    AddFundingStreamValueToTx(CMutableTransaction &mtx, void* ctx, const CAmount fundingStreamValue): mtx(mtx), ctx(ctx), fundingStreamValue(fundingStreamValue) {}
 
     bool operator()(const libzcash::SaplingPaymentAddress& pa) const {
         uint256 ovk;
@@ -171,14 +171,14 @@ public:
 
         if (nHeight > 0) {
             if (chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
-                auto requiredShares = Consensus::GetActiveFundingStreamShares(
+                auto fundingStreamElements = Consensus::GetActiveFundingStreamElements(
                     nHeight,
                     miner_reward,
                     chainparams.GetConsensus());
 
-                for (Consensus::FundingStreamShare share : requiredShares) {
-                    miner_reward -= share.second;
-                    bool added = boost::apply_visitor(AddFundingStreamShareToTx(mtx, ctx, share.second), share.first);
+                for (Consensus::FundingStreamElement fselem : fundingStreamElements) {
+                    miner_reward -= fselem.second;
+                    bool added = boost::apply_visitor(AddFundingStreamValueToTx(mtx, ctx, fselem.second), fselem.first);
                     if (!added) {
                         librustzcash_sapling_proving_ctx_free(ctx);
                         throw new std::runtime_error("Failed to add funding stream output.");

From d9088ab050e3ad6213ca7cff025a7633c4f73369 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Thu, 2 Jul 2020 13:32:23 -0600
Subject: [PATCH 10/36] Record-constructor syntax for funding stream
 initialization.

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
---
 src/consensus/funding.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/consensus/funding.cpp b/src/consensus/funding.cpp
index ddb8bacca..7b2cd01e5 100644
--- a/src/consensus/funding.cpp
+++ b/src/consensus/funding.cpp
@@ -12,22 +12,22 @@ namespace Consensus
  */
 const struct FSInfo FundingStreamInfo[Consensus::MAX_FUNDING_STREAMS] = {
     {
-        /*.recipient =*/ "Electric Coin Company",
-        /*.specification =*/ "https://zips.z.cash/zip-0214",
-        /*.valueNumerator =*/ 7,
-        /*.valueDenominator =*/ 100,
+        .recipient = "Electric Coin Company",
+        .specification = "https://zips.z.cash/zip-0214",
+        .valueNumerator = 7,
+        .valueDenominator = 100,
     },
     {
-        /*.recipient =*/ "Zcash Foundation",
-        /*.specification =*/ "https://zips.z.cash/zip-0214",
-        /*.valueNumerator =*/ 5,
-        /*.valueDenominator =*/ 100,
+        .recipient = "Zcash Foundation",
+        .specification = "https://zips.z.cash/zip-0214",
+        .valueNumerator = 5,
+        .valueDenominator = 100,
     },
     {
-        /*.recipient =*/ "Major Grants",
-        /*.specification =*/ "https://zips.z.cash/zip-0214",
-        /*.valueNumerator =*/ 8,
-        /*.valueDenominator =*/ 100,
+        .recipient = "Major Grants",
+        .specification = "https://zips.z.cash/zip-0214",
+        .valueNumerator = 8,
+        .valueDenominator = 100,
     }
 };
 

From 834911c0d797452c0ea32c26acd1786ef6d1b00b Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Thu, 2 Jul 2020 14:30:06 -0600
Subject: [PATCH 11/36] Update HalvingHeight documentation.

---
 src/consensus/params.cpp | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 7cce1e251..23a37aa3b 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -40,13 +40,21 @@ namespace Consensus {
         }
     }
 
+    /**
+     * This method determines the block height of the `halvingIndex`th 
+     * halving, as known at the specified `nHeight` block height. 
+     *
+     * Previous implementations of this logic were specialized to the
+     * first halving.
+     */ 
     int Params::HalvingHeight(int nHeight, int halvingIndex) const {
         // zip208
-        // FoundersRewardLastBlockHeight := max({ height ⦂ N | Halving(height) < 1 })
+        // HalvingHeight(i) := max({ height ⦂ N | Halving(height) < i }) + 1
         //
-        // Halving(h) is defined as floor(f(h)) where f is a strictly increasing rational
-        // function, so it's sufficient to solve for f(height) = 1 in the rationals and
-        // then take ceiling(height - 1).
+        // Halving(h) returns the halving index at the specified height.  It is
+        // defined as floor(f(h)) where f is a strictly increasing rational
+        // function, so it's sufficient to solve for f(height) = halvingIndex
+        // in the rationals and then take ceiling(height - 1).
         //
         // H := blossom activation height; 
         // SS := SubsidySlowStartShift(); 
@@ -58,11 +66,12 @@ namespace Consensus {
         // height = preInterval + SS
         //
         // postBlossom:
-        // 1 = (H - SS) / preInterval + (height - H) / postInterval
-        // height = H + postInterval - (H - SS) * (postInterval / preInterval)
-        // height = H + postInterval - (H - SS) * R
-        //
-        // Note: This depends on R being an integer
+        // i = (H - SS) / preInterval + (HalvingHeight(i) - H) / postInterval
+        // preInterval = postInterval / R
+        // i = (H - SS) / (postInterval / R) + (HalvingHeight(i) - H) / postInterval
+        // i = (R * (H - SS) + HalvingHeight(i) - H) / postInterval
+        // HalvingHeight(i) = postInterval * i - R * (H - SS) + H  
+        // under normal circumstances, Halving(H) = 0
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
             int blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
             return blossomActivationHeight 

From fccf37844b4a4b249614fec0d8f6bbf54fde9d69 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Thu, 2 Jul 2020 16:54:49 -0600
Subject: [PATCH 12/36] Fix pyflakes.

---
 qa/rpc-tests/coinbase_funding_streams.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/qa/rpc-tests/coinbase_funding_streams.py b/qa/rpc-tests/coinbase_funding_streams.py
index 5778f932f..31c081e90 100755
--- a/qa/rpc-tests/coinbase_funding_streams.py
+++ b/qa/rpc-tests/coinbase_funding_streams.py
@@ -3,8 +3,6 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
-from decimal import Decimal
-from test_framework.authproxy import JSONRPCException
 from test_framework.test_framework import BitcoinTestFramework
 from test_framework.mininode import (
     nuparams,
@@ -12,13 +10,10 @@ from test_framework.mininode import (
 )
 from test_framework.util import (
     assert_equal,
-    assert_raises,
     bitcoind_processes,
     connect_nodes,
     initialize_chain_clean,
     start_node,
-    wait_and_assert_operationid_status,
-    check_node_log,
     BLOSSOM_BRANCH_ID,
     HEARTWOOD_BRANCH_ID,
     CANOPY_BRANCH_ID,

From 8b363e9a70f007fb8ff1b72638c095ff0fa4d302 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Mon, 6 Jul 2020 10:31:07 -0600
Subject: [PATCH 13/36] Fix funding stream end-height-exclusion bugs

---
 src/consensus/funding.cpp         |  4 ++--
 src/consensus/params.cpp          | 12 ++++++------
 src/consensus/params.h            | 10 +++++-----
 src/gtest/test_foundersreward.cpp | 22 +++++++++++++++++++++-
 src/main.cpp                      | 15 ++++++++++-----
 5 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/src/consensus/funding.cpp b/src/consensus/funding.cpp
index 7b2cd01e5..4e0ba62af 100644
--- a/src/consensus/funding.cpp
+++ b/src/consensus/funding.cpp
@@ -59,8 +59,8 @@ int GetMaxFundingStreamHeight(const Consensus::Params& params) {
     int result = 0;
     for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
         auto fs = params.vFundingStreams[idx];
-        if (fs && result < fs.get().GetEndHeight()) {
-            result = fs.get().GetEndHeight();
+        if (fs && result < fs.get().GetEndHeight() - 1) {
+            result = fs.get().GetEndHeight() - 1;
         }
     }
 
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 23a37aa3b..ee9cc6dac 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -100,9 +100,9 @@ namespace Consensus {
 
     boost::variant<FundingStream, FundingStreamError> FundingStream::ValidateFundingStream(
         const Consensus::Params& params,
-        int startHeight,
-        int endHeight,
-        std::vector<FundingStreamAddress> addresses
+        const int startHeight,
+        const int endHeight,
+        const std::vector<FundingStreamAddress>& addresses
     ) {
         if (!params.NetworkUpgradeActive(startHeight, Consensus::UPGRADE_CANOPY)) {
             return FundingStreamError::CANOPY_NOT_ACTIVE;
@@ -112,7 +112,7 @@ namespace Consensus {
             return FundingStreamError::ILLEGAL_RANGE;
         }
 
-        if (params.FundingPeriodIndex(startHeight, endHeight) >= addresses.size()) {
+        if (params.FundingPeriodIndex(startHeight, endHeight - 1) >= addresses.size()) {
             return FundingStreamError::INSUFFICIENT_ADDRESSES;
         }
 
@@ -141,8 +141,8 @@ namespace Consensus {
 
     FundingStream FundingStream::ParseFundingStream(
         const Consensus::Params& params,
-        int startHeight,
-        int endHeight,
+        const int startHeight,
+        const int endHeight,
         const std::vector<std::string> strAddresses)
     {
         // Parse the address strings into concrete types.
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 4c6710fd9..f7348818d 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -116,15 +116,15 @@ public:
 
     static boost::variant<FundingStream, FundingStreamError> ValidateFundingStream(
         const Consensus::Params& params,
-        int startHeight,
-        int endHeight,
-        std::vector<FundingStreamAddress> addresses
+        const int startHeight,
+        const int endHeight,
+        const std::vector<FundingStreamAddress>& addresses
     );
 
     static FundingStream ParseFundingStream(
         const Consensus::Params& params,
-        int startHeight,
-        int endHeight,
+        const int startHeight,
+        const int endHeight,
         const std::vector<std::string> strAddresses);
 
     int GetStartHeight() const { return startHeight; };
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index d190d50a6..3ccae312f 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -234,7 +234,7 @@ TEST(FundingStreamsRewardTest, Zip207Distribution) {
             Consensus::FundingStream::ParseFundingStream(
                 consensus,
                 minHeight, 
-                minHeight + 100, 
+                minHeight + 12, 
                 {
                     "t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi",
                     EncodePaymentAddress(sk.default_address())
@@ -256,3 +256,23 @@ TEST(FundingStreamsRewardTest, Zip207Distribution) {
         EXPECT_EQ(totalFunding, blockSubsidy / 5);
     }
 }
+
+TEST(FundingStreamsRewardTest, ParseFundingStream) {
+    auto consensus = RegtestActivateCanopy(false, 200);
+
+    int minHeight = GetLastFoundersRewardHeight(consensus) + 1;
+
+    auto sk = libzcash::SaplingSpendingKey(uint256());
+    ASSERT_THROW(
+        Consensus::FundingStream::ParseFundingStream(
+            consensus,
+            minHeight, 
+            minHeight + 13, 
+            {
+                "t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi",
+                EncodePaymentAddress(sk.default_address())
+            }
+        ),
+        std::runtime_error
+    );
+}
diff --git a/src/main.cpp b/src/main.cpp
index 415d308c6..ca9e33626 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -906,11 +906,16 @@ bool ContextualCheckTransaction(
     // From Canopy onward, coinbase transaction must include outputs corresponding to the
     // ZIP 207 consensus funding streams active at the current block height. To avoid
     // double-decrypting, we detect any shielded funding streams during the Heartwood
-    // consensus check. If Canopy is not yet active, requiredStream will be empty.
-    auto fundingStreamElements = Consensus::GetActiveFundingStreamElements(
-        nHeight,
-        GetBlockSubsidy(nHeight, chainparams.GetConsensus()),
-        chainparams.GetConsensus());
+    // consensus check. If Canopy is not yet active, requiredStreams will be empty.
+    std::set<Consensus::FundingStreamElement> fundingStreamElements;
+    if (canopyActive) {
+        fundingStreamElements = Consensus::GetActiveFundingStreamElements(
+            nHeight,
+            // GetBlockSubsidy must be guarded because it will throw
+            // if called at slow-start period heights.
+            GetBlockSubsidy(nHeight, chainparams.GetConsensus()),
+            chainparams.GetConsensus());
+    }
 
     // Rules that apply to Heartwood or later:
     if (heartwoodActive) {

From 0141aacc676fe37a6eb784a6f9aaf69ee4d25178 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Mon, 6 Jul 2020 12:47:12 -0600
Subject: [PATCH 14/36] Add `RegtestDeactivateCanopy` calls to restore shared
 regtest params.

---
 src/gtest/test_checkblock.cpp     | 3 ++-
 src/gtest/test_foundersreward.cpp | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/gtest/test_checkblock.cpp b/src/gtest/test_checkblock.cpp
index 5ed8316d4..91e442c95 100644
--- a/src/gtest/test_checkblock.cpp
+++ b/src/gtest/test_checkblock.cpp
@@ -96,9 +96,10 @@ protected:
         mtx.vout[0].nValue = 0;
 
         // Give it a Founder's Reward vout for height 1.
+        auto rewardScript = Params().GetFoundersRewardScriptAtHeight(1);
         mtx.vout.push_back(CTxOut(
                     GetBlockSubsidy(1, Params().GetConsensus())/5,
-                    Params().GetFoundersRewardScriptAtHeight(1)));
+                    rewardScript));
 
         return mtx;
     }
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index 3ccae312f..e9a0f3caa 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -127,7 +127,7 @@ TEST(FoundersRewardTest, General) {
     EXPECT_DEATH(params.GetFoundersRewardAddressAtHeight(maxHeight+1), "nHeight"); 
 }
 
-TEST(founders_reward_test, regtest_get_last_block_blossom) {
+TEST(FoundersRewardTest, RegtestGetLastBlockBlossom) {
     int blossomActivationHeight = Consensus::PRE_BLOSSOM_REGTEST_HALVING_INTERVAL / 2; // = 75
     auto params = RegtestActivateBlossom(false, blossomActivationHeight);
     int lastFRHeight = params.GetLastFoundersRewardBlockHeight(blossomActivationHeight);
@@ -136,7 +136,7 @@ TEST(founders_reward_test, regtest_get_last_block_blossom) {
     RegtestDeactivateBlossom();
 }
 
-TEST(founders_reward_test, mainnet_get_last_block) {
+TEST(FoundersRewardTest, MainnetGetLastBlock) {
     SelectParams(CBaseChainParams::MAIN);
     auto params = Params().GetConsensus();
     int lastFRHeight = GetLastFoundersRewardHeight(params);
@@ -255,6 +255,8 @@ TEST(FundingStreamsRewardTest, Zip207Distribution) {
         }
         EXPECT_EQ(totalFunding, blockSubsidy / 5);
     }
+
+    RegtestDeactivateCanopy();
 }
 
 TEST(FundingStreamsRewardTest, ParseFundingStream) {
@@ -275,4 +277,6 @@ TEST(FundingStreamsRewardTest, ParseFundingStream) {
         ),
         std::runtime_error
     );
+
+    RegtestDeactivateCanopy();
 }

From 90fc87949201d24aeff97fa3040b3c6278ae9fc9 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Mon, 6 Jul 2020 13:09:49 -0600
Subject: [PATCH 15/36] Move test-only code into test sources.

---
 src/consensus/funding.cpp         | 12 ------------
 src/consensus/funding.h           |  2 --
 src/gtest/test_foundersreward.cpp | 14 ++++++++++++++
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/consensus/funding.cpp b/src/consensus/funding.cpp
index 4e0ba62af..59a2f4632 100644
--- a/src/consensus/funding.cpp
+++ b/src/consensus/funding.cpp
@@ -55,16 +55,4 @@ std::set<FundingStreamElement> GetActiveFundingStreamElements(
     return requiredElements;
 };
 
-int GetMaxFundingStreamHeight(const Consensus::Params& params) {
-    int result = 0;
-    for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
-        auto fs = params.vFundingStreams[idx];
-        if (fs && result < fs.get().GetEndHeight() - 1) {
-            result = fs.get().GetEndHeight() - 1;
-        }
-    }
-
-    return result;
-}
-
 } // namespace Consensus
diff --git a/src/consensus/funding.h b/src/consensus/funding.h
index 3e37f118a..8c8f43b25 100644
--- a/src/consensus/funding.h
+++ b/src/consensus/funding.h
@@ -30,8 +30,6 @@ std::set<FundingStreamElement> GetActiveFundingStreamElements(
     int nHeight,
     CAmount blockSubsidy,
     const Consensus::Params& params);
-
-int GetMaxFundingStreamHeight(const Consensus::Params& params);
 } // namespace Consensus
 
 #endif // ZCASH_CONSENSUS_FUNDING_H
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index e9a0f3caa..1714f25c5 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -101,6 +101,20 @@ void checkNumberOfUniqueAddresses(int nUnique) {
     EXPECT_EQ(addresses.size(), nUnique);
 }
 
+int GetMaxFundingStreamHeight(const Consensus::Params& params) {
+    int result = 0;
+    for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+        // The following indexed access is safe as Consensus::MAX_FUNDING_STREAMS is used
+        // in the definition of vFundingStreams.
+        auto fs = params.vFundingStreams[idx];
+        if (fs && result < fs.get().GetEndHeight() - 1) {
+            result = fs.get().GetEndHeight() - 1;
+        }
+    }
+
+    return result;
+}
+
 
 TEST(FoundersRewardTest, General) {
     SelectParams(CBaseChainParams::TESTNET);

From f9b10b866eeb28df0f21af379bb5c7cf38ed455c Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Mon, 6 Jul 2020 13:12:55 -0600
Subject: [PATCH 16/36] Trivial comment correction.

---
 src/consensus/funding.cpp | 2 ++
 src/consensus/params.cpp  | 1 -
 src/main.cpp              | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/consensus/funding.cpp b/src/consensus/funding.cpp
index 59a2f4632..49aa1a0bf 100644
--- a/src/consensus/funding.cpp
+++ b/src/consensus/funding.cpp
@@ -44,6 +44,8 @@ std::set<FundingStreamElement> GetActiveFundingStreamElements(
 {
     std::set<std::pair<FundingStreamAddress, CAmount>> requiredElements;
     for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+        // The following indexed access is safe as Consensus::MAX_FUNDING_STREAMS is used
+        // in the definition of vFundingStreams.
         auto fs = params.vFundingStreams[idx];
         // Funding period is [startHeight, endHeight)
         if (fs && nHeight >= fs.get().GetStartHeight() && nHeight < fs.get().GetEndHeight()) {
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index ee9cc6dac..d4a4adf2d 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -24,7 +24,6 @@ namespace Consensus {
         // floor((height - SlowStartShift) / PreBlossomHalvingInterval), if not IsBlossomActivated(height)
         // floor((BlossomActivationHeight - SlowStartShift) / PreBlossomHalvingInterval + (height - BlossomActivationHeight) / PostBlossomHalvingInterval), otherwise
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
-
             int64_t blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
             // Ideally we would say:
             // halvings = (blossomActivationHeight - consensusParams.SubsidySlowStartShift()) / consensusParams.nPreBlossomSubsidyHalvingInterval 
diff --git a/src/main.cpp b/src/main.cpp
index ca9e33626..089fe9d88 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -906,7 +906,7 @@ bool ContextualCheckTransaction(
     // From Canopy onward, coinbase transaction must include outputs corresponding to the
     // ZIP 207 consensus funding streams active at the current block height. To avoid
     // double-decrypting, we detect any shielded funding streams during the Heartwood
-    // consensus check. If Canopy is not yet active, requiredStreams will be empty.
+    // consensus check. If Canopy is not yet active, fundingStreamElements will be empty.
     std::set<Consensus::FundingStreamElement> fundingStreamElements;
     if (canopyActive) {
         fundingStreamElements = Consensus::GetActiveFundingStreamElements(

From 88c5bf72171ec01b5d872af01fa3245c89f0cd23 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Mon, 6 Jul 2020 15:41:28 -0600
Subject: [PATCH 17/36] Minor help message correction.

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
---
 src/init.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/init.cpp b/src/init.cpp
index 170fc0791..4634926f1 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -441,7 +441,7 @@ std::string HelpMessage(HelpMessageMode mode)
         strUsage += HelpMessageOpt("-nurejectoldversions", strprintf("Reject peers that don't know about the current epoch (regtest-only) (default: %u)", DEFAULT_NU_REJECT_OLD_VERSIONS));
         strUsage += HelpMessageOpt(
                 "-fundingstream=streamId:startHeight:endHeight:comma_delimited_addresses", 
-                "Use given addresses for block subsidy shared paid to the funding stream with id <streamId> (regtest-only)");
+                "Use given addresses for block subsidy share paid to the funding stream with id <streamId> (regtest-only)");
     }
     string debugCategories = "addrman, alert, bench, coindb, db, estimatefee, http, libevent, lock, mempool, net, partitioncheck, pow, proxy, prune, "
                              "rand, reindex, rpc, selectcoins, tor, zmq, zrpc, zrpcunsafe (implies zrpc)"; // Don't translate these

From 37b4faab6a30a88b2b58a206db9a2b5e2983f522 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Tue, 7 Jul 2020 09:41:32 -0600
Subject: [PATCH 18/36] Pass by const reference where possible.

Co-authored-by: Larry Ruane <larry@z.cash>
---
 src/consensus/params.cpp | 4 ++--
 src/consensus/params.h   | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index d4a4adf2d..4ff3eeb76 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -142,7 +142,7 @@ namespace Consensus {
         const Consensus::Params& params,
         const int startHeight,
         const int endHeight,
-        const std::vector<std::string> strAddresses)
+        const std::vector<std::string>& strAddresses)
     {
         // Parse the address strings into concrete types.
         std::vector<FundingStreamAddress> addresses;
@@ -167,7 +167,7 @@ namespace Consensus {
         FundingStreamIndex idx,
         int startHeight,
         int endHeight,
-        const std::vector<std::string> strAddresses)
+        const std::vector<std::string>& strAddresses)
     {
         vFundingStreams[idx] = FundingStream::ParseFundingStream(*this, startHeight, endHeight, strAddresses);
     };
diff --git a/src/consensus/params.h b/src/consensus/params.h
index f7348818d..959c7f190 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -108,7 +108,7 @@ private:
     int endHeight;
     std::vector<FundingStreamAddress> addresses;
 
-    FundingStream(int startHeight, int endHeight, std::vector<FundingStreamAddress> addresses):
+    FundingStream(int startHeight, int endHeight, const std::vector<FundingStreamAddress>& addresses):
         startHeight(startHeight), endHeight(endHeight), addresses(addresses) { }
 public:
     FundingStream(const FundingStream& fs):
@@ -125,7 +125,7 @@ public:
         const Consensus::Params& params,
         const int startHeight,
         const int endHeight,
-        const std::vector<std::string> strAddresses);
+        const std::vector<std::string>& strAddresses);
 
     int GetStartHeight() const { return startHeight; };
     int GetEndHeight() const { return endHeight; };
@@ -212,7 +212,7 @@ struct Params {
         FundingStreamIndex idx,
         int startHeight,
         int endHeight,
-        const std::vector<std::string> addresses);
+        const std::vector<std::string>& addresses);
 
     /**
      * Default block height at which the future timestamp soft fork rule activates.

From ea987f5577cd164f918e33815cf0e670c9157cd7 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Tue, 7 Jul 2020 09:53:18 -0600
Subject: [PATCH 19/36] Use uint32_t for vFundingStreams indexing.

---
 src/consensus/funding.cpp         | 2 +-
 src/gtest/test_foundersreward.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/consensus/funding.cpp b/src/consensus/funding.cpp
index 49aa1a0bf..0811bda28 100644
--- a/src/consensus/funding.cpp
+++ b/src/consensus/funding.cpp
@@ -43,7 +43,7 @@ std::set<FundingStreamElement> GetActiveFundingStreamElements(
     const Consensus::Params& params)
 {
     std::set<std::pair<FundingStreamAddress, CAmount>> requiredElements;
-    for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+    for (uint32_t idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
         // The following indexed access is safe as Consensus::MAX_FUNDING_STREAMS is used
         // in the definition of vFundingStreams.
         auto fs = params.vFundingStreams[idx];
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index 1714f25c5..b85b43136 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -103,7 +103,7 @@ void checkNumberOfUniqueAddresses(int nUnique) {
 
 int GetMaxFundingStreamHeight(const Consensus::Params& params) {
     int result = 0;
-    for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+    for (uint32_t idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
         // The following indexed access is safe as Consensus::MAX_FUNDING_STREAMS is used
         // in the definition of vFundingStreams.
         auto fs = params.vFundingStreams[idx];

From 502896e13080f89bbda5af8cb7a83b6ba782433e Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Tue, 7 Jul 2020 16:32:18 -0600
Subject: [PATCH 20/36] Fix incorrect subtraction of
 Halving(blossomActivationHeight) from halvingIndex

---
 src/consensus/params.cpp | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 4ff3eeb76..21c4dd49c 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -53,7 +53,7 @@ namespace Consensus {
         // Halving(h) returns the halving index at the specified height.  It is
         // defined as floor(f(h)) where f is a strictly increasing rational
         // function, so it's sufficient to solve for f(height) = halvingIndex
-        // in the rationals and then take ceiling(height - 1).
+        // in the rationals and then take ceiling(height).
         //
         // H := blossom activation height; 
         // SS := SubsidySlowStartShift(); 
@@ -61,23 +61,28 @@ namespace Consensus {
         // (The following calculation depends on BLOSSOM_POW_TARGET_SPACING_RATIO being an integer.) 
         //
         // preBlossom:
-        // 1 = (height - SS) / preInterval
-        // height = preInterval + SS
+        // i = (height - SS) / preInterval
+        // height = (preInterval * i) + SS
         //
         // postBlossom:
         // i = (H - SS) / preInterval + (HalvingHeight(i) - H) / postInterval
         // preInterval = postInterval / R
         // i = (H - SS) / (postInterval / R) + (HalvingHeight(i) - H) / postInterval
         // i = (R * (H - SS) + HalvingHeight(i) - H) / postInterval
+        // postInterval * i = R * (H - SS) + HalvingHeight(i) - H
         // HalvingHeight(i) = postInterval * i - R * (H - SS) + H  
-        // under normal circumstances, Halving(H) = 0
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
             int blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
-            return blossomActivationHeight 
-                - ((blossomActivationHeight - SubsidySlowStartShift()) * BLOSSOM_POW_TARGET_SPACING_RATIO)
-                + (nPostBlossomSubsidyHalvingInterval * (halvingIndex - Halving(blossomActivationHeight)));
+
+            // Halving(H) = 0 because Blossom activated prior to the first halving
+            assert(Halving(blossomActivationHeight) == 0);
+
+            return 
+                (nPostBlossomSubsidyHalvingInterval * halvingIndex)
+                - (BLOSSOM_POW_TARGET_SPACING_RATIO * (blossomActivationHeight - SubsidySlowStartShift()))
+                + blossomActivationHeight;
         } else {
-            return (halvingIndex * nPreBlossomSubsidyHalvingInterval) + SubsidySlowStartShift();
+            return (nPreBlossomSubsidyHalvingInterval * halvingIndex) + SubsidySlowStartShift();
         }
     }
 

From 06789f99d3dafa21d05c4c87c1da7e3407c7a416 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Wed, 8 Jul 2020 11:04:47 -0600
Subject: [PATCH 21/36] Fix ordering of transparent outputs such that miner
 reward is vout[0]

---
 src/miner.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index bb4940f33..2c95f4524 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -254,10 +254,14 @@ public:
     void operator()(const boost::shared_ptr<CReserveScript> &coinbaseScript) const {
         // Add the FR output and fetch the miner's output value.
         auto ctx = librustzcash_sapling_proving_ctx_init();
+
+        // Miner output will be vout[0]; Founders' Reward & funding stream outputs
+        // will follow.
+        mtx.vout.resize(1);
         auto value = SetFoundersRewardAndGetMinerValue(ctx);
 
         // Now fill in the miner's output.
-        mtx.vout.push_back(CTxOut(value, coinbaseScript->reserveScript));
+        mtx.vout[0] = CTxOut(value, coinbaseScript->reserveScript);
 
         if (mtx.vShieldedOutput.size() > 0) {
             ComputeBindingSig(ctx);

From ca3f5df607b337950e56dce00a0fb0f4c8aeacf8 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Wed, 8 Jul 2020 17:02:28 -0600
Subject: [PATCH 22/36] Remove assertion that was breaking regtest in the case
 that blossom activates after the halving.

---
 src/consensus/params.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 21c4dd49c..1ddf0dc88 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -74,9 +74,6 @@ namespace Consensus {
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
             int blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
 
-            // Halving(H) = 0 because Blossom activated prior to the first halving
-            assert(Halving(blossomActivationHeight) == 0);
-
             return 
                 (nPostBlossomSubsidyHalvingInterval * halvingIndex)
                 - (BLOSSOM_POW_TARGET_SPACING_RATIO * (blossomActivationHeight - SubsidySlowStartShift()))

From 50c1d5cee62b0d3692d2b63de0868dab2b96f712 Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 9 Jul 2020 18:25:27 +0100
Subject: [PATCH 23/36] Add GetActiveFundingStreams function.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 src/consensus/funding.cpp | 14 ++++++++++++++
 src/consensus/funding.h   |  5 +++++
 2 files changed, 19 insertions(+)

diff --git a/src/consensus/funding.cpp b/src/consensus/funding.cpp
index 0811bda28..79dffb631 100644
--- a/src/consensus/funding.cpp
+++ b/src/consensus/funding.cpp
@@ -57,4 +57,18 @@ std::set<FundingStreamElement> GetActiveFundingStreamElements(
     return requiredElements;
 };
 
+std::vector<FSInfo> GetActiveFundingStreams(
+    int nHeight,
+    const Consensus::Params& params)
+{
+    std::vector<FSInfo> activeStreams;
+    for (uint32_t idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
+        auto fs = params.vFundingStreams[idx];
+        if (fs && nHeight >= fs.get().GetStartHeight() && nHeight < fs.get().GetEndHeight()) {
+            activeStreams.push_back(FundingStreamInfo[idx]);
+        }
+    }
+    return activeStreams;
+};
+
 } // namespace Consensus
diff --git a/src/consensus/funding.h b/src/consensus/funding.h
index 8c8f43b25..5f7b96acc 100644
--- a/src/consensus/funding.h
+++ b/src/consensus/funding.h
@@ -30,6 +30,11 @@ std::set<FundingStreamElement> GetActiveFundingStreamElements(
     int nHeight,
     CAmount blockSubsidy,
     const Consensus::Params& params);
+
+std::vector<FSInfo> GetActiveFundingStreams(
+    int nHeight,
+    const Consensus::Params& params);
+
 } // namespace Consensus
 
 #endif // ZCASH_CONSENSUS_FUNDING_H

From 7555a7c26a68b86b2bd26b3a60df2fa7dc642e2d Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Thu, 9 Jul 2020 11:40:23 -0600
Subject: [PATCH 24/36] Use for..in rather than an indexed loop.

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
---
 src/gtest/test_foundersreward.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index b85b43136..cc795989d 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -103,10 +103,7 @@ void checkNumberOfUniqueAddresses(int nUnique) {
 
 int GetMaxFundingStreamHeight(const Consensus::Params& params) {
     int result = 0;
-    for (uint32_t idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
-        // The following indexed access is safe as Consensus::MAX_FUNDING_STREAMS is used
-        // in the definition of vFundingStreams.
-        auto fs = params.vFundingStreams[idx];
+    for (auto fs : params.vFundingStreams) {
         if (fs && result < fs.get().GetEndHeight() - 1) {
             result = fs.get().GetEndHeight() - 1;
         }

From 6bd85925e7cb59d6dcdc366cbacbc839333c872f Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 9 Jul 2020 18:27:10 +0100
Subject: [PATCH 25/36] Tests for changes to getblocksubsidy.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 src/wallet/test/rpc_wallet_tests.cpp | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/wallet/test/rpc_wallet_tests.cpp b/src/wallet/test/rpc_wallet_tests.cpp
index 0b2ad86b6..c2ccd4bce 100644
--- a/src/wallet/test/rpc_wallet_tests.cpp
+++ b/src/wallet/test/rpc_wallet_tests.cpp
@@ -275,36 +275,59 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
     UniValue obj = retValue.get_obj();
     BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), 10.0);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 2.5);
+    BOOST_CHECK(!obj.exists("fundingstreams"));
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 653599")); // Blossom activation - 1
     obj = retValue.get_obj();
     BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), 10.0);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 2.5);
+    BOOST_CHECK(!obj.exists("fundingstreams"));
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 653600")); // Blossom activation
     obj = retValue.get_obj();
     BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), 5.0);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 1.25);
+    BOOST_CHECK(!obj.exists("fundingstreams"));
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 1046399"));
     obj = retValue.get_obj();
     BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), 5.0);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 1.25);
+    BOOST_CHECK(!obj.exists("fundingstreams"));
+
+    auto check_funding_streams = [](UniValue obj, double ecc_slice, double zf_slice, double mg_slice) {
+        std::map<std::string, UniValue> fundingstreams;
+        find_value(obj, "fundingstreams").getObjMap(fundingstreams);
+        BOOST_CHECK_EQUAL(fundingstreams.size(), 3);
+        if (fundingstreams.size() != 3) return;
+        BOOST_CHECK_EQUAL(fundingstreams["Electric Coin Company"].get_real(), ecc_slice);
+        BOOST_CHECK_EQUAL(fundingstreams["Zcash Foundation"].get_real(), zf_slice);
+        BOOST_CHECK_EQUAL(fundingstreams["Major Grants"].get_real(), mg_slice);
+    };
+
+    bool canopyEnabled =
+        Params().GetConsensus().vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
+
     // slow start + blossom activation + (pre blossom halving - blossom activation) * 2
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 1046400"));
     obj = retValue.get_obj();
-    BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), 3.125);
+    BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), canopyEnabled ? 2.5 : 3.125);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 0.0);
+    if (canopyEnabled)
+        check_funding_streams(obj, 0.21875, 0.15625, 0.25);
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 2726399"));
     obj = retValue.get_obj();
-    BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), 3.125);
+    BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), canopyEnabled ? 2.5 : 3.125);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 0.0);
+    if (canopyEnabled)
+        check_funding_streams(obj, 0.21875, 0.15625, 0.25);
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 2726400"));
     obj = retValue.get_obj();
     BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), 1.5625);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 0.0);
+    BOOST_CHECK(find_value(obj, "fundingstreams").empty());
 
     /*
      * getblock

From 8121e874e25405316aadea9c7c1d2ab2cf73f3cc Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 9 Jul 2020 18:28:06 +0100
Subject: [PATCH 26/36] Change getblocksubsidy RPC to take into account funding
 streams.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 src/rpc/mining.cpp | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 097dd316a..d3179ae13 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -6,6 +6,7 @@
 #include "amount.h"
 #include "chainparams.h"
 #include "consensus/consensus.h"
+#include "consensus/funding.h"
 #include "consensus/validation.h"
 #include "core_io.h"
 #ifdef ENABLE_MINING
@@ -880,6 +881,7 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
             "{\n"
             "  \"miner\" : x.xxx           (numeric) The mining reward amount in " + CURRENCY_UNIT + ".\n"
             "  \"founders\" : x.xxx        (numeric) The founders reward amount in " + CURRENCY_UNIT + ".\n"
+            "  \"fundingstreams\" : {...}  (optional map) A map from funding stream recipients to amounts in " + CURRENCY_UNIT + ".\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getblocksubsidy", "1000")
@@ -891,14 +893,27 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
     if (nHeight < 0)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
 
-    CAmount nReward = GetBlockSubsidy(nHeight, Params().GetConsensus());
+    auto consensus = Params().GetConsensus();
+    CAmount nBlockSubsidy = GetBlockSubsidy(nHeight, consensus);
+    CAmount nMinerReward = nBlockSubsidy;
     CAmount nFoundersReward = 0;
-    if ((nHeight > 0) && (nHeight <= Params().GetConsensus().GetLastFoundersRewardBlockHeight(nHeight))) {
-        nFoundersReward = nReward/5;
-        nReward -= nFoundersReward;
-    }
+    bool canopyActive = consensus.NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY);
+
     UniValue result(UniValue::VOBJ);
-    result.pushKV("miner", ValueFromAmount(nReward));
+    if (canopyActive) {
+        UniValue fundingstreams(UniValue::VOBJ);
+        auto elems = Consensus::GetActiveFundingStreams(nHeight, consensus);
+        for (auto elem : elems) {
+            CAmount value = elem.Value(nBlockSubsidy);
+            fundingstreams.pushKV(elem.recipient, value);
+            nMinerReward -= value;
+        }
+        result.pushKV("fundingstreams", fundingstreams);
+    } else if (nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight(nHeight)) {
+        nFoundersReward = nBlockSubsidy/5;
+        nMinerReward -= nFoundersReward;
+    }
+    result.pushKV("miner", ValueFromAmount(nMinerReward));
     result.pushKV("founders", ValueFromAmount(nFoundersReward));
     return result;
 }

From 07ff0d19a03870234bbbddce393ad5e3ec2d3581 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Thu, 9 Jul 2020 16:53:54 -0600
Subject: [PATCH 27/36] Make evident the relationship between chainparams and
 key IO.

---
 src/bitcoin-tx.cpp                            |   8 +-
 src/chainparams.cpp                           | 154 +++++++++-------
 src/chainparams.h                             |  46 ++---
 src/consensus/params.cpp                      |  10 +-
 src/consensus/params.h                        |  33 ++++
 src/core_write.cpp                            |   3 +-
 src/gtest/test_foundersreward.cpp             |  13 +-
 src/gtest/test_keys.cpp                       |  13 +-
 src/init.cpp                                  |  12 +-
 src/key_io.cpp                                | 166 +++++++++---------
 src/key_io.h                                  |  42 +++--
 src/miner.cpp                                 |   6 +-
 src/rpc/blockchain.cpp                        |   7 +-
 src/rpc/mining.cpp                            |   2 +-
 src/rpc/misc.cpp                              |  31 ++--
 src/rpc/rawtransaction.cpp                    |  17 +-
 src/test/base58_tests.cpp                     |  21 ++-
 src/test/bip32_tests.cpp                      |   9 +-
 src/test/bloom_tests.cpp                      |   3 +-
 src/test/key_tests.cpp                        |  40 +++--
 src/utiltest.cpp                              |   3 +-
 .../asyncrpcoperation_mergetoaddress.cpp      |   8 +-
 .../asyncrpcoperation_saplingmigration.cpp    |   3 +-
 src/wallet/asyncrpcoperation_sendmany.cpp     |  22 ++-
 .../asyncrpcoperation_shieldcoinbase.cpp      |   7 +-
 src/wallet/paymentdisclosure.cpp              |   6 +-
 src/wallet/rpcdisclosure.cpp                  |   4 +-
 src/wallet/rpcdump.cpp                        |  63 ++++---
 src/wallet/rpcwallet.cpp                      | 133 ++++++++------
 src/wallet/test/rpc_wallet_tests.cpp          |  89 ++++++----
 src/wallet/wallet.cpp                         |  47 +++--
 src/wallet/walletdb.cpp                       |   8 +-
 32 files changed, 607 insertions(+), 422 deletions(-)

diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
index 1bb304596..473ad3f1c 100644
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -240,9 +240,11 @@ static void MutateTxAddOutAddr(CMutableTransaction& tx, const std::string& strIn
     if (!ParseMoney(strValue, value))
         throw std::runtime_error("invalid TX output value");
 
+    KeyIO keyIO(Params());
+
     // extract and validate ADDRESS
     std::string strAddr = strInput.substr(pos + 1, std::string::npos);
-    CTxDestination destination = DecodeDestination(strAddr);
+    CTxDestination destination = keyIO.DecodeDestination(strAddr);
     if (!IsValidDestination(destination)) {
         throw std::runtime_error("invalid TX output address");
     }
@@ -399,10 +401,12 @@ static void MutateTxSign(CMutableTransaction& tx, const std::string& strInput)
     UniValue keysObj = registers["privatekeys"];
     fGivenKeys = true;
 
+    KeyIO keyIO(Params());
+
     for (size_t kidx = 0; kidx < keysObj.size(); kidx++) {
         if (!keysObj[kidx].isStr())
             throw std::runtime_error("privatekey not a std::string");
-        CKey key = DecodeSecret(keysObj[kidx].getValStr());
+        CKey key = keyIO.DecodeSecret(keysObj[kidx].getValStr());
         if (!key.IsValid()) {
             throw std::runtime_error("privatekey not valid");
         }
diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 49752b0b5..51279ef0c 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -127,6 +127,48 @@ public:
 
         consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;
 
+        // guarantees the first 2 characters, when base58 encoded, are "t1"
+        keyInfo.base58Prefixes[PUBKEY_ADDRESS]     = {0x1C,0xB8};
+        // guarantees the first 2 characters, when base58 encoded, are "t3"
+        keyInfo.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBD};
+        // the first character, when base58 encoded, is "5" or "K" or "L" (as in Bitcoin)
+        keyInfo.base58Prefixes[SECRET_KEY]         = {0x80};
+        // do not rely on these BIP32 prefixes; they are not specified and may change
+        keyInfo.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x88,0xB2,0x1E};
+        keyInfo.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x88,0xAD,0xE4};
+        // guarantees the first 2 characters, when base58 encoded, are "zc"
+        keyInfo.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0x9A};
+        // guarantees the first 4 characters, when base58 encoded, are "ZiVK"
+        keyInfo.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAB,0xD3};
+        // guarantees the first 2 characters, when base58 encoded, are "SK"
+        keyInfo.base58Prefixes[ZCSPENDING_KEY]     = {0xAB,0x36};
+
+        keyInfo.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "zs";
+        keyInfo.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviews";
+        keyInfo.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivks";
+        keyInfo.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-main";
+        keyInfo.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviews";
+
+        // TODO: This `if` can be removed once canopy activation height is set.
+        if (consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
+            std::vector<std::string> addresses(48, "");
+            consensus.AddZIP207FundingStream(
+                keyInfo,
+                Consensus::FS_ZIP214_ECC,
+                consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
+                addresses);
+            consensus.AddZIP207FundingStream(
+                keyInfo,
+                Consensus::FS_ZIP214_ZF,
+                consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
+                addresses);
+            consensus.AddZIP207FundingStream(
+                keyInfo,
+                Consensus::FS_ZIP214_MG,
+                consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
+                addresses);
+        }
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("000000000000000000000000000000000000000000000000017e73a331fae01c");
 
@@ -157,28 +199,6 @@ public:
         vSeeds.push_back(CDNSSeedData("zfnd.org", "mainnet.seeder.zfnd.org")); // Zcash Foundation
         vSeeds.push_back(CDNSSeedData("yolo.money", "mainnet.is.yolo.money")); // gtank
 
-        // guarantees the first 2 characters, when base58 encoded, are "t1"
-        base58Prefixes[PUBKEY_ADDRESS]     = {0x1C,0xB8};
-        // guarantees the first 2 characters, when base58 encoded, are "t3"
-        base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBD};
-        // the first character, when base58 encoded, is "5" or "K" or "L" (as in Bitcoin)
-        base58Prefixes[SECRET_KEY]         = {0x80};
-        // do not rely on these BIP32 prefixes; they are not specified and may change
-        base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x88,0xB2,0x1E};
-        base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x88,0xAD,0xE4};
-        // guarantees the first 2 characters, when base58 encoded, are "zc"
-        base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0x9A};
-        // guarantees the first 4 characters, when base58 encoded, are "ZiVK"
-        base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAB,0xD3};
-        // guarantees the first 2 characters, when base58 encoded, are "SK"
-        base58Prefixes[ZCSPENDING_KEY]     = {0xAB,0x36};
-
-        bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "zs";
-        bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviews";
-        bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivks";
-        bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-main";
-        bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviews";
-
         vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_main, pnSeed6_main + ARRAYLEN(pnSeed6_main));
 
         fMiningRequiresPeers = true;
@@ -336,20 +356,46 @@ public:
 
         consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;
 
+        // guarantees the first 2 characters, when base58 encoded, are "tm"
+        keyInfo.base58Prefixes[PUBKEY_ADDRESS]     = {0x1D,0x25};
+        // guarantees the first 2 characters, when base58 encoded, are "t2"
+        keyInfo.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBA};
+        // the first character, when base58 encoded, is "9" or "c" (as in Bitcoin)
+        keyInfo.base58Prefixes[SECRET_KEY]         = {0xEF};
+        // do not rely on these BIP32 prefixes; they are not specified and may change
+        keyInfo.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
+        keyInfo.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
+        // guarantees the first 2 characters, when base58 encoded, are "zt"
+        keyInfo.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
+        // guarantees the first 4 characters, when base58 encoded, are "ZiVt"
+        keyInfo.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
+        // guarantees the first 2 characters, when base58 encoded, are "ST"
+        keyInfo.base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
+
+        keyInfo.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "ztestsapling";
+        keyInfo.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewtestsapling";
+        keyInfo.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivktestsapling";
+        keyInfo.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-test";
+        keyInfo.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewtestsapling";
+
         // TODO: This `if` can be removed once canopy activation height is set.
         if (consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
+            std::vector<std::string> addresses(48, "");
             consensus.AddZIP207FundingStream(
+                keyInfo,
                 Consensus::FS_ZIP214_ECC,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
-                {/*TODO*/});
+                addresses);
             consensus.AddZIP207FundingStream(
+                keyInfo,
                 Consensus::FS_ZIP214_ZF,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
-                {/*TODO*/});
+                addresses);
             consensus.AddZIP207FundingStream(
+                keyInfo,
                 Consensus::FS_ZIP214_MG,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
-                {/*TODO*/});
+                addresses);
         }
 
         // On testnet we activate this rule 6 blocks after Blossom activation. From block 299188 and
@@ -395,28 +441,6 @@ public:
         vSeeds.push_back(CDNSSeedData("zfnd.org", "testnet.seeder.zfnd.org")); // Zcash Foundation
         vSeeds.push_back(CDNSSeedData("yolo.money", "testnet.is.yolo.money")); // gtank
 
-        // guarantees the first 2 characters, when base58 encoded, are "tm"
-        base58Prefixes[PUBKEY_ADDRESS]     = {0x1D,0x25};
-        // guarantees the first 2 characters, when base58 encoded, are "t2"
-        base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBA};
-        // the first character, when base58 encoded, is "9" or "c" (as in Bitcoin)
-        base58Prefixes[SECRET_KEY]         = {0xEF};
-        // do not rely on these BIP32 prefixes; they are not specified and may change
-        base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
-        base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
-        // guarantees the first 2 characters, when base58 encoded, are "zt"
-        base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
-        // guarantees the first 4 characters, when base58 encoded, are "ZiVt"
-        base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
-        // guarantees the first 2 characters, when base58 encoded, are "ST"
-        base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
-
-        bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "ztestsapling";
-        bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewtestsapling";
-        bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivktestsapling";
-        bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-test";
-        bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewtestsapling";
-
         vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
 
         fMiningRequiresPeers = true;
@@ -517,6 +541,23 @@ public:
         consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;
         // Defined funding streams can be enabled with node config flags.
 
+        // These prefixes are the same as the testnet prefixes
+        keyInfo.base58Prefixes[PUBKEY_ADDRESS]     = {0x1D,0x25};
+        keyInfo.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBA};
+        keyInfo.base58Prefixes[SECRET_KEY]         = {0xEF};
+        // do not rely on these BIP32 prefixes; they are not specified and may change
+        keyInfo.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
+        keyInfo.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
+        keyInfo.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
+        keyInfo.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
+        keyInfo.base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
+
+        keyInfo.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "zregtestsapling";
+        keyInfo.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewregtestsapling";
+        keyInfo.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivkregtestsapling";
+        keyInfo.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-regtest";
+        keyInfo.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewregtestsapling";
+
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00");
 
@@ -552,22 +593,6 @@ public:
             0,
             0
         };
-        // These prefixes are the same as the testnet prefixes
-        base58Prefixes[PUBKEY_ADDRESS]     = {0x1D,0x25};
-        base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBA};
-        base58Prefixes[SECRET_KEY]         = {0xEF};
-        // do not rely on these BIP32 prefixes; they are not specified and may change
-        base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
-        base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
-        base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
-        base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
-        base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
-
-        bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "zregtestsapling";
-        bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewregtestsapling";
-        bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivkregtestsapling";
-        bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-regtest";
-        bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewregtestsapling";
 
         // Founders reward script expects a vector of 2-of-3 multisig addresses
         vFoundersRewardAddress = { "t2FwcEhFdNXuFMv1tcYwaBJtYVtMj8b1uTg" };
@@ -659,7 +684,8 @@ std::string CChainParams::GetFoundersRewardAddressAtHeight(int nHeight) const {
 CScript CChainParams::GetFoundersRewardScriptAtHeight(int nHeight) const {
     assert(nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight(nHeight));
 
-    CTxDestination address = DecodeDestination(GetFoundersRewardAddressAtHeight(nHeight).c_str());
+    KeyIO keyIO(*this);
+    CTxDestination address = keyIO.DecodeDestination(GetFoundersRewardAddressAtHeight(nHeight).c_str());
     assert(IsValidDestination(address));
     assert(IsScriptDestination(address));
     CScriptID scriptID = boost::get<CScriptID>(address); // address is a boost variant
diff --git a/src/chainparams.h b/src/chainparams.h
index 11dbacd96..136b40a67 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -32,6 +32,15 @@ struct CCheckpointData {
     double fTransactionsPerDay;
 };
 
+class CBaseKeyInfo : public Consensus::KeyInfo {
+public:
+    const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
+    const std::string& Bech32HRP(Bech32Type type) const { return bech32HRPs[type]; }
+
+    std::vector<unsigned char> base58Prefixes[Consensus::KeyInfo::MAX_BASE58_TYPES];
+    std::string bech32HRPs[Consensus::KeyInfo::MAX_BECH32_TYPES];
+};
+
 /**
  * CChainParams defines various tweakable parameters of a given instance of the
  * Bitcoin system. There are three: the main network on which people trade goods
@@ -39,33 +48,9 @@ struct CCheckpointData {
  * a regression test mode which is intended for private networks only. It has
  * minimal difficulty to ensure that blocks can be found instantly.
  */
-class CChainParams
+class CChainParams: public Consensus::KeyInfo 
 {
 public:
-    enum Base58Type {
-        PUBKEY_ADDRESS,
-        SCRIPT_ADDRESS,
-        SECRET_KEY,
-        EXT_PUBLIC_KEY,
-        EXT_SECRET_KEY,
-
-        ZCPAYMENT_ADDRRESS,
-        ZCSPENDING_KEY,
-        ZCVIEWING_KEY,
-
-        MAX_BASE58_TYPES
-    };
-
-    enum Bech32Type {
-        SAPLING_PAYMENT_ADDRESS,
-        SAPLING_FULL_VIEWING_KEY,
-        SAPLING_INCOMING_VIEWING_KEY,
-        SAPLING_EXTENDED_SPEND_KEY,
-        SAPLING_EXTENDED_FVK,
-
-        MAX_BECH32_TYPES
-    };
-
     const Consensus::Params& GetConsensus() const { return consensus; }
     const CMessageHeader::MessageStartChars& MessageStart() const { return pchMessageStart; }
     const std::vector<unsigned char>& AlertKey() const { return vAlertPubKey; }
@@ -93,8 +78,12 @@ public:
     /** Return the BIP70 network string (main, test or regtest) */
     std::string NetworkIDString() const { return strNetworkID; }
     const std::vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
-    const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
-    const std::string& Bech32HRP(Bech32Type type) const { return bech32HRPs[type]; }
+    const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { 
+        return keyInfo.Base58Prefix(type); 
+    }
+    const std::string& Bech32HRP(Bech32Type type) const { 
+        return keyInfo.Bech32HRP(type); 
+    }
     const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; }
     const CCheckpointData& Checkpoints() const { return checkpointData; }
     /** Return the founder's reward address and script for a given block height */
@@ -113,8 +102,7 @@ protected:
     int nDefaultPort = 0;
     uint64_t nPruneAfterHeight = 0;
     std::vector<CDNSSeedData> vSeeds;
-    std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
-    std::string bech32HRPs[MAX_BECH32_TYPES];
+    CBaseKeyInfo keyInfo;
     std::string strNetworkID;
     std::string strCurrencyUnits;
     uint32_t bip44CoinType;
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 1ddf0dc88..3623e0e48 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -142,18 +142,21 @@ namespace Consensus {
 
     FundingStream FundingStream::ParseFundingStream(
         const Consensus::Params& params,
+        const Consensus::KeyInfo& keyInfo,
         const int startHeight,
         const int endHeight,
         const std::vector<std::string>& strAddresses)
     {
+        KeyIO keyIO(keyInfo);
+
         // Parse the address strings into concrete types.
         std::vector<FundingStreamAddress> addresses;
         for (auto addr : strAddresses) {
-            auto taddr = DecodeDestination(addr);
+            auto taddr = keyIO.DecodeDestination(addr);
             if (IsValidDestination(taddr)) {
                 addresses.push_back(GetScriptForDestination(taddr));
             } else {
-                auto zaddr = DecodePaymentAddress(addr);
+                auto zaddr = keyIO.DecodePaymentAddress(addr);
                 // If the string is not a valid transparent or Sapling address, we will
                 // throw here. 
                 
@@ -166,12 +169,13 @@ namespace Consensus {
     };
 
     void Params::AddZIP207FundingStream(
+        const Consensus::KeyInfo& keyInfo,
         FundingStreamIndex idx,
         int startHeight,
         int endHeight,
         const std::vector<std::string>& strAddresses)
     {
-        vFundingStreams[idx] = FundingStream::ParseFundingStream(*this, startHeight, endHeight, strAddresses);
+        vFundingStreams[idx] = FundingStream::ParseFundingStream(*this, keyInfo, startHeight, endHeight, strAddresses);
     };
 
     FundingStreamAddress FundingStream::RecipientAddress(const Consensus::Params& params, int nHeight) const 
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 959c7f190..2c36d879d 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -101,6 +101,37 @@ enum FundingStreamError {
     INSUFFICIENT_ADDRESSES,
 };
 
+class KeyInfo 
+{
+public:
+    enum Base58Type {
+        PUBKEY_ADDRESS,
+        SCRIPT_ADDRESS,
+        SECRET_KEY,
+        EXT_PUBLIC_KEY,
+        EXT_SECRET_KEY,
+
+        ZCPAYMENT_ADDRRESS,
+        ZCSPENDING_KEY,
+        ZCVIEWING_KEY,
+
+        MAX_BASE58_TYPES
+    };
+
+    enum Bech32Type {
+        SAPLING_PAYMENT_ADDRESS,
+        SAPLING_FULL_VIEWING_KEY,
+        SAPLING_INCOMING_VIEWING_KEY,
+        SAPLING_EXTENDED_SPEND_KEY,
+        SAPLING_EXTENDED_FVK,
+
+        MAX_BECH32_TYPES
+    };
+
+    virtual const std::vector<unsigned char>& Base58Prefix(Base58Type type) const =0;
+    virtual const std::string& Bech32HRP(Bech32Type type) const =0;
+};
+
 class FundingStream
 {
 private:
@@ -123,6 +154,7 @@ public:
 
     static FundingStream ParseFundingStream(
         const Consensus::Params& params,
+        const Consensus::KeyInfo& keyInfo,
         const int startHeight,
         const int endHeight,
         const std::vector<std::string>& strAddresses);
@@ -209,6 +241,7 @@ struct Params {
     int nFundingPeriodLength;
     boost::optional<FundingStream> vFundingStreams[MAX_FUNDING_STREAMS];
     void AddZIP207FundingStream(
+        const Consensus::KeyInfo& keyInfo,
         FundingStreamIndex idx,
         int startHeight,
         int endHeight,
diff --git a/src/core_write.cpp b/src/core_write.cpp
index 89a545a99..a974f4fad 100644
--- a/src/core_write.cpp
+++ b/src/core_write.cpp
@@ -142,9 +142,10 @@ void ScriptPubKeyToUniv(const CScript& scriptPubKey,
     out.pushKV("reqSigs", nRequired);
     out.pushKV("type", GetTxnOutputType(type));
 
+    KeyIO keyIO(Params());
     UniValue a(UniValue::VARR);
     for (const CTxDestination& addr : addresses) {
-        a.push_back(EncodeDestination(addr));
+        a.push_back(keyIO.EncodeDestination(addr));
     }
     out.pushKV("addresses", a);
 }
diff --git a/src/gtest/test_foundersreward.cpp b/src/gtest/test_foundersreward.cpp
index b85b43136..3f7a7c106 100644
--- a/src/gtest/test_foundersreward.cpp
+++ b/src/gtest/test_foundersreward.cpp
@@ -42,6 +42,7 @@ TEST(FoundersRewardTest, create_testnet_2of3multisig) {
     pubkeys.resize(3);
     CPubKey newKey;
     std::vector<std::string> addresses;
+    KeyIO keyIO(Params());
     for (int i = 0; i < numKeys; i++) {
         ASSERT_TRUE(pWallet->GetKeyFromPool(newKey));
         pubkeys[0] = newKey;
@@ -61,7 +62,7 @@ TEST(FoundersRewardTest, create_testnet_2of3multisig) {
         pWallet->AddCScript(result);
         pWallet->SetAddressBook(innerID, "", "receive");
 
-        std::string address = EncodeDestination(innerID);
+        std::string address = keyIO.EncodeDestination(innerID);
         addresses.push_back(address);
     }
     
@@ -239,19 +240,22 @@ TEST(FundingStreamsRewardTest, Zip207Distribution) {
 
     int minHeight = GetLastFoundersRewardHeight(consensus) + 1;
 
+    KeyIO keyIO(Params());
     auto sk = libzcash::SaplingSpendingKey(uint256());
     for (int idx = Consensus::FIRST_FUNDING_STREAM; idx < Consensus::MAX_FUNDING_STREAMS; idx++) {
         // we can just use the same addresses for all streams, all we're trying to do here
         // is validate that the streams add up to the 20% of block reward.
+        auto shieldedAddr = keyIO.EncodePaymentAddress(sk.default_address());
         UpdateFundingStreamParameters(
             (Consensus::FundingStreamIndex) idx,
             Consensus::FundingStream::ParseFundingStream(
                 consensus,
+                Params(),
                 minHeight, 
                 minHeight + 12, 
                 {
                     "t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi",
-                    EncodePaymentAddress(sk.default_address())
+                    shieldedAddr,
                 }
             )
         );
@@ -278,15 +282,18 @@ TEST(FundingStreamsRewardTest, ParseFundingStream) {
 
     int minHeight = GetLastFoundersRewardHeight(consensus) + 1;
 
+    KeyIO keyIO(Params());
     auto sk = libzcash::SaplingSpendingKey(uint256());
+    auto shieldedAddr = keyIO.EncodePaymentAddress(sk.default_address());
     ASSERT_THROW(
         Consensus::FundingStream::ParseFundingStream(
             consensus,
+            Params(),
             minHeight, 
             minHeight + 13, 
             {
                 "t2UNzUUx8mWBCRYPRezvA363EYXyEpHokyi",
-                EncodePaymentAddress(sk.default_address())
+                shieldedAddr,
             }
         ),
         std::runtime_error
diff --git a/src/gtest/test_keys.cpp b/src/gtest/test_keys.cpp
index a74ef066d..eb2735a28 100644
--- a/src/gtest/test_keys.cpp
+++ b/src/gtest/test_keys.cpp
@@ -9,18 +9,19 @@
 TEST(Keys, EncodeAndDecodeSapling)
 {
     SelectParams(CBaseChainParams::MAIN);
+    KeyIO keyIO(Params());
 
     auto m = GetTestMasterSaplingSpendingKey();
 
     for (uint32_t i = 0; i < 1000; i++) {
         auto sk = m.Derive(i);
         {
-            std::string sk_string = EncodeSpendingKey(sk);
+            std::string sk_string = keyIO.EncodeSpendingKey(sk);
             EXPECT_EQ(
                 sk_string.substr(0, 24),
                 Params().Bech32HRP(CChainParams::SAPLING_EXTENDED_SPEND_KEY));
 
-            auto spendingkey2 = DecodeSpendingKey(sk_string);
+            auto spendingkey2 = keyIO.DecodeSpendingKey(sk_string);
             EXPECT_TRUE(IsValidSpendingKey(spendingkey2));
 
             ASSERT_TRUE(boost::get<libzcash::SaplingExtendedSpendingKey>(&spendingkey2) != nullptr);
@@ -29,12 +30,12 @@ TEST(Keys, EncodeAndDecodeSapling)
         }
         {
             auto extfvk = sk.ToXFVK();
-            std::string vk_string = EncodeViewingKey(extfvk);
+            std::string vk_string = keyIO.EncodeViewingKey(extfvk);
             EXPECT_EQ(
                 vk_string.substr(0, 7),
                 Params().Bech32HRP(CChainParams::SAPLING_EXTENDED_FVK));
 
-            auto viewingkey2 = DecodeViewingKey(vk_string);
+            auto viewingkey2 = keyIO.DecodeViewingKey(vk_string);
             EXPECT_TRUE(IsValidViewingKey(viewingkey2));
 
             ASSERT_TRUE(boost::get<libzcash::SaplingExtendedFullViewingKey>(&viewingkey2) != nullptr);
@@ -44,12 +45,12 @@ TEST(Keys, EncodeAndDecodeSapling)
         {
             auto addr = sk.DefaultAddress();
 
-            std::string addr_string = EncodePaymentAddress(addr);
+            std::string addr_string = keyIO.EncodePaymentAddress(addr);
             EXPECT_EQ(
                 addr_string.substr(0, 2),
                 Params().Bech32HRP(CChainParams::SAPLING_PAYMENT_ADDRESS));
 
-            auto paymentaddr2 = DecodePaymentAddress(addr_string);
+            auto paymentaddr2 = keyIO.DecodePaymentAddress(addr_string);
             EXPECT_TRUE(IsValidPaymentAddress(paymentaddr2));
 
             ASSERT_TRUE(boost::get<libzcash::SaplingPaymentAddress>(&paymentaddr2) != nullptr);
diff --git a/src/init.cpp b/src/init.cpp
index 4634926f1..e1ab31852 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1039,12 +1039,13 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
 
+    KeyIO keyIO(chainparams);
 #ifdef ENABLE_MINING
     if (mapArgs.count("-mineraddress")) {
-        CTxDestination addr = DecodeDestination(mapArgs["-mineraddress"]);
+        CTxDestination addr = keyIO.DecodeDestination(mapArgs["-mineraddress"]);
         if (!IsValidDestination(addr)) {
             // Try a Sapling address
-            auto zaddr = DecodePaymentAddress(mapArgs["-mineraddress"]);
+            auto zaddr = keyIO.DecodePaymentAddress(mapArgs["-mineraddress"]);
             if (!IsValidPaymentAddress(zaddr) ||
                 boost::get<libzcash::SaplingPaymentAddress>(&zaddr) == nullptr)
             {
@@ -1127,7 +1128,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
             std::vector<std::string> vStreamAddrs;
             boost::split(vStreamAddrs, vStreamParams[3], boost::is_any_of(","));
 
-            auto fs = Consensus::FundingStream::ParseFundingStream(Params().GetConsensus(), nStartHeight, nEndHeight, vStreamAddrs);
+            auto fs = Consensus::FundingStream::ParseFundingStream(
+                    Params().GetConsensus(), Params(), nStartHeight, nEndHeight, vStreamAddrs);
 
             UpdateFundingStreamParameters((Consensus::FundingStreamIndex) nFundingStreamId, fs);
         }
@@ -1586,12 +1588,12 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
  #ifdef ENABLE_WALLET
         bool minerAddressInLocalWallet = false;
         if (pwalletMain) {
-            CTxDestination addr = DecodeDestination(mapArgs["-mineraddress"]);
+            CTxDestination addr = keyIO.DecodeDestination(mapArgs["-mineraddress"]);
             if (IsValidDestination(addr)) {
                 CKeyID keyID = boost::get<CKeyID>(addr);
                 minerAddressInLocalWallet = pwalletMain->HaveKey(keyID);
             } else {
-                auto zaddr = DecodePaymentAddress(mapArgs["-mineraddress"]);
+                auto zaddr = keyIO.DecodePaymentAddress(mapArgs["-mineraddress"]);
                 minerAddressInLocalWallet = boost::apply_visitor(
                     HaveSpendingKeyForPaymentAddress(pwalletMain), zaddr);
             }
diff --git a/src/key_io.cpp b/src/key_io.cpp
index bc11197c9..9f3e9757b 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -22,21 +22,21 @@ namespace
 class DestinationEncoder : public boost::static_visitor<std::string>
 {
 private:
-    const CChainParams& m_params;
+    const Consensus::KeyInfo& keyInfo;
 
 public:
-    DestinationEncoder(const CChainParams& params) : m_params(params) {}
+    DestinationEncoder(const Consensus::KeyInfo& keyInfo) : keyInfo(keyInfo) {}
 
     std::string operator()(const CKeyID& id) const
     {
-        std::vector<unsigned char> data = m_params.Base58Prefix(CChainParams::PUBKEY_ADDRESS);
+        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::PUBKEY_ADDRESS);
         data.insert(data.end(), id.begin(), id.end());
         return EncodeBase58Check(data);
     }
 
     std::string operator()(const CScriptID& id) const
     {
-        std::vector<unsigned char> data = m_params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
+        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::SCRIPT_ADDRESS);
         data.insert(data.end(), id.begin(), id.end());
         return EncodeBase58Check(data);
     }
@@ -44,43 +44,19 @@ public:
     std::string operator()(const CNoDestination& no) const { return {}; }
 };
 
-CTxDestination DecodeDestination(const std::string& str, const CChainParams& params)
-{
-    std::vector<unsigned char> data;
-    uint160 hash;
-    if (DecodeBase58Check(str, data)) {
-        // base58-encoded Bitcoin addresses.
-        // Public-key-hash-addresses have version 0 (or 111 testnet).
-        // The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
-        const std::vector<unsigned char>& pubkey_prefix = params.Base58Prefix(CChainParams::PUBKEY_ADDRESS);
-        if (data.size() == hash.size() + pubkey_prefix.size() && std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin())) {
-            std::copy(data.begin() + pubkey_prefix.size(), data.end(), hash.begin());
-            return CKeyID(hash);
-        }
-        // Script-hash-addresses have version 5 (or 196 testnet).
-        // The data vector contains RIPEMD160(SHA256(cscript)), where cscript is the serialized redemption script.
-        const std::vector<unsigned char>& script_prefix = params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
-        if (data.size() == hash.size() + script_prefix.size() && std::equal(script_prefix.begin(), script_prefix.end(), data.begin())) {
-            std::copy(data.begin() + script_prefix.size(), data.end(), hash.begin());
-            return CScriptID(hash);
-        }
-    }
-    return CNoDestination();
-}
-
 class PaymentAddressEncoder : public boost::static_visitor<std::string>
 {
 private:
-    const CChainParams& m_params;
+    const Consensus::KeyInfo& keyInfo;
 
 public:
-    PaymentAddressEncoder(const CChainParams& params) : m_params(params) {}
+    PaymentAddressEncoder(const Consensus::KeyInfo& keyInfo) : keyInfo(keyInfo) {}
 
     std::string operator()(const libzcash::SproutPaymentAddress& zaddr) const
     {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << zaddr;
-        std::vector<unsigned char> data = m_params.Base58Prefix(CChainParams::ZCPAYMENT_ADDRRESS);
+        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::ZCPAYMENT_ADDRRESS);
         data.insert(data.end(), ss.begin(), ss.end());
         return EncodeBase58Check(data);
     }
@@ -95,7 +71,7 @@ public:
         // See calculation comment below
         data.reserve((seraddr.size() * 8 + 4) / 5);
         ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, seraddr.begin(), seraddr.end());
-        return bech32::Encode(m_params.Bech32HRP(CChainParams::SAPLING_PAYMENT_ADDRESS), data);
+        return bech32::Encode(keyInfo.Bech32HRP(Consensus::KeyInfo::SAPLING_PAYMENT_ADDRESS), data);
     }
 
     std::string operator()(const libzcash::InvalidEncoding& no) const { return {}; }
@@ -104,16 +80,16 @@ public:
 class ViewingKeyEncoder : public boost::static_visitor<std::string>
 {
 private:
-    const CChainParams& m_params;
+    const Consensus::KeyInfo& keyInfo;
 
 public:
-    ViewingKeyEncoder(const CChainParams& params) : m_params(params) {}
+    ViewingKeyEncoder(const Consensus::KeyInfo& keyInfo) : keyInfo(keyInfo) {}
 
     std::string operator()(const libzcash::SproutViewingKey& vk) const
     {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << vk;
-        std::vector<unsigned char> data = m_params.Base58Prefix(CChainParams::ZCVIEWING_KEY);
+        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::ZCVIEWING_KEY);
         data.insert(data.end(), ss.begin(), ss.end());
         std::string ret = EncodeBase58Check(data);
         memory_cleanse(data.data(), data.size());
@@ -130,7 +106,7 @@ public:
         // See calculation comment below
         data.reserve((serkey.size() * 8 + 4) / 5);
         ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, serkey.begin(), serkey.end());
-        std::string ret = bech32::Encode(m_params.Bech32HRP(CChainParams::SAPLING_EXTENDED_FVK), data);
+        std::string ret = bech32::Encode(keyInfo.Bech32HRP(Consensus::KeyInfo::SAPLING_EXTENDED_FVK), data);
         memory_cleanse(serkey.data(), serkey.size());
         memory_cleanse(data.data(), data.size());
         return ret;
@@ -142,16 +118,16 @@ public:
 class SpendingKeyEncoder : public boost::static_visitor<std::string>
 {
 private:
-    const CChainParams& m_params;
+    const Consensus::KeyInfo& keyInfo;
 
 public:
-    SpendingKeyEncoder(const CChainParams& params) : m_params(params) {}
+    SpendingKeyEncoder(const Consensus::KeyInfo& keyInfo) : keyInfo(keyInfo) {}
 
     std::string operator()(const libzcash::SproutSpendingKey& zkey) const
     {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << zkey;
-        std::vector<unsigned char> data = m_params.Base58Prefix(CChainParams::ZCSPENDING_KEY);
+        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::ZCSPENDING_KEY);
         data.insert(data.end(), ss.begin(), ss.end());
         std::string ret = EncodeBase58Check(data);
         memory_cleanse(data.data(), data.size());
@@ -168,7 +144,7 @@ public:
         // See calculation comment below
         data.reserve((serkey.size() * 8 + 4) / 5);
         ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, serkey.begin(), serkey.end());
-        std::string ret = bech32::Encode(m_params.Bech32HRP(CChainParams::SAPLING_EXTENDED_SPEND_KEY), data);
+        std::string ret = bech32::Encode(keyInfo.Bech32HRP(Consensus::KeyInfo::SAPLING_EXTENDED_SPEND_KEY), data);
         memory_cleanse(serkey.data(), serkey.size());
         memory_cleanse(data.data(), data.size());
         return ret;
@@ -186,12 +162,36 @@ const size_t ConvertedSaplingExtendedFullViewingKeySize = (ZIP32_XFVK_SIZE * 8 +
 const size_t ConvertedSaplingExtendedSpendingKeySize = (ZIP32_XSK_SIZE * 8 + 4) / 5;
 } // namespace
 
-CKey DecodeSecret(const std::string& str)
+CTxDestination KeyIO::DecodeDestination(const std::string& str)
+{
+    std::vector<unsigned char> data;
+    uint160 hash;
+    if (DecodeBase58Check(str, data)) {
+        // base58-encoded Bitcoin addresses.
+        // Public-key-hash-addresses have version 0 (or 111 testnet).
+        // The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
+        const std::vector<unsigned char>& pubkey_prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::PUBKEY_ADDRESS);
+        if (data.size() == hash.size() + pubkey_prefix.size() && std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin())) {
+            std::copy(data.begin() + pubkey_prefix.size(), data.end(), hash.begin());
+            return CKeyID(hash);
+        }
+        // Script-hash-addresses have version 5 (or 196 testnet).
+        // The data vector contains RIPEMD160(SHA256(cscript)), where cscript is the serialized redemption script.
+        const std::vector<unsigned char>& script_prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::SCRIPT_ADDRESS);
+        if (data.size() == hash.size() + script_prefix.size() && std::equal(script_prefix.begin(), script_prefix.end(), data.begin())) {
+            std::copy(data.begin() + script_prefix.size(), data.end(), hash.begin());
+            return CScriptID(hash);
+        }
+    }
+    return CNoDestination();
+};
+
+CKey KeyIO::DecodeSecret(const std::string& str)
 {
     CKey key;
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& privkey_prefix = Params().Base58Prefix(CChainParams::SECRET_KEY);
+        const std::vector<unsigned char>& privkey_prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::SECRET_KEY);
         if ((data.size() == 32 + privkey_prefix.size() || (data.size() == 33 + privkey_prefix.size() && data.back() == 1)) &&
             std::equal(privkey_prefix.begin(), privkey_prefix.end(), data.begin())) {
             bool compressed = data.size() == 33 + privkey_prefix.size();
@@ -202,10 +202,10 @@ CKey DecodeSecret(const std::string& str)
     return key;
 }
 
-std::string EncodeSecret(const CKey& key)
+std::string KeyIO::EncodeSecret(const CKey& key)
 {
     assert(key.IsValid());
-    std::vector<unsigned char> data = Params().Base58Prefix(CChainParams::SECRET_KEY);
+    std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::SECRET_KEY);
     data.insert(data.end(), key.begin(), key.end());
     if (key.IsCompressed()) {
         data.push_back(1);
@@ -215,12 +215,12 @@ std::string EncodeSecret(const CKey& key)
     return ret;
 }
 
-CExtPubKey DecodeExtPubKey(const std::string& str)
+CExtPubKey KeyIO::DecodeExtPubKey(const std::string& str)
 {
     CExtPubKey key;
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& prefix = Params().Base58Prefix(CChainParams::EXT_PUBLIC_KEY);
+        const std::vector<unsigned char>& prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::EXT_PUBLIC_KEY);
         if (data.size() == BIP32_EXTKEY_SIZE + prefix.size() && std::equal(prefix.begin(), prefix.end(), data.begin())) {
             key.Decode(data.data() + prefix.size());
         }
@@ -228,9 +228,9 @@ CExtPubKey DecodeExtPubKey(const std::string& str)
     return key;
 }
 
-std::string EncodeExtPubKey(const CExtPubKey& key)
+std::string KeyIO::EncodeExtPubKey(const CExtPubKey& key)
 {
-    std::vector<unsigned char> data = Params().Base58Prefix(CChainParams::EXT_PUBLIC_KEY);
+    std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::EXT_PUBLIC_KEY);
     size_t size = data.size();
     data.resize(size + BIP32_EXTKEY_SIZE);
     key.Encode(data.data() + size);
@@ -238,12 +238,12 @@ std::string EncodeExtPubKey(const CExtPubKey& key)
     return ret;
 }
 
-CExtKey DecodeExtKey(const std::string& str)
+CExtKey KeyIO::DecodeExtKey(const std::string& str)
 {
     CExtKey key;
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& prefix = Params().Base58Prefix(CChainParams::EXT_SECRET_KEY);
+        const std::vector<unsigned char>& prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::EXT_SECRET_KEY);
         if (data.size() == BIP32_EXTKEY_SIZE + prefix.size() && std::equal(prefix.begin(), prefix.end(), data.begin())) {
             key.Decode(data.data() + prefix.size());
         }
@@ -251,9 +251,9 @@ CExtKey DecodeExtKey(const std::string& str)
     return key;
 }
 
-std::string EncodeExtKey(const CExtKey& key)
+std::string KeyIO::EncodeExtKey(const CExtKey& key)
 {
-    std::vector<unsigned char> data = Params().Base58Prefix(CChainParams::EXT_SECRET_KEY);
+    std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::EXT_SECRET_KEY);
     size_t size = data.size();
     data.resize(size + BIP32_EXTKEY_SIZE);
     key.Encode(data.data() + size);
@@ -262,40 +262,31 @@ std::string EncodeExtKey(const CExtKey& key)
     return ret;
 }
 
-std::string EncodeDestination(const CTxDestination& dest)
+std::string KeyIO::EncodeDestination(const CTxDestination& dest)
 {
-    return boost::apply_visitor(DestinationEncoder(Params()), dest);
+    return boost::apply_visitor(DestinationEncoder(keyInfo), dest);
 }
 
-CTxDestination DecodeDestination(const std::string& str)
+bool KeyIO::IsValidDestinationString(const std::string& str)
 {
-    return DecodeDestination(str, Params());
+    return IsValidDestination(DecodeDestination(str));
 }
 
-bool IsValidDestinationString(const std::string& str, const CChainParams& params)
+std::string KeyIO::EncodePaymentAddress(const libzcash::PaymentAddress& zaddr)
 {
-    return IsValidDestination(DecodeDestination(str, params));
-}
-
-bool IsValidDestinationString(const std::string& str)
-{
-    return IsValidDestinationString(str, Params());
-}
-
-std::string EncodePaymentAddress(const libzcash::PaymentAddress& zaddr)
-{
-    return boost::apply_visitor(PaymentAddressEncoder(Params()), zaddr);
+    return boost::apply_visitor(PaymentAddressEncoder(keyInfo), zaddr);
 }
 
 template<typename T1, typename T2, typename T3>
 T1 DecodeAny(
+    const Consensus::KeyInfo& keyInfo,
     const std::string& str,
-    std::pair<CChainParams::Base58Type, size_t> sprout,
-    std::pair<CChainParams::Bech32Type, size_t> sapling)
+    std::pair<Consensus::KeyInfo::Base58Type, size_t> sprout,
+    std::pair<Consensus::KeyInfo::Bech32Type, size_t> sapling)
 {
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& prefix = Params().Base58Prefix(sprout.first);
+        const std::vector<unsigned char>& prefix = keyInfo.Base58Prefix(sprout.first);
         if ((data.size() == sprout.second + prefix.size()) &&
             std::equal(prefix.begin(), prefix.end(), data.begin())) {
             CSerializeData serialized(data.begin() + prefix.size(), data.end());
@@ -310,7 +301,7 @@ T1 DecodeAny(
 
     data.clear();
     auto bech = bech32::Decode(str);
-    if (bech.first == Params().Bech32HRP(sapling.first) &&
+    if (bech.first == keyInfo.Bech32HRP(sapling.first) &&
         bech.second.size() == sapling.second) {
         // Bech32 decoding
         data.reserve((bech.second.size() * 5) / 8);
@@ -327,50 +318,53 @@ T1 DecodeAny(
     return libzcash::InvalidEncoding();
 }
 
-libzcash::PaymentAddress DecodePaymentAddress(const std::string& str)
+libzcash::PaymentAddress KeyIO::DecodePaymentAddress(const std::string& str)
 {
     return DecodeAny<libzcash::PaymentAddress,
         libzcash::SproutPaymentAddress,
         libzcash::SaplingPaymentAddress>(
+            keyInfo,
             str,
-            std::make_pair(CChainParams::ZCPAYMENT_ADDRRESS, libzcash::SerializedSproutPaymentAddressSize),
-            std::make_pair(CChainParams::SAPLING_PAYMENT_ADDRESS, ConvertedSaplingPaymentAddressSize)
+            std::make_pair(Consensus::KeyInfo::ZCPAYMENT_ADDRRESS, libzcash::SerializedSproutPaymentAddressSize),
+            std::make_pair(Consensus::KeyInfo::SAPLING_PAYMENT_ADDRESS, ConvertedSaplingPaymentAddressSize)
         );
 }
 
-bool IsValidPaymentAddressString(const std::string& str) {
+bool KeyIO::IsValidPaymentAddressString(const std::string& str) {
     return IsValidPaymentAddress(DecodePaymentAddress(str));
 }
 
-std::string EncodeViewingKey(const libzcash::ViewingKey& vk)
+std::string KeyIO::EncodeViewingKey(const libzcash::ViewingKey& vk)
 {
-    return boost::apply_visitor(ViewingKeyEncoder(Params()), vk);
+    return boost::apply_visitor(ViewingKeyEncoder(keyInfo), vk);
 }
 
-libzcash::ViewingKey DecodeViewingKey(const std::string& str)
+libzcash::ViewingKey KeyIO::DecodeViewingKey(const std::string& str)
 {
     return DecodeAny<libzcash::ViewingKey,
         libzcash::SproutViewingKey,
         libzcash::SaplingExtendedFullViewingKey>(
+            keyInfo,
             str,
-            std::make_pair(CChainParams::ZCVIEWING_KEY, libzcash::SerializedSproutViewingKeySize),
-            std::make_pair(CChainParams::SAPLING_EXTENDED_FVK, ConvertedSaplingExtendedFullViewingKeySize)
+            std::make_pair(Consensus::KeyInfo::ZCVIEWING_KEY, libzcash::SerializedSproutViewingKeySize),
+            std::make_pair(Consensus::KeyInfo::SAPLING_EXTENDED_FVK, ConvertedSaplingExtendedFullViewingKeySize)
         );
 }
 
-std::string EncodeSpendingKey(const libzcash::SpendingKey& zkey)
+std::string KeyIO::EncodeSpendingKey(const libzcash::SpendingKey& zkey)
 {
-    return boost::apply_visitor(SpendingKeyEncoder(Params()), zkey);
+    return boost::apply_visitor(SpendingKeyEncoder(keyInfo), zkey);
 }
 
-libzcash::SpendingKey DecodeSpendingKey(const std::string& str)
+libzcash::SpendingKey KeyIO::DecodeSpendingKey(const std::string& str)
 {
 
     return DecodeAny<libzcash::SpendingKey,
         libzcash::SproutSpendingKey,
         libzcash::SaplingExtendedSpendingKey>(
+            keyInfo,
             str,
-            std::make_pair(CChainParams::ZCSPENDING_KEY, libzcash::SerializedSproutSpendingKeySize),
-            std::make_pair(CChainParams::SAPLING_EXTENDED_SPEND_KEY, ConvertedSaplingExtendedSpendingKeySize)
+            std::make_pair(Consensus::KeyInfo::ZCSPENDING_KEY, libzcash::SerializedSproutSpendingKeySize),
+            std::make_pair(Consensus::KeyInfo::SAPLING_EXTENDED_SPEND_KEY, ConvertedSaplingExtendedSpendingKeySize)
         );
 }
diff --git a/src/key_io.h b/src/key_io.h
index 64a26e979..68f538b5b 100644
--- a/src/key_io.h
+++ b/src/key_io.h
@@ -15,27 +15,35 @@
 
 #include <string>
 
-CKey DecodeSecret(const std::string& str);
-std::string EncodeSecret(const CKey& key);
+class KeyIO {
+private:
+    const Consensus::KeyInfo& keyInfo;
 
-CExtKey DecodeExtKey(const std::string& str);
-std::string EncodeExtKey(const CExtKey& extkey);
-CExtPubKey DecodeExtPubKey(const std::string& str);
-std::string EncodeExtPubKey(const CExtPubKey& extpubkey);
+public:
+    KeyIO(const Consensus::KeyInfo& keyInfo): keyInfo(keyInfo) { }
 
-std::string EncodeDestination(const CTxDestination& dest);
-CTxDestination DecodeDestination(const std::string& str);
-bool IsValidDestinationString(const std::string& str);
-bool IsValidDestinationString(const std::string& str, const CChainParams& params);
+    CKey DecodeSecret(const std::string& str);
+    std::string EncodeSecret(const CKey& key);
 
-std::string EncodePaymentAddress(const libzcash::PaymentAddress& zaddr);
-libzcash::PaymentAddress DecodePaymentAddress(const std::string& str);
-bool IsValidPaymentAddressString(const std::string& str);
+    CExtKey DecodeExtKey(const std::string& str);
+    std::string EncodeExtKey(const CExtKey& extkey);
+    CExtPubKey DecodeExtPubKey(const std::string& str);
+    std::string EncodeExtPubKey(const CExtPubKey& extpubkey);
 
-std::string EncodeViewingKey(const libzcash::ViewingKey& vk);
-libzcash::ViewingKey DecodeViewingKey(const std::string& str);
+    std::string EncodeDestination(const CTxDestination& dest);
+    CTxDestination DecodeDestination(const std::string& str);
 
-std::string EncodeSpendingKey(const libzcash::SpendingKey& zkey);
-libzcash::SpendingKey DecodeSpendingKey(const std::string& str);
+    bool IsValidDestinationString(const std::string& str);
+
+    std::string EncodePaymentAddress(const libzcash::PaymentAddress& zaddr);
+    libzcash::PaymentAddress DecodePaymentAddress(const std::string& str);
+    bool IsValidPaymentAddressString(const std::string& str);
+
+    std::string EncodeViewingKey(const libzcash::ViewingKey& vk);
+    libzcash::ViewingKey DecodeViewingKey(const std::string& str);
+
+    std::string EncodeSpendingKey(const libzcash::SpendingKey& zkey);
+    libzcash::SpendingKey DecodeSpendingKey(const std::string& str);
+};
 
 #endif // BITCOIN_KEYIO_H
diff --git a/src/miner.cpp b/src/miner.cpp
index 8897413e1..ef1651a6c 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -645,9 +645,11 @@ class MinerAddressScript : public CReserveScript
 
 void GetMinerAddress(MinerAddress &minerAddress)
 {
+    KeyIO keyIO(Params());
+
     // Try a transparent address first
     auto mAddrArg = GetArg("-mineraddress", "");
-    CTxDestination addr = DecodeDestination(mAddrArg);
+    CTxDestination addr = keyIO.DecodeDestination(mAddrArg);
     if (IsValidDestination(addr)) {
         boost::shared_ptr<MinerAddressScript> mAddr(new MinerAddressScript());
         CKeyID keyID = boost::get<CKeyID>(addr);
@@ -656,7 +658,7 @@ void GetMinerAddress(MinerAddress &minerAddress)
         minerAddress = mAddr;
     } else {
         // Try a Sapling address
-        auto zaddr = DecodePaymentAddress(mAddrArg);
+        auto zaddr = keyIO.DecodePaymentAddress(mAddrArg);
         if (IsValidPaymentAddress(zaddr)) {
             if (boost::get<libzcash::SaplingPaymentAddress>(&zaddr) != nullptr) {
                 minerAddress = boost::get<libzcash::SaplingPaymentAddress>(zaddr);
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
index 9ae5a08a8..307572341 100644
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -143,6 +143,7 @@ UniValue blockToDeltasJSON(const CBlock& block, const CBlockIndex* blockindex)
     result.pushKV("version", block.nVersion);
     result.pushKV("merkleroot", block.hashMerkleRoot.GetHex());
 
+    KeyIO keyIO(Params());
     UniValue deltas(UniValue::VARR);
     for (unsigned int i = 0; i < block.vtx.size(); i++) {
         const CTransaction &tx = block.vtx[i];
@@ -165,7 +166,7 @@ UniValue blockToDeltasJSON(const CBlock& block, const CBlockIndex* blockindex)
                 }
                 CTxDestination dest = DestFromAddressHash(spentInfo.addressType, spentInfo.addressHash);
                 if (IsValidDestination(dest)) {
-                    delta.pushKV("address", EncodeDestination(dest));
+                    delta.pushKV("address", keyIO.EncodeDestination(dest));
                 }
                 delta.pushKV("satoshis", -1 * spentInfo.satoshis);
                 delta.pushKV("index", (int)j);
@@ -190,9 +191,9 @@ UniValue blockToDeltasJSON(const CBlock& block, const CBlockIndex* blockindex)
                 dest = CKeyID(addrhash);
             }
             if (IsValidDestination(dest)) {
-                delta.pushKV("address", EncodeDestination(dest));
+                delta.pushKV("address", keyIO.EncodeDestination(dest));
             }
-            delta.pushKV("address", EncodeDestination(dest));
+            delta.pushKV("address", keyIO.EncodeDestination(dest));
             delta.pushKV("satoshis", out.nValue);
             delta.pushKV("index", (int)k);
 
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index d3179ae13..51bf83a41 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -905,7 +905,7 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
         auto elems = Consensus::GetActiveFundingStreams(nHeight, consensus);
         for (auto elem : elems) {
             CAmount value = elem.Value(nBlockSubsidy);
-            fundingstreams.pushKV(elem.recipient, value);
+            fundingstreams.pushKV(elem.recipient, (double) value / COIN);
             nMinerReward -= value;
         }
         result.pushKV("fundingstreams", fundingstreams);
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp
index a6fb58f7e..28d9a4780 100644
--- a/src/rpc/misc.cpp
+++ b/src/rpc/misc.cpp
@@ -127,6 +127,7 @@ public:
     }
 
     UniValue operator()(const CScriptID &scriptID) const {
+        KeyIO keyIO(Params());
         UniValue obj(UniValue::VOBJ);
         CScript subscript;
         obj.pushKV("isscript", true);
@@ -139,7 +140,7 @@ public:
             obj.pushKV("hex", HexStr(subscript.begin(), subscript.end()));
             UniValue a(UniValue::VARR);
             for (const CTxDestination& addr : addresses) {
-                a.push_back(EncodeDestination(addr));
+                a.push_back(keyIO.EncodeDestination(addr));
             }
             obj.pushKV("addresses", a);
             if (whichType == TX_MULTISIG)
@@ -180,14 +181,15 @@ UniValue validateaddress(const UniValue& params, bool fHelp)
     LOCK(cs_main);
 #endif
 
-    CTxDestination dest = DecodeDestination(params[0].get_str());
+    KeyIO keyIO(Params());
+    CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
     bool isValid = IsValidDestination(dest);
 
     UniValue ret(UniValue::VOBJ);
     ret.pushKV("isvalid", isValid);
     if (isValid)
     {
-        std::string currentAddress = EncodeDestination(dest);
+        std::string currentAddress = keyIO.EncodeDestination(dest);
         ret.pushKV("address", currentAddress);
 
         CScript scriptPubKey = GetScriptForDestination(dest);
@@ -271,8 +273,9 @@ UniValue z_validateaddress(const UniValue& params, bool fHelp)
     LOCK(cs_main);
 #endif
 
+    KeyIO keyIO(Params());
     string strAddress = params[0].get_str();
-    auto address = DecodePaymentAddress(strAddress);
+    auto address = keyIO.DecodePaymentAddress(strAddress);
     bool isValid = IsValidPaymentAddress(address);
 
     UniValue ret(UniValue::VOBJ);
@@ -304,6 +307,9 @@ CScript _createmultisig_redeemScript(const UniValue& params)
                       "(got %u keys, but need at least %d to redeem)", keys.size(), nRequired));
     if (keys.size() > 16)
         throw runtime_error("Number of addresses involved in the multisignature address creation > 16\nReduce the number");
+
+    KeyIO keyIO(Params());
+
     std::vector<CPubKey> pubkeys;
     pubkeys.resize(keys.size());
     for (unsigned int i = 0; i < keys.size(); i++)
@@ -311,7 +317,7 @@ CScript _createmultisig_redeemScript(const UniValue& params)
         const std::string& ks = keys[i].get_str();
 #ifdef ENABLE_WALLET
         // Case 1: Bitcoin address and we have full public key:
-        CTxDestination dest = DecodeDestination(ks);
+        CTxDestination dest = keyIO.DecodeDestination(ks);
         if (pwalletMain && IsValidDestination(dest)) {
             const CKeyID *keyID = boost::get<CKeyID>(&dest);
             if (!keyID) {
@@ -385,8 +391,9 @@ UniValue createmultisig(const UniValue& params, bool fHelp)
     CScript inner = _createmultisig_redeemScript(params);
     CScriptID innerID(inner);
 
+    KeyIO keyIO(Params());
     UniValue result(UniValue::VOBJ);
-    result.pushKV("address", EncodeDestination(innerID));
+    result.pushKV("address", keyIO.EncodeDestination(innerID));
     result.pushKV("redeemScript", HexStr(inner.begin(), inner.end()));
 
     return result;
@@ -421,7 +428,8 @@ UniValue verifymessage(const UniValue& params, bool fHelp)
     string strSign     = params[1].get_str();
     string strMessage  = params[2].get_str();
 
-    CTxDestination destination = DecodeDestination(strAddress);
+    KeyIO keyIO(Params());
+    CTxDestination destination = keyIO.DecodeDestination(strAddress);
     if (!IsValidDestination(destination)) {
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid address");
     }
@@ -506,10 +514,11 @@ UniValue getexperimentalfeatures(const UniValue& params, bool fHelp)
 static bool getAddressFromIndex(
     int type, const uint160 &hash, std::string &address)
 {
+    KeyIO keyIO(Params());
     if (type == CScript::P2SH) {
-        address = EncodeDestination(CScriptID(hash));
+        address = keyIO.EncodeDestination(CScriptID(hash));
     } else if (type == CScript::P2PKH) {
-        address = EncodeDestination(CKeyID(hash));
+        address = keyIO.EncodeDestination(CKeyID(hash));
     } else {
         return false;
     }
@@ -560,8 +569,10 @@ static bool getAddressesFromParams(
     } else {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid address");
     }
+
+    KeyIO keyIO(Params());
     for (const auto& it : param_addresses) {
-        CTxDestination address = DecodeDestination(it);
+        CTxDestination address = keyIO.DecodeDestination(it);
         uint160 hashBytes;
         int type = 0;
         if (!getIndexKey(address, hashBytes, type)) {
diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp
index 19543d1f4..b238a371e 100644
--- a/src/rpc/rawtransaction.cpp
+++ b/src/rpc/rawtransaction.cpp
@@ -51,9 +51,10 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, UniValue& out, bool fInclud
     out.pushKV("reqSigs", nRequired);
     out.pushKV("type", GetTxnOutputType(type));
 
+    KeyIO keyIO(Params());
     UniValue a(UniValue::VARR);
     for (const CTxDestination& addr : addresses) {
-        a.push_back(EncodeDestination(addr));
+        a.push_back(keyIO.EncodeDestination(addr));
     }
     out.pushKV("addresses", a);
 }
@@ -161,6 +162,8 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
     if (tx.fOverwintered) {
         entry.pushKV("expiryheight", (int64_t)tx.nExpiryHeight);
     }
+
+    KeyIO keyIO(Params());
     UniValue vin(UniValue::VARR);
     BOOST_FOREACH(const CTxIn& txin, tx.vin) {
         UniValue in(UniValue::VOBJ);
@@ -184,7 +187,7 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, UniValue& entry)
                 CTxDestination dest =
                     DestFromAddressHash(spentInfo.addressType, spentInfo.addressHash);
                 if (IsValidDestination(dest)) {
-                    in.pushKV("address", EncodeDestination(dest));
+                    in.pushKV("address", keyIO.EncodeDestination(dest));
                 }
             }
         }
@@ -585,10 +588,11 @@ UniValue createrawtransaction(const UniValue& params, bool fHelp)
         rawTx.vin.push_back(in);
     }
 
+    KeyIO keyIO(Params());
     std::set<CTxDestination> destinations;
     vector<string> addrList = sendTo.getKeys();
     for (const std::string& name_ : addrList) {
-        CTxDestination destination = DecodeDestination(name_);
+        CTxDestination destination = keyIO.DecodeDestination(name_);
         if (!IsValidDestination(destination)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash address: ") + name_);
         }
@@ -740,7 +744,8 @@ UniValue decodescript(const UniValue& params, bool fHelp)
     }
     ScriptPubKeyToJSON(script, r, false);
 
-    r.pushKV("p2sh", EncodeDestination(CScriptID(script)));
+    KeyIO keyIO(Params());
+    r.pushKV("p2sh", keyIO.EncodeDestination(CScriptID(script)));
     return r;
 }
 
@@ -865,6 +870,8 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
         view.SetBackend(viewDummy); // switch back to avoid locking mempool for too long
     }
 
+    KeyIO keyIO(Params());
+
     bool fGivenKeys = false;
     CBasicKeyStore tempKeystore;
     if (params.size() > 2 && !params[2].isNull()) {
@@ -872,7 +879,7 @@ UniValue signrawtransaction(const UniValue& params, bool fHelp)
         UniValue keys = params[2].get_array();
         for (size_t idx = 0; idx < keys.size(); idx++) {
             UniValue k = keys[idx];
-            CKey key = DecodeSecret(k.get_str());
+            CKey key = keyIO.DecodeSecret(k.get_str());
             if (!key.IsValid())
                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key");
             tempKeystore.AddKey(key);
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
index f7a6c9e39..8345c35e5 100644
--- a/src/test/base58_tests.cpp
+++ b/src/test/base58_tests.cpp
@@ -100,26 +100,28 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_parse)
         } else {
             SelectParams(CBaseChainParams::MAIN);
         }
+
+        KeyIO keyIO(Params());
         if (isPrivkey) {
             bool isCompressed = find_value(metadata, "isCompressed").get_bool();
             // Must be valid private key
-            privkey = DecodeSecret(exp_base58string);
+            privkey = keyIO.DecodeSecret(exp_base58string);
             BOOST_CHECK_MESSAGE(privkey.IsValid(), "!IsValid:" + strTest);
             BOOST_CHECK_MESSAGE(privkey.IsCompressed() == isCompressed, "compressed mismatch:" + strTest);
             BOOST_CHECK_MESSAGE(privkey.size() == exp_payload.size() && std::equal(privkey.begin(), privkey.end(), exp_payload.begin()), "key mismatch:" + strTest);
 
             // Private key must be invalid public key
-            destination = DecodeDestination(exp_base58string);
+            destination = keyIO.DecodeDestination(exp_base58string);
             BOOST_CHECK_MESSAGE(!IsValidDestination(destination), "IsValid privkey as pubkey:" + strTest);
         } else {
             // Must be valid public key
-            destination = DecodeDestination(exp_base58string);
+            destination = keyIO.DecodeDestination(exp_base58string);
             CScript script = GetScriptForDestination(destination);
             BOOST_CHECK_MESSAGE(IsValidDestination(destination), "!IsValid:" + strTest);
             BOOST_CHECK_EQUAL(HexStr(script), HexStr(exp_payload));
 
             // Public key must be invalid private key
-            privkey = DecodeSecret(exp_base58string);
+            privkey = keyIO.DecodeSecret(exp_base58string);
             BOOST_CHECK_MESSAGE(!privkey.IsValid(), "IsValid pubkey as privkey:" + strTest);
         }
     }
@@ -148,17 +150,19 @@ BOOST_AUTO_TEST_CASE(base58_keys_valid_gen)
         } else {
             SelectParams(CBaseChainParams::MAIN);
         }
+
+        KeyIO keyIO(Params());
         if (isPrivkey) {
             bool isCompressed = find_value(metadata, "isCompressed").get_bool();
             CKey key;
             key.Set(exp_payload.begin(), exp_payload.end(), isCompressed);
             assert(key.IsValid());
-            BOOST_CHECK_MESSAGE(EncodeSecret(key) == exp_base58string, "result mismatch: " + strTest);
+            BOOST_CHECK_MESSAGE(keyIO.EncodeSecret(key) == exp_base58string, "result mismatch: " + strTest);
         } else {
             CTxDestination dest;
             CScript exp_script(exp_payload.begin(), exp_payload.end());
             ExtractDestination(exp_script, dest);
-            std::string address = EncodeDestination(dest);
+            std::string address = keyIO.EncodeDestination(dest);
             BOOST_CHECK_EQUAL(address, exp_base58string);
         }
     }
@@ -173,6 +177,7 @@ BOOST_AUTO_TEST_CASE(base58_keys_invalid)
     CKey privkey;
     CTxDestination destination;
 
+    KeyIO keyIO(Params());
     for (size_t idx = 0; idx < tests.size(); idx++) {
         UniValue test = tests[idx];
         std::string strTest = test.write();
@@ -184,9 +189,9 @@ BOOST_AUTO_TEST_CASE(base58_keys_invalid)
         std::string exp_base58string = test[0].get_str();
 
         // must be invalid as public and as private key
-        destination = DecodeDestination(exp_base58string);
+        destination = keyIO.DecodeDestination(exp_base58string);
         BOOST_CHECK_MESSAGE(!IsValidDestination(destination), "IsValid pubkey:" + strTest);
-        privkey = DecodeSecret(exp_base58string);
+        privkey = keyIO.DecodeSecret(exp_base58string);
         BOOST_CHECK_MESSAGE(!privkey.IsValid(), "IsValid privkey:" + strTest);
     }
 }
diff --git a/src/test/bip32_tests.cpp b/src/test/bip32_tests.cpp
index 104173b19..3e3a00735 100644
--- a/src/test/bip32_tests.cpp
+++ b/src/test/bip32_tests.cpp
@@ -84,18 +84,19 @@ void RunTest(const TestVector &test) {
     CExtPubKey pubkey;
     key.SetMaster(&seed[0], seed.size());
     pubkey = key.Neuter();
+    KeyIO keyIO(Params());
     BOOST_FOREACH(const TestDerivation &derive, test.vDerive) {
         unsigned char data[74];
         key.Encode(data);
         pubkey.Encode(data);
 
         // Test private key
-        BOOST_CHECK(EncodeExtKey(key) == derive.prv);
-        BOOST_CHECK(DecodeExtKey(derive.prv) == key); //ensure a base58 decoded key also matches
+        BOOST_CHECK(keyIO.EncodeExtKey(key) == derive.prv);
+        BOOST_CHECK(keyIO.DecodeExtKey(derive.prv) == key); //ensure a base58 decoded key also matches
 
         // Test public key
-        BOOST_CHECK(EncodeExtPubKey(pubkey) == derive.pub);
-        BOOST_CHECK(DecodeExtPubKey(derive.pub) == pubkey); //ensure a base58 decoded pubkey also matches
+        BOOST_CHECK(keyIO.EncodeExtPubKey(pubkey) == derive.pub);
+        BOOST_CHECK(keyIO.DecodeExtPubKey(derive.pub) == pubkey); //ensure a base58 decoded pubkey also matches
 
         // Derive new keys
         CExtKey keyNew;
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
index ef9c4cd28..377f5b614 100644
--- a/src/test/bloom_tests.cpp
+++ b/src/test/bloom_tests.cpp
@@ -86,8 +86,9 @@ BOOST_AUTO_TEST_CASE(bloom_create_insert_serialize_with_tweak)
 
 BOOST_AUTO_TEST_CASE(bloom_create_insert_key)
 {
+    KeyIO keyIO(Params());
     std::string strSecret = std::string("5Kg1gnAjaLfKiwhhPpGS3QfRg2m6awQvaj98JCZBZQ5SuS2F15C");
-    CKey key = DecodeSecret(strSecret);
+    CKey key = keyIO.DecodeSecret(strSecret);
     CPubKey pubkey = key.GetPubKey();
     vector<unsigned char> vchPubKey(pubkey.begin(), pubkey.end());
 
diff --git a/src/test/key_tests.cpp b/src/test/key_tests.cpp
index 6d28cd1b8..d87470b23 100644
--- a/src/test/key_tests.cpp
+++ b/src/test/key_tests.cpp
@@ -46,6 +46,7 @@ void dumpKeyInfo(uint256 privkey)
     memcpy(&sec[0], &secret[0], 32);
     printf("  * secret (hex): %s\n", HexStr(sec).c_str());
 
+    KeyIO keyIO(Params());
     for (int nCompressed=0; nCompressed<2; nCompressed++)
     {
         bool fCompressed = nCompressed == 1;
@@ -57,7 +58,7 @@ void dumpKeyInfo(uint256 privkey)
         key.SetSecret(secret, fCompressed);
         vector<unsigned char> vchPubKey = key.GetPubKey();
         printf("    * pubkey (hex): %s\n", HexStr(vchPubKey).c_str());
-        printf("    * address (base58): %s\n", EncodeDestination(vchPubKey).c_str());
+        printf("    * address (base58): %s\n", keyIO.EncodeDestination(vchPubKey).c_str());
     }
 }
 #endif
@@ -67,15 +68,16 @@ BOOST_FIXTURE_TEST_SUITE(key_tests, BasicTestingSetup)
 
 BOOST_AUTO_TEST_CASE(key_test1)
 {
-    CKey key1  = DecodeSecret(strSecret1);
+    KeyIO keyIO(Params());
+    CKey key1  = keyIO.DecodeSecret(strSecret1);
     BOOST_CHECK(key1.IsValid() && !key1.IsCompressed());
-    CKey key2  = DecodeSecret(strSecret2);
+    CKey key2  = keyIO.DecodeSecret(strSecret2);
     BOOST_CHECK(key2.IsValid() && !key2.IsCompressed());
-    CKey key1C = DecodeSecret(strSecret1C);
+    CKey key1C = keyIO.DecodeSecret(strSecret1C);
     BOOST_CHECK(key1C.IsValid() && key1C.IsCompressed());
-    CKey key2C = DecodeSecret(strSecret2C);
+    CKey key2C = keyIO.DecodeSecret(strSecret2C);
     BOOST_CHECK(key2C.IsValid() && key2C.IsCompressed());
-    CKey bad_key = DecodeSecret(strAddressBad);
+    CKey bad_key = keyIO.DecodeSecret(strAddressBad);
     BOOST_CHECK(!bad_key.IsValid());
 
     CPubKey pubkey1  = key1. GetPubKey();
@@ -103,10 +105,10 @@ BOOST_AUTO_TEST_CASE(key_test1)
     BOOST_CHECK(!key2C.VerifyPubKey(pubkey2));
     BOOST_CHECK(key2C.VerifyPubKey(pubkey2C));
 
-    BOOST_CHECK(DecodeDestination(addr1)  == CTxDestination(pubkey1.GetID()));
-    BOOST_CHECK(DecodeDestination(addr2)  == CTxDestination(pubkey2.GetID()));
-    BOOST_CHECK(DecodeDestination(addr1C) == CTxDestination(pubkey1C.GetID()));
-    BOOST_CHECK(DecodeDestination(addr2C) == CTxDestination(pubkey2C.GetID()));
+    BOOST_CHECK(keyIO.DecodeDestination(addr1)  == CTxDestination(pubkey1.GetID()));
+    BOOST_CHECK(keyIO.DecodeDestination(addr2)  == CTxDestination(pubkey2.GetID()));
+    BOOST_CHECK(keyIO.DecodeDestination(addr1C) == CTxDestination(pubkey1C.GetID()));
+    BOOST_CHECK(keyIO.DecodeDestination(addr2C) == CTxDestination(pubkey2C.GetID()));
 
     for (int n=0; n<16; n++)
     {
@@ -189,15 +191,16 @@ BOOST_AUTO_TEST_CASE(key_test1)
 
 BOOST_AUTO_TEST_CASE(zc_address_test)
 {
+    KeyIO keyIO(Params());
     for (size_t i = 0; i < 1000; i++) {
         auto sk = SproutSpendingKey::random();
         {
-            string sk_string = EncodeSpendingKey(sk);
+            string sk_string = keyIO.EncodeSpendingKey(sk);
 
             BOOST_CHECK(sk_string[0] == 'S');
             BOOST_CHECK(sk_string[1] == 'K');
 
-            auto spendingkey2 = DecodeSpendingKey(sk_string);
+            auto spendingkey2 = keyIO.DecodeSpendingKey(sk_string);
             BOOST_CHECK(IsValidSpendingKey(spendingkey2));
             BOOST_ASSERT(boost::get<SproutSpendingKey>(&spendingkey2) != nullptr);
             auto sk2 = boost::get<SproutSpendingKey>(spendingkey2);
@@ -206,12 +209,12 @@ BOOST_AUTO_TEST_CASE(zc_address_test)
         {
             auto addr = sk.address();
 
-            std::string addr_string = EncodePaymentAddress(addr);
+            std::string addr_string = keyIO.EncodePaymentAddress(addr);
 
             BOOST_CHECK(addr_string[0] == 'z');
             BOOST_CHECK(addr_string[1] == 'c');
 
-            auto paymentaddr2 = DecodePaymentAddress(addr_string);
+            auto paymentaddr2 = keyIO.DecodePaymentAddress(addr_string);
             BOOST_ASSERT(IsValidPaymentAddress(paymentaddr2));
 
             BOOST_ASSERT(boost::get<SproutPaymentAddress>(&paymentaddr2) != nullptr);
@@ -228,13 +231,14 @@ BOOST_AUTO_TEST_CASE(zs_address_test)
 
     auto m = GetTestMasterSaplingSpendingKey();
 
+    KeyIO keyIO(Params());
     for (uint32_t i = 0; i < 1000; i++) {
         auto sk = m.Derive(i);
         {
-            std::string sk_string = EncodeSpendingKey(sk);
+            std::string sk_string = keyIO.EncodeSpendingKey(sk);
             BOOST_CHECK(sk_string.compare(0, 27, Params().Bech32HRP(CChainParams::SAPLING_EXTENDED_SPEND_KEY)) == 0);
 
-            auto spendingkey2 = DecodeSpendingKey(sk_string);
+            auto spendingkey2 = keyIO.DecodeSpendingKey(sk_string);
             BOOST_CHECK(IsValidSpendingKey(spendingkey2));
 
             BOOST_ASSERT(boost::get<SaplingExtendedSpendingKey>(&spendingkey2) != nullptr);
@@ -244,10 +248,10 @@ BOOST_AUTO_TEST_CASE(zs_address_test)
         {
             auto addr = sk.DefaultAddress();
 
-            std::string addr_string = EncodePaymentAddress(addr);
+            std::string addr_string = keyIO.EncodePaymentAddress(addr);
             BOOST_CHECK(addr_string.compare(0, 15, Params().Bech32HRP(CChainParams::SAPLING_PAYMENT_ADDRESS)) == 0);
 
-            auto paymentaddr2 = DecodePaymentAddress(addr_string);
+            auto paymentaddr2 = keyIO.DecodePaymentAddress(addr_string);
             BOOST_CHECK(IsValidPaymentAddress(paymentaddr2));
 
             BOOST_ASSERT(boost::get<SaplingPaymentAddress>(&paymentaddr2) != nullptr);
diff --git a/src/utiltest.cpp b/src/utiltest.cpp
index 24ac06a59..7dd79bdfe 100644
--- a/src/utiltest.cpp
+++ b/src/utiltest.cpp
@@ -286,7 +286,8 @@ libzcash::SaplingExtendedSpendingKey GetTestMasterSaplingSpendingKey() {
 }
 
 CKey AddTestCKeyToKeyStore(CBasicKeyStore& keyStore) {
-    CKey tsk = DecodeSecret(T_SECRET_REGTEST);
+    KeyIO keyIO(Params());
+    CKey tsk = keyIO.DecodeSecret(T_SECRET_REGTEST);
     keyStore.AddKey(tsk);
     return tsk;
 }
diff --git a/src/wallet/asyncrpcoperation_mergetoaddress.cpp b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
index 1f63b55e2..a10d425ff 100644
--- a/src/wallet/asyncrpcoperation_mergetoaddress.cpp
+++ b/src/wallet/asyncrpcoperation_mergetoaddress.cpp
@@ -91,12 +91,13 @@ AsyncRPCOperation_mergetoaddress::AsyncRPCOperation_mergetoaddress(
         builder_ = builder.get();
     }
 
-    toTaddr_ = DecodeDestination(std::get<0>(recipient));
+    KeyIO keyIO(Params());
+    toTaddr_ = keyIO.DecodeDestination(std::get<0>(recipient));
     isToTaddr_ = IsValidDestination(toTaddr_);
     isToZaddr_ = false;
 
     if (!isToTaddr_) {
-        auto address = DecodePaymentAddress(std::get<0>(recipient));
+        auto address = keyIO.DecodePaymentAddress(std::get<0>(recipient));
         if (IsValidPaymentAddress(address)) {
             isToZaddr_ = true;
             toPaymentAddress_ = address;
@@ -866,6 +867,7 @@ UniValue AsyncRPCOperation_mergetoaddress::perform_joinsplit(
         arrOutputMap.push_back(static_cast<uint64_t>(outputMap[i]));
     }
 
+    KeyIO keyIO(Params());
 
     // !!! Payment disclosure START
     unsigned char buffer[32] = {0};
@@ -883,7 +885,7 @@ UniValue AsyncRPCOperation_mergetoaddress::perform_joinsplit(
         PaymentDisclosureInfo pdInfo = {PAYMENT_DISCLOSURE_VERSION_EXPERIMENTAL, esk, joinSplitPrivKey, zaddr};
         paymentDisclosureData_.push_back(PaymentDisclosureKeyInfo(pdKey, pdInfo));
 
-        LogPrint("paymentdisclosure", "%s: Payment Disclosure: js=%d, n=%d, zaddr=%s\n", getId(), js_index, int(mapped_index), EncodePaymentAddress(zaddr));
+        LogPrint("paymentdisclosure", "%s: Payment Disclosure: js=%d, n=%d, zaddr=%s\n", getId(), js_index, int(mapped_index), keyIO.EncodePaymentAddress(zaddr));
     }
     // !!! Payment disclosure END
 
diff --git a/src/wallet/asyncrpcoperation_saplingmigration.cpp b/src/wallet/asyncrpcoperation_saplingmigration.cpp
index 991d167a7..596b97099 100644
--- a/src/wallet/asyncrpcoperation_saplingmigration.cpp
+++ b/src/wallet/asyncrpcoperation_saplingmigration.cpp
@@ -192,9 +192,10 @@ CAmount AsyncRPCOperation_saplingmigration::chooseAmount(const CAmount& availabl
 
 // Unless otherwise specified, the migration destination address is the address for Sapling account 0
 libzcash::SaplingPaymentAddress AsyncRPCOperation_saplingmigration::getMigrationDestAddress(const HDSeed& seed) {
+    KeyIO keyIO(Params());
     if (mapArgs.count("-migrationdestaddress")) {
         std::string migrationDestAddress = mapArgs["-migrationdestaddress"];
-        auto address = DecodePaymentAddress(migrationDestAddress);
+        auto address = keyIO.DecodePaymentAddress(migrationDestAddress);
         auto saplingAddress = boost::get<libzcash::SaplingPaymentAddress>(&address);
         assert(saplingAddress != nullptr); // This is checked in init.cpp
         return *saplingAddress;
diff --git a/src/wallet/asyncrpcoperation_sendmany.cpp b/src/wallet/asyncrpcoperation_sendmany.cpp
index cdfa19d9d..e27fa2322 100644
--- a/src/wallet/asyncrpcoperation_sendmany.cpp
+++ b/src/wallet/asyncrpcoperation_sendmany.cpp
@@ -85,12 +85,14 @@ AsyncRPCOperation_sendmany::AsyncRPCOperation_sendmany(
         builder_ = builder.get();
     }
 
-    fromtaddr_ = DecodeDestination(fromAddress);
+    KeyIO keyIO(Params());
+
+    fromtaddr_ = keyIO.DecodeDestination(fromAddress);
     isfromtaddr_ = IsValidDestination(fromtaddr_);
     isfromzaddr_ = false;
 
     if (!isfromtaddr_) {
-        auto address = DecodePaymentAddress(fromAddress);
+        auto address = keyIO.DecodePaymentAddress(fromAddress);
         if (IsValidPaymentAddress(address)) {
             // We don't need to lock on the wallet as spending key related methods are thread-safe
             if (!boost::apply_visitor(HaveSpendingKeyForPaymentAddress(pwalletMain), address)) {
@@ -343,6 +345,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
     LogPrint("zrpcunsafe", "%s: private output: %s\n", getId(), FormatMoney(z_outputs_total));
     LogPrint("zrpc", "%s: fee: %s\n", getId(), FormatMoney(minersFee));
 
+    KeyIO keyIO(Params());
 
     /**
      * SCENARIO #0
@@ -424,7 +427,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
             auto value = r.amount;
             auto hexMemo = r.memo;
 
-            auto addr = DecodePaymentAddress(address);
+            auto addr = keyIO.DecodePaymentAddress(address);
             assert(boost::get<libzcash::SaplingPaymentAddress>(&addr) != nullptr);
             auto to = boost::get<libzcash::SaplingPaymentAddress>(addr);
 
@@ -438,7 +441,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
             auto outputAddress = r.address;
             auto amount = r.amount;
 
-            auto address = DecodeDestination(outputAddress);
+            auto address = keyIO.DecodeDestination(outputAddress);
             builder_.AddTransparentOutput(address, amount);
         }
 
@@ -583,7 +586,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
                 std::string hexMemo = smr.memo;
                 zOutputsDeque.pop_front();
 
-                PaymentAddress pa = DecodePaymentAddress(address);
+                PaymentAddress pa = keyIO.DecodePaymentAddress(address);
                 JSOutput jso = JSOutput(boost::get<libzcash::SproutPaymentAddress>(pa), value);
                 if (hexMemo.size() > 0) {
                     jso.memo = get_memo_from_hex_string(hexMemo);
@@ -845,7 +848,7 @@ bool AsyncRPCOperation_sendmany::main_impl() {
             assert(value==0);
             info.vjsout.push_back(JSOutput());  // dummy output while we accumulate funds into a change note for vpub_new
         } else {
-            PaymentAddress pa = DecodePaymentAddress(address);
+            PaymentAddress pa = keyIO.DecodePaymentAddress(address);
             // If we are here, we know we have no Sapling outputs.
             JSOutput jso = JSOutput(boost::get<libzcash::SproutPaymentAddress>(pa), value);
             if (hexMemo.size() > 0) {
@@ -1145,6 +1148,7 @@ UniValue AsyncRPCOperation_sendmany::perform_joinsplit(
         arrOutputMap.push_back(static_cast<uint64_t>(outputMap[i]));
     }
 
+    KeyIO keyIO(Params());
 
     // !!! Payment disclosure START
     unsigned char buffer[32] = {0};
@@ -1162,7 +1166,7 @@ UniValue AsyncRPCOperation_sendmany::perform_joinsplit(
         PaymentDisclosureInfo pdInfo = {PAYMENT_DISCLOSURE_VERSION_EXPERIMENTAL, esk, joinSplitPrivKey, zaddr};
         paymentDisclosureData_.push_back(PaymentDisclosureKeyInfo(pdKey, pdInfo));
 
-        LogPrint("paymentdisclosure", "%s: Payment Disclosure: js=%d, n=%d, zaddr=%s\n", getId(), js_index, int(mapped_index), EncodePaymentAddress(zaddr));
+        LogPrint("paymentdisclosure", "%s: Payment Disclosure: js=%d, n=%d, zaddr=%s\n", getId(), js_index, int(mapped_index), keyIO.EncodePaymentAddress(zaddr));
     }
     // !!! Payment disclosure END
 
@@ -1179,11 +1183,13 @@ void AsyncRPCOperation_sendmany::add_taddr_outputs_to_tx() {
 
     CMutableTransaction rawTx(tx_);
 
+    KeyIO keyIO(Params());
+
     for (SendManyRecipient & r : t_outputs_) {
         std::string outputAddress = r.address;
         CAmount nAmount = r.amount;
 
-        CTxDestination address = DecodeDestination(outputAddress);
+        CTxDestination address = keyIO.DecodeDestination(outputAddress);
         if (!IsValidDestination(address)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid output address, not a valid taddr.");
         }
diff --git a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
index 563061749..81e67c33f 100644
--- a/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
+++ b/src/wallet/asyncrpcoperation_shieldcoinbase.cpp
@@ -74,7 +74,8 @@ AsyncRPCOperation_shieldcoinbase::AsyncRPCOperation_shieldcoinbase(
     }
 
     //  Check the destination address is valid for this network i.e. not testnet being used on mainnet
-    auto address = DecodePaymentAddress(toAddress);
+    KeyIO keyIO(Params());
+    auto address = keyIO.DecodePaymentAddress(toAddress);
     if (IsValidPaymentAddress(address)) {
         tozaddr_ = address;
     } else {
@@ -386,6 +387,8 @@ UniValue AsyncRPCOperation_shieldcoinbase::perform_joinsplit(ShieldCoinbaseJSInf
         arrOutputMap.push_back(static_cast<uint64_t>(outputMap[i]));
     }
 
+    KeyIO keyIO(Params());
+
     // !!! Payment disclosure START
     unsigned char buffer[32] = {0};
     memcpy(&buffer[0], &joinSplitPrivKey_[0], 32); // private key in first half of 64 byte buffer
@@ -402,7 +405,7 @@ UniValue AsyncRPCOperation_shieldcoinbase::perform_joinsplit(ShieldCoinbaseJSInf
         PaymentDisclosureInfo pdInfo = {PAYMENT_DISCLOSURE_VERSION_EXPERIMENTAL, esk, joinSplitPrivKey, zaddr};
         paymentDisclosureData_.push_back(PaymentDisclosureKeyInfo(pdKey, pdInfo));
 
-        LogPrint("paymentdisclosure", "%s: Payment Disclosure: js=%d, n=%d, zaddr=%s\n", getId(), js_index, int(mapped_index), EncodePaymentAddress(zaddr));
+        LogPrint("paymentdisclosure", "%s: Payment Disclosure: js=%d, n=%d, zaddr=%s\n", getId(), js_index, int(mapped_index), keyIO.EncodePaymentAddress(zaddr));
     }
     // !!! Payment disclosure END
 
diff --git a/src/wallet/paymentdisclosure.cpp b/src/wallet/paymentdisclosure.cpp
index ddce48cc2..2512664da 100644
--- a/src/wallet/paymentdisclosure.cpp
+++ b/src/wallet/paymentdisclosure.cpp
@@ -8,8 +8,9 @@
 #include "util.h"
 
 std::string PaymentDisclosureInfo::ToString() const {
+    KeyIO keyIO(Params());
     return strprintf("PaymentDisclosureInfo(version=%d, esk=%s, joinSplitPrivKey=<omitted>, address=%s)",
-        version, esk.ToString(), EncodePaymentAddress(zaddr));
+        version, esk.ToString(), keyIO.EncodePaymentAddress(zaddr));
 }
 
 std::string PaymentDisclosure::ToString() const {
@@ -18,8 +19,9 @@ std::string PaymentDisclosure::ToString() const {
 }
 
 std::string PaymentDisclosurePayload::ToString() const {
+    KeyIO keyIO(Params());
     return strprintf("PaymentDisclosurePayload(version=%d, esk=%s, txid=%s, js=%d, n=%d, address=%s, message=%s)",
-        version, esk.ToString(), txid.ToString(), js, n, EncodePaymentAddress(zaddr), message);
+        version, esk.ToString(), txid.ToString(), js, n, keyIO.EncodePaymentAddress(zaddr), message);
 }
 
 PaymentDisclosure::PaymentDisclosure(const uint256 &joinSplitPubKey, const PaymentDisclosureKey &key, const PaymentDisclosureInfo &info, const std::string &message)
diff --git a/src/wallet/rpcdisclosure.cpp b/src/wallet/rpcdisclosure.cpp
index d8a5998c3..00370cf38 100644
--- a/src/wallet/rpcdisclosure.cpp
+++ b/src/wallet/rpcdisclosure.cpp
@@ -250,10 +250,12 @@ UniValue z_validatepaymentdisclosure(const UniValue& params, bool fHelp)
         errs.push_back("Payment disclosure signature does not match transaction signature");        
     }
    
+    KeyIO keyIO(Params());
+
     // Check the payment address is valid
     SproutPaymentAddress zaddr = pd.payload.zaddr;
     {
-        o.pushKV("paymentAddress", EncodePaymentAddress(zaddr));
+        o.pushKV("paymentAddress", keyIO.EncodePaymentAddress(zaddr));
 
         try {
             // Decrypt the note to get value and memo field
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
index dbbad1714..77d614926 100644
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -116,7 +116,9 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
     if (params.size() > 2)
         fRescan = params[2].get_bool();
 
-    CKey key = DecodeSecret(strSecret);
+    KeyIO keyIO(Params());
+
+    CKey key = keyIO.DecodeSecret(strSecret);
     if (!key.IsValid()) throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid private key encoding");
 
     CPubKey pubkey = key.GetPubKey();
@@ -128,7 +130,7 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
 
         // Don't throw error in case a key is already there
         if (pwalletMain->HaveKey(vchAddress)) {
-            return EncodeDestination(vchAddress);
+            return keyIO.EncodeDestination(vchAddress);
         }
 
         pwalletMain->mapKeyMetadata[vchAddress].nCreateTime = 1;
@@ -144,7 +146,7 @@ UniValue importprivkey(const UniValue& params, bool fHelp)
         }
     }
 
-    return EncodeDestination(vchAddress);
+    return keyIO.EncodeDestination(vchAddress);
 }
 
 void ImportAddress(const CTxDestination& dest, const string& strLabel);
@@ -227,7 +229,8 @@ UniValue importaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CTxDestination dest = DecodeDestination(params[0].get_str());
+    KeyIO keyIO(Params());
+    CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
     if (IsValidDestination(dest)) {
         if (fP2SH) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Cannot use the p2sh flag with an address - use a script instead");
@@ -373,6 +376,8 @@ UniValue importwallet_impl(const UniValue& params, bool fImportZKeys)
     int64_t nFilesize = std::max((int64_t)1, (int64_t)file.tellg());
     file.seekg(0, file.beg);
 
+    KeyIO keyIO(Params());
+
     pwalletMain->ShowProgress(_("Importing..."), 0); // show progress dialog in GUI
     while (file.good()) {
         pwalletMain->ShowProgress("", std::max(1, std::min(99, (int)(((double)file.tellg() / (double)nFilesize) * 100))));
@@ -388,7 +393,7 @@ UniValue importwallet_impl(const UniValue& params, bool fImportZKeys)
 
         // Let's see if the address is a valid Zcash spending key
         if (fImportZKeys) {
-            auto spendingkey = DecodeSpendingKey(vstr[0]);
+            auto spendingkey = keyIO.DecodeSpendingKey(vstr[0]);
             int64_t nTime = DecodeDumpTime(vstr[1]);
             // Only include hdKeypath and seedFpStr if we have both
             boost::optional<std::string> hdKeypath = (vstr.size() > 3) ? boost::optional<std::string>(vstr[2]) : boost::none;
@@ -409,14 +414,14 @@ UniValue importwallet_impl(const UniValue& params, bool fImportZKeys)
             }
         }
 
-        CKey key = DecodeSecret(vstr[0]);
+        CKey key = keyIO.DecodeSecret(vstr[0]);
         if (!key.IsValid())
             continue;
         CPubKey pubkey = key.GetPubKey();
         assert(key.VerifyPubKey(pubkey));
         CKeyID keyid = pubkey.GetID();
         if (pwalletMain->HaveKey(keyid)) {
-            LogPrintf("Skipping import of %s (key already present)\n", EncodeDestination(keyid));
+            LogPrintf("Skipping import of %s (key already present)\n", keyIO.EncodeDestination(keyid));
             continue;
         }
         int64_t nTime = DecodeDumpTime(vstr[1]);
@@ -434,7 +439,7 @@ UniValue importwallet_impl(const UniValue& params, bool fImportZKeys)
                 fLabel = true;
             }
         }
-        LogPrintf("Importing %s...\n", EncodeDestination(keyid));
+        LogPrintf("Importing %s...\n", keyIO.EncodeDestination(keyid));
         if (!pwalletMain->AddKeyPubKey(key, pubkey)) {
             fGood = false;
             continue;
@@ -489,8 +494,10 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp)
 
     EnsureWalletIsUnlocked();
 
+    KeyIO keyIO(Params());
+
     std::string strAddress = params[0].get_str();
-    CTxDestination dest = DecodeDestination(strAddress);
+    CTxDestination dest = keyIO.DecodeDestination(strAddress);
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address");
     }
@@ -502,7 +509,7 @@ UniValue dumpprivkey(const UniValue& params, bool fHelp)
     if (!pwalletMain->GetKey(*keyID, vchSecret)) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Private key for address " + strAddress + " is not known");
     }
-    return EncodeSecret(vchSecret);
+    return keyIO.EncodeSecret(vchSecret);
 }
 
 
@@ -593,6 +600,8 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
     mapKeyBirth.clear();
     std::sort(vKeyBirth.begin(), vKeyBirth.end());
 
+    KeyIO keyIO(Params());
+
     // produce output
     file << strprintf("# Wallet dump created by Zcash %s (%s)\n", CLIENT_BUILD, CLIENT_DATE);
     file << strprintf("# * Created on %s\n", EncodeDumpTime(GetTime()));
@@ -609,15 +618,15 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
     for (std::vector<std::pair<int64_t, CKeyID> >::const_iterator it = vKeyBirth.begin(); it != vKeyBirth.end(); it++) {
         const CKeyID &keyid = it->second;
         std::string strTime = EncodeDumpTime(it->first);
-        std::string strAddr = EncodeDestination(keyid);
+        std::string strAddr = keyIO.EncodeDestination(keyid);
         CKey key;
         if (pwalletMain->GetKey(keyid, key)) {
             if (pwalletMain->mapAddressBook.count(keyid)) {
-                file << strprintf("%s %s label=%s # addr=%s\n", EncodeSecret(key), strTime, EncodeDumpString(pwalletMain->mapAddressBook[keyid].name), strAddr);
+                file << strprintf("%s %s label=%s # addr=%s\n", keyIO.EncodeSecret(key), strTime, EncodeDumpString(pwalletMain->mapAddressBook[keyid].name), strAddr);
             } else if (setKeyPool.count(keyid)) {
-                file << strprintf("%s %s reserve=1 # addr=%s\n", EncodeSecret(key), strTime, strAddr);
+                file << strprintf("%s %s reserve=1 # addr=%s\n", keyIO.EncodeSecret(key), strTime, strAddr);
             } else {
-                file << strprintf("%s %s change=1 # addr=%s\n", EncodeSecret(key), strTime, strAddr);
+                file << strprintf("%s %s change=1 # addr=%s\n", keyIO.EncodeSecret(key), strTime, strAddr);
             }
         }
     }
@@ -633,7 +642,7 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
             libzcash::SproutSpendingKey key;
             if (pwalletMain->GetSproutSpendingKey(addr, key)) {
                 std::string strTime = EncodeDumpTime(pwalletMain->mapSproutZKeyMetadata[addr].nCreateTime);
-                file << strprintf("%s %s # zaddr=%s\n", EncodeSpendingKey(key), strTime, EncodePaymentAddress(addr));
+                file << strprintf("%s %s # zaddr=%s\n", keyIO.EncodeSpendingKey(key), strTime, keyIO.EncodePaymentAddress(addr));
             }
         }
         std::set<libzcash::SaplingPaymentAddress> saplingAddresses;
@@ -649,9 +658,9 @@ UniValue dumpwallet_impl(const UniValue& params, bool fDumpZKeys)
                 std::string strTime = EncodeDumpTime(keyMeta.nCreateTime);
                 // Keys imported with z_importkey do not have zip32 metadata
                 if (keyMeta.hdKeypath.empty() || keyMeta.seedFp.IsNull()) {
-                    file << strprintf("%s %s # zaddr=%s\n", EncodeSpendingKey(extsk), strTime, EncodePaymentAddress(addr));
+                    file << strprintf("%s %s # zaddr=%s\n", keyIO.EncodeSpendingKey(extsk), strTime, keyIO.EncodePaymentAddress(addr));
                 } else {
-                    file << strprintf("%s %s %s %s # zaddr=%s\n", EncodeSpendingKey(extsk), strTime, keyMeta.hdKeypath, keyMeta.seedFp.GetHex(), EncodePaymentAddress(addr));
+                    file << strprintf("%s %s %s %s # zaddr=%s\n", keyIO.EncodeSpendingKey(extsk), strTime, keyMeta.hdKeypath, keyMeta.seedFp.GetHex(), keyIO.EncodePaymentAddress(addr));
                 }
             }
         }
@@ -737,8 +746,9 @@ UniValue z_importkey(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
     }
 
+    KeyIO keyIO(Params());
     string strSecret = params[0].get_str();
-    auto spendingkey = DecodeSpendingKey(strSecret);
+    auto spendingkey = keyIO.DecodeSpendingKey(strSecret);
     if (!IsValidSpendingKey(spendingkey)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
     }
@@ -746,7 +756,7 @@ UniValue z_importkey(const UniValue& params, bool fHelp)
     auto addrInfo = boost::apply_visitor(libzcash::AddressInfoFromSpendingKey{}, spendingkey);
     UniValue result(UniValue::VOBJ);
     result.pushKV("type", addrInfo.first);
-    result.pushKV("address", EncodePaymentAddress(addrInfo.second));
+    result.pushKV("address", keyIO.EncodePaymentAddress(addrInfo.second));
 
     // Sapling support
     auto addResult = boost::apply_visitor(AddSpendingKeyToWallet(pwalletMain, Params().GetConsensus()), spendingkey);
@@ -831,8 +841,9 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Block height out of range");
     }
 
+    KeyIO keyIO(Params());
     string strVKey = params[0].get_str();
-    auto viewingkey = DecodeViewingKey(strVKey);
+    auto viewingkey = keyIO.DecodeViewingKey(strVKey);
     if (!IsValidViewingKey(viewingkey)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid viewing key");
     }
@@ -840,7 +851,7 @@ UniValue z_importviewingkey(const UniValue& params, bool fHelp)
     auto addrInfo = boost::apply_visitor(libzcash::AddressInfoFromViewingKey{}, viewingkey);
     UniValue result(UniValue::VOBJ);
     result.pushKV("type", addrInfo.first);
-    result.pushKV("address", EncodePaymentAddress(addrInfo.second));
+    result.pushKV("address", keyIO.EncodePaymentAddress(addrInfo.second));
 
     auto addResult = boost::apply_visitor(AddViewingKeyToWallet(pwalletMain), viewingkey);
     if (addResult == SpendingKeyExists) {
@@ -889,7 +900,8 @@ UniValue z_exportkey(const UniValue& params, bool fHelp)
 
     string strAddress = params[0].get_str();
 
-    auto address = DecodePaymentAddress(strAddress);
+    KeyIO keyIO(Params());
+    auto address = keyIO.DecodePaymentAddress(strAddress);
     if (!IsValidPaymentAddress(address)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid zaddr");
     }
@@ -899,7 +911,7 @@ UniValue z_exportkey(const UniValue& params, bool fHelp)
     if (!sk) {
         throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold private zkey for this zaddr");
     }
-    return EncodeSpendingKey(sk.get());
+    return keyIO.EncodeSpendingKey(sk.get());
 }
 
 UniValue z_exportviewingkey(const UniValue& params, bool fHelp)
@@ -927,14 +939,15 @@ UniValue z_exportviewingkey(const UniValue& params, bool fHelp)
 
     string strAddress = params[0].get_str();
 
-    auto address = DecodePaymentAddress(strAddress);
+    KeyIO keyIO(Params());
+    auto address = keyIO.DecodePaymentAddress(strAddress);
     if (!IsValidPaymentAddress(address)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid zaddr");
     }
 
     auto vk = boost::apply_visitor(GetViewingKeyForPaymentAddress(pwalletMain), address);
     if (vk) {
-        return EncodeViewingKey(vk.get());
+        return keyIO.EncodeViewingKey(vk.get());
     } else {
         throw JSONRPCError(RPC_WALLET_ERROR, "Wallet does not hold private key or viewing key for this zaddr");
     }
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
index 622a65ed1..27d491be2 100644
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -168,7 +168,8 @@ UniValue getnewaddress(const UniValue& params, bool fHelp)
 
     pwalletMain->SetAddressBook(keyID, strAccount, "receive");
 
-    return EncodeDestination(keyID);
+    KeyIO keyIO(Params());
+    return keyIO.EncodeDestination(keyID);
 }
 
 
@@ -236,7 +237,8 @@ UniValue getaccountaddress(const UniValue& params, bool fHelp)
 
     UniValue ret(UniValue::VSTR);
 
-    ret = EncodeDestination(GetAccountAddress(strAccount));
+    KeyIO keyIO(Params());
+    ret = keyIO.EncodeDestination(GetAccountAddress(strAccount));
     return ret;
 }
 
@@ -272,7 +274,8 @@ UniValue getrawchangeaddress(const UniValue& params, bool fHelp)
 
     CKeyID keyID = vchPubKey.GetID();
 
-    return EncodeDestination(keyID);
+    KeyIO keyIO(Params());
+    return keyIO.EncodeDestination(keyID);
 }
 
 
@@ -295,7 +298,8 @@ UniValue setaccount(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CTxDestination dest = DecodeDestination(params[0].get_str());
+    KeyIO keyIO(Params());
+    CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address");
     }
@@ -342,7 +346,8 @@ UniValue getaccount(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CTxDestination dest = DecodeDestination(params[0].get_str());
+    KeyIO keyIO(Params());
+    CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address");
     }
@@ -381,13 +386,14 @@ UniValue getaddressesbyaccount(const UniValue& params, bool fHelp)
 
     string strAccount = AccountFromValue(params[0]);
 
+    KeyIO keyIO(Params());
     // Find all addresses that have the given account
     UniValue ret(UniValue::VARR);
     for (const std::pair<CTxDestination, CAddressBookData>& item : pwalletMain->mapAddressBook) {
         const CTxDestination& dest = item.first;
         const std::string& strName = item.second.name;
         if (strName == strAccount) {
-            ret.push_back(EncodeDestination(dest));
+            ret.push_back(keyIO.EncodeDestination(dest));
         }
     }
     return ret;
@@ -455,7 +461,8 @@ UniValue sendtoaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
-    CTxDestination dest = DecodeDestination(params[0].get_str());
+    KeyIO keyIO(Params());
+    CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address");
     }
@@ -513,6 +520,7 @@ UniValue listaddressgroupings(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    KeyIO keyIO(Params());
     UniValue jsonGroupings(UniValue::VARR);
     std::map<CTxDestination, CAmount> balances = pwalletMain->GetAddressBalances();
     for (const std::set<CTxDestination>& grouping : pwalletMain->GetAddressGroupings()) {
@@ -520,7 +528,7 @@ UniValue listaddressgroupings(const UniValue& params, bool fHelp)
         for (const CTxDestination& address : grouping)
         {
             UniValue addressInfo(UniValue::VARR);
-            addressInfo.push_back(EncodeDestination(address));
+            addressInfo.push_back(keyIO.EncodeDestination(address));
             addressInfo.push_back(ValueFromAmount(balances[address]));
             {
                 if (pwalletMain->mapAddressBook.find(address) != pwalletMain->mapAddressBook.end()) {
@@ -567,7 +575,8 @@ UniValue signmessage(const UniValue& params, bool fHelp)
     string strAddress = params[0].get_str();
     string strMessage = params[1].get_str();
 
-    CTxDestination dest = DecodeDestination(strAddress);
+    KeyIO keyIO(Params());
+    CTxDestination dest = keyIO.DecodeDestination(strAddress);
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_TYPE_ERROR, "Invalid address");
     }
@@ -621,8 +630,9 @@ UniValue getreceivedbyaddress(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    KeyIO keyIO(Params());
     // Bitcoin address
-    CTxDestination dest = DecodeDestination(params[0].get_str());
+    CTxDestination dest = keyIO.DecodeDestination(params[0].get_str());
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address");
     }
@@ -960,8 +970,9 @@ UniValue sendfrom(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    KeyIO keyIO(Params());
     std::string strAccount = AccountFromValue(params[0]);
-    CTxDestination dest = DecodeDestination(params[1].get_str());
+    CTxDestination dest = keyIO.DecodeDestination(params[1].get_str());
     if (!IsValidDestination(dest)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid Zcash address");
     }
@@ -1053,10 +1064,11 @@ UniValue sendmany(const UniValue& params, bool fHelp)
     std::set<CTxDestination> destinations;
     std::vector<CRecipient> vecSend;
 
+    KeyIO keyIO(Params());
     CAmount totalAmount = 0;
     std::vector<std::string> keys = sendTo.getKeys();
     for (const std::string& name_ : keys) {
-        CTxDestination dest = DecodeDestination(name_);
+        CTxDestination dest = keyIO.DecodeDestination(name_);
         if (!IsValidDestination(dest)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash address: ") + name_);
         }
@@ -1152,7 +1164,8 @@ UniValue addmultisigaddress(const UniValue& params, bool fHelp)
     pwalletMain->AddCScript(inner);
 
     pwalletMain->SetAddressBook(innerID, strAccount, "send");
-    return EncodeDestination(innerID);
+    KeyIO keyIO(Params());
+    return keyIO.EncodeDestination(innerID);
 }
 
 
@@ -1218,6 +1231,8 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
         }
     }
 
+    KeyIO keyIO(Params());
+
     // Reply
     UniValue ret(UniValue::VARR);
     std::map<std::string, tallyitem> mapAccountTally;
@@ -1250,7 +1265,7 @@ UniValue ListReceived(const UniValue& params, bool fByAccounts)
             UniValue obj(UniValue::VOBJ);
             if(fIsWatchonly)
                 obj.pushKV("involvesWatchonly", true);
-            obj.pushKV("address",       EncodeDestination(dest));
+            obj.pushKV("address",       keyIO.EncodeDestination(dest));
             obj.pushKV("account",       strAccount);
             obj.pushKV("amount",        ValueFromAmount(nAmount));
             obj.pushKV("amountZat",     nAmount);
@@ -1366,7 +1381,8 @@ UniValue listreceivedbyaccount(const UniValue& params, bool fHelp)
 static void MaybePushAddress(UniValue & entry, const CTxDestination &dest)
 {
     if (IsValidDestination(dest)) {
-        entry.pushKV("address", EncodeDestination(dest));
+        KeyIO keyIO(Params());
+        entry.pushKV("address", keyIO.EncodeDestination(dest));
     }
 }
 
@@ -2440,12 +2456,13 @@ UniValue listunspent(const UniValue& params, bool fHelp)
     if (params.size() > 1)
         nMaxDepth = params[1].get_int();
 
+    KeyIO keyIO(Params());
     std::set<CTxDestination> destinations;
     if (params.size() > 2) {
         UniValue inputs = params[2].get_array();
         for (size_t idx = 0; idx < inputs.size(); idx++) {
             const UniValue& input = inputs[idx];
-            CTxDestination dest = DecodeDestination(input.get_str());
+            CTxDestination dest = keyIO.DecodeDestination(input.get_str());
             if (!IsValidDestination(dest)) {
                 throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, std::string("Invalid Zcash address: ") + input.get_str());
             }
@@ -2477,7 +2494,7 @@ UniValue listunspent(const UniValue& params, bool fHelp)
         entry.pushKV("generated", out.tx->IsCoinBase());
 
         if (fValidAddress) {
-            entry.pushKV("address", EncodeDestination(address));
+            entry.pushKV("address", keyIO.EncodeDestination(address));
 
             if (pwalletMain->mapAddressBook.count(address))
                 entry.pushKV("account", pwalletMain->mapAddressBook[address].name);
@@ -2575,6 +2592,7 @@ UniValue z_listunspent(const UniValue& params, bool fHelp)
 
     LOCK2(cs_main, pwalletMain->cs_wallet);
 
+    KeyIO keyIO(Params());
     // User has supplied zaddrs to filter on
     if (params.size() > 3) {
         UniValue addresses = params[3].get_array();
@@ -2590,7 +2608,7 @@ UniValue z_listunspent(const UniValue& params, bool fHelp)
                 throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid parameter, expected string");
             }
             string address = o.get_str();
-            auto zaddr = DecodePaymentAddress(address);
+            auto zaddr = keyIO.DecodePaymentAddress(address);
             if (!IsValidPaymentAddress(zaddr)) {
                 throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, address is not a valid zaddr: ") + address);
             }
@@ -2635,7 +2653,7 @@ UniValue z_listunspent(const UniValue& params, bool fHelp)
             obj.pushKV("confirmations", entry.confirmations);
             bool hasSproutSpendingKey = HaveSpendingKeyForPaymentAddress(pwalletMain)(entry.address);
             obj.pushKV("spendable", hasSproutSpendingKey);
-            obj.pushKV("address", EncodePaymentAddress(entry.address));
+            obj.pushKV("address", keyIO.EncodePaymentAddress(entry.address));
             obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value())));
             std::string data(entry.memo.begin(), entry.memo.end());
             obj.pushKV("memo", HexStr(data));
@@ -2652,7 +2670,7 @@ UniValue z_listunspent(const UniValue& params, bool fHelp)
             obj.pushKV("confirmations", entry.confirmations);
             bool hasSaplingSpendingKey = HaveSpendingKeyForPaymentAddress(pwalletMain)(entry.address);
             obj.pushKV("spendable", hasSaplingSpendingKey);
-            obj.pushKV("address", EncodePaymentAddress(entry.address));
+            obj.pushKV("address", keyIO.EncodePaymentAddress(entry.address));
             obj.pushKV("amount", ValueFromAmount(CAmount(entry.note.value()))); // note.value() is equivalent to plaintext.value()
             obj.pushKV("memo", HexStr(entry.memo));
             if (hasSaplingSpendingKey) {
@@ -2914,7 +2932,8 @@ UniValue zc_raw_receive(const UniValue& params, bool fHelp)
 
     LOCK(cs_main);
 
-    auto spendingkey = DecodeSpendingKey(params[0].get_str());
+    KeyIO keyIO(Params());
+    auto spendingkey = keyIO.DecodeSpendingKey(params[0].get_str());
     if (!IsValidSpendingKey(spendingkey)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
     }
@@ -3037,8 +3056,9 @@ UniValue zc_raw_joinsplit(const UniValue& params, bool fHelp)
     std::vector<SproutSpendingKey> keys;
     std::vector<uint256> commitments;
 
+    KeyIO keyIO(Params());
     for (const string& name_ : inputs.getKeys()) {
-        auto spendingkey = DecodeSpendingKey(inputs[name_].get_str());
+        auto spendingkey = keyIO.DecodeSpendingKey(inputs[name_].get_str());
         if (!IsValidSpendingKey(spendingkey)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid spending key");
         }
@@ -3086,7 +3106,7 @@ UniValue zc_raw_joinsplit(const UniValue& params, bool fHelp)
     }
 
     for (const string& name_ : outputs.getKeys()) {
-        auto addrTo = DecodePaymentAddress(name_);
+        auto addrTo = keyIO.DecodePaymentAddress(name_);
         if (!IsValidPaymentAddress(addrTo)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid recipient address.");
         }
@@ -3206,10 +3226,11 @@ UniValue zc_raw_keygen(const UniValue& params, bool fHelp)
     auto addr = k.address();
     auto viewing_key = k.viewing_key();
 
+    KeyIO keyIO(Params());
     UniValue result(UniValue::VOBJ);
-    result.pushKV("zcaddress", EncodePaymentAddress(addr));
-    result.pushKV("zcsecretkey", EncodeSpendingKey(k));
-    result.pushKV("zcviewingkey", EncodeViewingKey(viewing_key));
+    result.pushKV("zcaddress", keyIO.EncodePaymentAddress(addr));
+    result.pushKV("zcsecretkey", keyIO.EncodeSpendingKey(k));
+    result.pushKV("zcviewingkey", keyIO.EncodeViewingKey(viewing_key));
     return result;
 }
 
@@ -3246,10 +3267,11 @@ UniValue z_getnewaddress(const UniValue& params, bool fHelp)
         addrType = params[0].get_str();
     }
 
+    KeyIO keyIO(Params());
     if (addrType == ADDR_TYPE_SPROUT) {
-        return EncodePaymentAddress(pwalletMain->GenerateNewSproutZKey());
+        return keyIO.EncodePaymentAddress(pwalletMain->GenerateNewSproutZKey());
     } else if (addrType == ADDR_TYPE_SAPLING) {
-        return EncodePaymentAddress(pwalletMain->GenerateNewSaplingZKey());
+        return keyIO.EncodePaymentAddress(pwalletMain->GenerateNewSaplingZKey());
     } else {
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Invalid address type");
     }
@@ -3284,13 +3306,14 @@ UniValue z_listaddresses(const UniValue& params, bool fHelp)
         fIncludeWatchonly = params[0].get_bool();
     }
 
+    KeyIO keyIO(Params());
     UniValue ret(UniValue::VARR);
     {
         std::set<libzcash::SproutPaymentAddress> addresses;
         pwalletMain->GetSproutPaymentAddresses(addresses);
         for (auto addr : addresses) {
             if (fIncludeWatchonly || HaveSpendingKeyForPaymentAddress(pwalletMain)(addr)) {
-                ret.push_back(EncodePaymentAddress(addr));
+                ret.push_back(keyIO.EncodePaymentAddress(addr));
             }
         }
     }
@@ -3299,7 +3322,7 @@ UniValue z_listaddresses(const UniValue& params, bool fHelp)
         pwalletMain->GetSaplingPaymentAddresses(addresses);
         for (auto addr : addresses) {
             if (fIncludeWatchonly || HaveSpendingKeyForPaymentAddress(pwalletMain)(addr)) {
-                ret.push_back(EncodePaymentAddress(addr));
+                ret.push_back(keyIO.EncodePaymentAddress(addr));
             }
         }
     }
@@ -3311,8 +3334,9 @@ CAmount getBalanceTaddr(std::string transparentAddress, int minDepth=1, bool ign
     vector<COutput> vecOutputs;
     CAmount balance = 0;
 
+    KeyIO keyIO(Params());
     if (transparentAddress.length() > 0) {
-        CTxDestination taddr = DecodeDestination(transparentAddress);
+        CTxDestination taddr = keyIO.DecodeDestination(transparentAddress);
         if (!IsValidDestination(taddr)) {
             throw std::runtime_error("invalid transparent address");
         }
@@ -3427,7 +3451,8 @@ UniValue z_listreceivedbyaddress(const UniValue& params, bool fHelp)
     // Check that the from address is valid.
     auto fromaddress = params[0].get_str();
 
-    auto zaddr = DecodePaymentAddress(fromaddress);
+    KeyIO keyIO(Params());
+    auto zaddr = keyIO.DecodePaymentAddress(fromaddress);
     if (!IsValidPaymentAddress(zaddr)) {
         throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid zaddr.");
     }
@@ -3530,13 +3555,14 @@ UniValue z_getbalance(const UniValue& params, bool fHelp)
         throw JSONRPCError(RPC_INVALID_PARAMETER, "Minimum number of confirmations cannot be less than 0");
     }
 
+    KeyIO keyIO(Params());
     // Check that the from address is valid.
     auto fromaddress = params[0].get_str();
     bool fromTaddr = false;
-    CTxDestination taddr = DecodeDestination(fromaddress);
+    CTxDestination taddr = keyIO.DecodeDestination(fromaddress);
     fromTaddr = IsValidDestination(taddr);
     if (!fromTaddr) {
-        auto res = DecodePaymentAddress(fromaddress);
+        auto res = keyIO.DecodePaymentAddress(fromaddress);
         if (!IsValidPaymentAddress(res)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr.");
         }
@@ -3705,6 +3731,7 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
         }
     };
 
+    KeyIO keyIO(Params());
     // Sprout spends
     for (size_t i = 0; i < wtx.vJoinSplit.size(); ++i) {
         for (size_t j = 0; j < wtx.vJoinSplit[i].nullifiers.size(); ++j) {
@@ -3729,7 +3756,7 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
             entry.pushKV("txidPrev", jsop.hash.GetHex());
             entry.pushKV("jsPrev", (int)jsop.js);
             entry.pushKV("jsOutputPrev", (int)jsop.n);
-            entry.pushKV("address", EncodePaymentAddress(pa));
+            entry.pushKV("address", keyIO.EncodePaymentAddress(pa));
             entry.pushKV("value", ValueFromAmount(notePt.value()));
             entry.pushKV("valueZat", notePt.value());
             spends.push_back(entry);
@@ -3749,7 +3776,7 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
         entry.pushKV("type", ADDR_TYPE_SPROUT);
         entry.pushKV("js", (int)jsop.js);
         entry.pushKV("jsOutput", (int)jsop.n);
-        entry.pushKV("address", EncodePaymentAddress(pa));
+        entry.pushKV("address", keyIO.EncodePaymentAddress(pa));
         entry.pushKV("value", ValueFromAmount(notePt.value()));
         entry.pushKV("valueZat", notePt.value());
         addMemo(entry, memo);
@@ -3792,7 +3819,7 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
         entry.pushKV("spend", (int)i);
         entry.pushKV("txidPrev", op.hash.GetHex());
         entry.pushKV("outputPrev", (int)op.n);
-        entry.pushKV("address", EncodePaymentAddress(pa));
+        entry.pushKV("address", keyIO.EncodePaymentAddress(pa));
         entry.pushKV("value", ValueFromAmount(notePt.value()));
         entry.pushKV("valueZat", notePt.value());
         spends.push_back(entry);
@@ -3831,7 +3858,7 @@ UniValue z_viewtransaction(const UniValue& params, bool fHelp)
         entry.pushKV("type", ADDR_TYPE_SAPLING);
         entry.pushKV("output", (int)op.n);
         entry.pushKV("outgoing", isOutgoing);
-        entry.pushKV("address", EncodePaymentAddress(pa));
+        entry.pushKV("address", keyIO.EncodePaymentAddress(pa));
         entry.pushKV("value", ValueFromAmount(notePt.value()));
         entry.pushKV("valueZat", notePt.value());
         addMemo(entry, memo);
@@ -3997,10 +4024,11 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
     auto fromaddress = params[0].get_str();
     bool fromTaddr = false;
     bool fromSapling = false;
-    CTxDestination taddr = DecodeDestination(fromaddress);
+    KeyIO keyIO(Params());
+    CTxDestination taddr = keyIO.DecodeDestination(fromaddress);
     fromTaddr = IsValidDestination(taddr);
     if (!fromTaddr) {
-        auto res = DecodePaymentAddress(fromaddress);
+        auto res = keyIO.DecodePaymentAddress(fromaddress);
         if (!IsValidPaymentAddress(res)) {
             // invalid
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or zaddr.");
@@ -4049,9 +4077,9 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
 
         string address = find_value(o, "address").get_str();
         bool isZaddr = false;
-        CTxDestination taddr = DecodeDestination(address);
+        CTxDestination taddr = keyIO.DecodeDestination(address);
         if (!IsValidDestination(taddr)) {
-            auto res = DecodePaymentAddress(address);
+            auto res = keyIO.DecodePaymentAddress(address);
             if (IsValidPaymentAddress(res)) {
                 isZaddr = true;
 
@@ -4153,7 +4181,7 @@ UniValue z_sendmany(const UniValue& params, bool fHelp)
     size_t txsize = 0;
     for (int i = 0; i < zaddrRecipients.size(); i++) {
         auto address = zaddrRecipients[i].address;
-        auto res = DecodePaymentAddress(address);
+        auto res = keyIO.DecodePaymentAddress(address);
         bool toSapling = boost::get<libzcash::SaplingPaymentAddress>(&res) != nullptr;
         if (toSapling) {
             mtx.vShieldedOutput.push_back(OutputDescription());
@@ -4302,7 +4330,8 @@ UniValue z_getmigrationstatus(const UniValue& params, bool fHelp) {
     // parameter is not set and no default address has yet been generated.
     // Note: The following function may return the default address even if it has not been added to the wallet
     auto destinationAddress = AsyncRPCOperation_saplingmigration::getMigrationDestAddress(pwalletMain->GetHDSeedForRPC());
-    migrationStatus.pushKV("destination_address", EncodePaymentAddress(destinationAddress));
+    KeyIO keyIO(Params());
+    migrationStatus.pushKV("destination_address", keyIO.EncodePaymentAddress(destinationAddress));
     //  The values of "unmigrated_amount" and "migrated_amount" MUST take into
     // account failed transactions, that were not mined within their expiration
     // height.
@@ -4431,9 +4460,10 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
     // Validate the from address
     auto fromaddress = params[0].get_str();
     bool isFromWildcard = fromaddress == "*";
+    KeyIO keyIO(Params());
     CTxDestination taddr;
     if (!isFromWildcard) {
-        taddr = DecodeDestination(fromaddress);
+        taddr = keyIO.DecodeDestination(fromaddress);
         if (!IsValidDestination(taddr)) {
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Invalid from address, should be a taddr or \"*\".");
         }
@@ -4441,7 +4471,7 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
 
     // Validate the destination address
     auto destaddress = params[1].get_str();
-    if (!IsValidPaymentAddressString(destaddress)) {
+    if (!keyIO.IsValidPaymentAddressString(destaddress)) {
         throw JSONRPCError(RPC_INVALID_PARAMETER, string("Invalid parameter, unknown address format: ") + destaddress );
     }
 
@@ -4449,7 +4479,7 @@ UniValue z_shieldcoinbase(const UniValue& params, bool fHelp)
     const bool canopyActive = Params().GetConsensus().NetworkUpgradeActive(nextBlockHeight, Consensus::UPGRADE_CANOPY);
 
     if (canopyActive) {
-        auto decodeAddr = DecodePaymentAddress(destaddress);
+        auto decodeAddr = keyIO.DecodePaymentAddress(destaddress);
         bool isToSproutZaddr = (boost::get<libzcash::SproutPaymentAddress>(&decodeAddr) != nullptr);
 
         if (isToSproutZaddr) {
@@ -4678,6 +4708,7 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
 
     bool isFromNonSprout = false;
 
+    KeyIO keyIO(Params());
     // Sources
     for (const UniValue& o : addresses.getValues()) {
         if (!o.isStr())
@@ -4694,12 +4725,12 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
             useAnySapling = true;
             isFromNonSprout = true;
         } else {
-            CTxDestination taddr = DecodeDestination(address);
+            CTxDestination taddr = keyIO.DecodeDestination(address);
             if (IsValidDestination(taddr)) {
                 taddrs.insert(taddr);
                 isFromNonSprout = true;
             } else {
-                auto zaddr = DecodePaymentAddress(address);
+                auto zaddr = keyIO.DecodePaymentAddress(address);
                 if (IsValidPaymentAddress(zaddr)) {
                     zaddrs.insert(zaddr);
                     if (boost::get<libzcash::SaplingPaymentAddress>(&zaddr) != nullptr) {
@@ -4732,9 +4763,9 @@ UniValue z_mergetoaddress(const UniValue& params, bool fHelp)
     auto destaddress = params[1].get_str();
     bool isToSproutZaddr = false;
     bool isToSaplingZaddr = false;
-    CTxDestination taddr = DecodeDestination(destaddress);
+    CTxDestination taddr = keyIO.DecodeDestination(destaddress);
     if (!IsValidDestination(taddr)) {
-        auto decodeAddr = DecodePaymentAddress(destaddress);
+        auto decodeAddr = keyIO.DecodePaymentAddress(destaddress);
         if (IsValidPaymentAddress(decodeAddr)) {
             if (boost::get<libzcash::SaplingPaymentAddress>(&decodeAddr) != nullptr) {
                 isToSaplingZaddr = true;
diff --git a/src/wallet/test/rpc_wallet_tests.cpp b/src/wallet/test/rpc_wallet_tests.cpp
index c2ccd4bce..3c5f536ee 100644
--- a/src/wallet/test/rpc_wallet_tests.cpp
+++ b/src/wallet/test/rpc_wallet_tests.cpp
@@ -68,18 +68,19 @@ BOOST_AUTO_TEST_CASE(rpc_addmultisig)
     // new, compressed:
     const char address2Hex[] = "0388c2037017c62240b6b72ac1a2a5f94da790596ebd06177c8572752922165cb4";
 
+    KeyIO keyIO(Params());
     UniValue v;
     CTxDestination address;
     BOOST_CHECK_NO_THROW(v = addmultisig(createArgs(1, address1Hex), false));
-    address = DecodeDestination(v.get_str());
+    address = keyIO.DecodeDestination(v.get_str());
     BOOST_CHECK(IsValidDestination(address) && IsScriptDestination(address));
 
     BOOST_CHECK_NO_THROW(v = addmultisig(createArgs(1, address1Hex, address2Hex), false));
-    address = DecodeDestination(v.get_str());
+    address = keyIO.DecodeDestination(v.get_str());
     BOOST_CHECK(IsValidDestination(address) && IsScriptDestination(address));
 
     BOOST_CHECK_NO_THROW(v = addmultisig(createArgs(2, address1Hex, address2Hex), false));
-    address = DecodeDestination(v.get_str());
+    address = keyIO.DecodeDestination(v.get_str());
     BOOST_CHECK(IsValidDestination(address) && IsScriptDestination(address));
 
     BOOST_CHECK_THROW(addmultisig(createArgs(0), false), runtime_error);
@@ -122,9 +123,10 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
     /*********************************
      * 			setaccount
      *********************************/
-    BOOST_CHECK_NO_THROW(CallRPC("setaccount " + EncodeDestination(setaccountDemoAddress) + " \"\""));
+    KeyIO keyIO(Params());
+    BOOST_CHECK_NO_THROW(CallRPC("setaccount " + keyIO.EncodeDestination(setaccountDemoAddress) + " \"\""));
     /* Accounts are disabled */
-    BOOST_CHECK_THROW(CallRPC("setaccount " + EncodeDestination(setaccountDemoAddress) + " nullaccount"), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("setaccount " + keyIO.EncodeDestination(setaccountDemoAddress) + " nullaccount"), runtime_error);
     /* t1VtArtnn1dGPiD2WFfMXYXW5mHM3q1GpgV is not owned by the test wallet. */
     BOOST_CHECK_THROW(CallRPC("setaccount t1VtArtnn1dGPiD2WFfMXYXW5mHM3q1GpgV nullaccount"), runtime_error);
     BOOST_CHECK_THROW(CallRPC("setaccount"), runtime_error);
@@ -136,7 +138,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
      *                  getbalance
      *********************************/
     BOOST_CHECK_NO_THROW(CallRPC("getbalance"));
-    BOOST_CHECK_THROW(CallRPC("getbalance " + EncodeDestination(demoAddress)), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("getbalance " + keyIO.EncodeDestination(demoAddress)), runtime_error);
 
     /*********************************
      * 			listunspent
@@ -178,10 +180,10 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
      *          listtransactions
      *********************************/
     BOOST_CHECK_NO_THROW(CallRPC("listtransactions"));
-    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + EncodeDestination(demoAddress)));
-    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + EncodeDestination(demoAddress) + " 20"));
-    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + EncodeDestination(demoAddress) + " 20 0"));
-    BOOST_CHECK_THROW(CallRPC("listtransactions " + EncodeDestination(demoAddress) + " not_int"), runtime_error);
+    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + keyIO.EncodeDestination(demoAddress)));
+    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + keyIO.EncodeDestination(demoAddress) + " 20"));
+    BOOST_CHECK_NO_THROW(CallRPC("listtransactions " + keyIO.EncodeDestination(demoAddress) + " 20 0"));
+    BOOST_CHECK_THROW(CallRPC("listtransactions " + keyIO.EncodeDestination(demoAddress) + " not_int"), runtime_error);
 
     /*********************************
      *          listlockunspent
@@ -218,33 +220,33 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
     /* Accounts are deprecated */
     BOOST_CHECK_THROW(CallRPC("getaccountaddress accountThatDoesntExists"), runtime_error);
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getaccountaddress " + strAccount));
-    BOOST_CHECK(DecodeDestination(retValue.get_str()) == demoAddress);
+    BOOST_CHECK(keyIO.DecodeDestination(retValue.get_str()) == demoAddress);
 
     /*********************************
      * 			getaccount
      *********************************/
     BOOST_CHECK_THROW(CallRPC("getaccount"), runtime_error);
-    BOOST_CHECK_NO_THROW(CallRPC("getaccount " + EncodeDestination(demoAddress)));
+    BOOST_CHECK_NO_THROW(CallRPC("getaccount " + keyIO.EncodeDestination(demoAddress)));
 
     /*********************************
      * 	signmessage + verifymessage
      *********************************/
-    BOOST_CHECK_NO_THROW(retValue = CallRPC("signmessage " + EncodeDestination(demoAddress) + " mymessage"));
+    BOOST_CHECK_NO_THROW(retValue = CallRPC("signmessage " + keyIO.EncodeDestination(demoAddress) + " mymessage"));
     BOOST_CHECK_THROW(CallRPC("signmessage"), runtime_error);
     /* Should throw error because this address is not loaded in the wallet */
     BOOST_CHECK_THROW(CallRPC("signmessage t1h8SqgtM3QM5e2M8EzhhT1yL2PXXtA6oqe mymessage"), runtime_error);
 
     /* missing arguments */
-    BOOST_CHECK_THROW(CallRPC("verifymessage " + EncodeDestination(demoAddress)), runtime_error);
-    BOOST_CHECK_THROW(CallRPC("verifymessage " + EncodeDestination(demoAddress) + " " + retValue.get_str()), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("verifymessage " + keyIO.EncodeDestination(demoAddress)), runtime_error);
+    BOOST_CHECK_THROW(CallRPC("verifymessage " + keyIO.EncodeDestination(demoAddress) + " " + retValue.get_str()), runtime_error);
     /* Illegal address */
     BOOST_CHECK_THROW(CallRPC("verifymessage t1VtArtnn1dGPiD2WFfMXYXW5mHM3q1Gpg " + retValue.get_str() + " mymessage"), runtime_error);
     /* wrong address */
     BOOST_CHECK(CallRPC("verifymessage t1VtArtnn1dGPiD2WFfMXYXW5mHM3q1GpgV " + retValue.get_str() + " mymessage").get_bool() == false);
     /* Correct address and signature but wrong message */
-    BOOST_CHECK(CallRPC("verifymessage " + EncodeDestination(demoAddress) + " " + retValue.get_str() + " wrongmessage").get_bool() == false);
+    BOOST_CHECK(CallRPC("verifymessage " + keyIO.EncodeDestination(demoAddress) + " " + retValue.get_str() + " wrongmessage").get_bool() == false);
     /* Correct address, message and signature*/
-    BOOST_CHECK(CallRPC("verifymessage " + EncodeDestination(demoAddress) + " " + retValue.get_str() + " mymessage").get_bool() == true);
+    BOOST_CHECK(CallRPC("verifymessage " + keyIO.EncodeDestination(demoAddress) + " " + retValue.get_str() + " mymessage").get_bool() == true);
 
     /*********************************
      * 		getaddressesbyaccount
@@ -255,7 +257,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
     BOOST_CHECK_EQUAL(4, arr.size());
     bool notFound = true;
     for (auto a : arr.getValues()) {
-        notFound &= DecodeDestination(a.get_str()) != demoAddress;
+        notFound &= keyIO.DecodeDestination(a.get_str()) != demoAddress;
     }
     BOOST_CHECK(!notFound);
 
@@ -516,8 +518,9 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_exportwallet)
     libzcash::SproutSpendingKey key;
     BOOST_CHECK(pwalletMain->GetSproutSpendingKey(addr, key));
 
-    std::string s1 = EncodePaymentAddress(addr);
-    std::string s2 = EncodeSpendingKey(key);
+    KeyIO keyIO(Params());
+    std::string s1 = keyIO.EncodePaymentAddress(addr);
+    std::string s2 = keyIO.EncodeSpendingKey(key);
 
     // There's no way to really delete a private key so we will read in the
     // exported wallet file and search for the spending key and payment address.
@@ -557,11 +560,12 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importwallet)
     // error if too many args
     BOOST_CHECK_THROW(CallRPC("z_importwallet toomany args"), runtime_error);
 
+    KeyIO keyIO(Params());
     // create a random key locally
     auto testSpendingKey = libzcash::SproutSpendingKey::random();
     auto testPaymentAddress = testSpendingKey.address();
-    std::string testAddr = EncodePaymentAddress(testPaymentAddress);
-    std::string testKey = EncodeSpendingKey(testSpendingKey);
+    std::string testAddr = keyIO.EncodePaymentAddress(testPaymentAddress);
+    std::string testKey = keyIO.EncodeSpendingKey(testSpendingKey);
 
     // create test data using the random key
     std::string format_str = "# Wallet dump created by Zcash v0.11.2.0.z8-9155cc6-dirty (2016-08-11 11:37:00 -0700)\n"
@@ -599,7 +603,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importwallet)
     BOOST_CHECK(addrs.size()==1);
 
     // check that we have the spending key for the address
-    auto address = DecodePaymentAddress(testAddr);
+    auto address = keyIO.DecodePaymentAddress(testAddr);
     BOOST_CHECK(IsValidPaymentAddress(address));
     BOOST_ASSERT(boost::get<libzcash::SproutPaymentAddress>(&address) != nullptr);
     auto addr = boost::get<libzcash::SproutPaymentAddress>(address);
@@ -608,7 +612,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importwallet)
     // Verify the spending key is the same as the test data
     libzcash::SproutSpendingKey k;
     BOOST_CHECK(pwalletMain->GetSproutSpendingKey(addr, k));
-    BOOST_CHECK_EQUAL(testKey, EncodeSpendingKey(k));
+    BOOST_CHECK_EQUAL(testKey, keyIO.EncodeSpendingKey(k));
 }
 
 
@@ -631,8 +635,9 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
     BOOST_CHECK_THROW(CallRPC("z_exportkey toomany args"), runtime_error);
 
     // error if invalid args
+    KeyIO keyIO(Params());
     auto sk = libzcash::SproutSpendingKey::random();
-    std::string prefix = std::string("z_importkey ") + EncodeSpendingKey(sk) + " yes ";
+    std::string prefix = std::string("z_importkey ") + keyIO.EncodeSpendingKey(sk) + " yes ";
     BOOST_CHECK_THROW(CallRPC(prefix + "-1"), runtime_error);
     BOOST_CHECK_THROW(CallRPC(prefix + "2147483647"), runtime_error); // allowed, but > height of active chain tip
     BOOST_CHECK_THROW(CallRPC(prefix + "2147483648"), runtime_error); // not allowed, > int32 used for nHeight
@@ -653,8 +658,8 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
         // create a random Sprout key locally
         auto testSpendingKey = libzcash::SproutSpendingKey::random();
         auto testPaymentAddress = testSpendingKey.address();
-        std::string testAddr = EncodePaymentAddress(testPaymentAddress);
-        std::string testKey = EncodeSpendingKey(testSpendingKey);
+        std::string testAddr = keyIO.EncodePaymentAddress(testPaymentAddress);
+        std::string testKey = keyIO.EncodeSpendingKey(testSpendingKey);
         BOOST_CHECK_NO_THROW(CallRPC(string("z_importkey ") + testKey));
         BOOST_CHECK_NO_THROW(retValue = CallRPC(string("z_exportkey ") + testAddr));
         BOOST_CHECK_EQUAL(retValue.get_str(), testKey);
@@ -662,8 +667,8 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
         // create a random Sapling key locally
         auto testSaplingSpendingKey = m.Derive(i);
         auto testSaplingPaymentAddress = testSaplingSpendingKey.DefaultAddress();
-        std::string testSaplingAddr = EncodePaymentAddress(testSaplingPaymentAddress);
-        std::string testSaplingKey = EncodeSpendingKey(testSaplingSpendingKey);
+        std::string testSaplingAddr = keyIO.EncodePaymentAddress(testSaplingPaymentAddress);
+        std::string testSaplingKey = keyIO.EncodeSpendingKey(testSaplingSpendingKey);
         BOOST_CHECK_NO_THROW(CallRPC(string("z_importkey ") + testSaplingKey));
         BOOST_CHECK_NO_THROW(retValue = CallRPC(string("z_exportkey ") + testSaplingAddr));
         BOOST_CHECK_EQUAL(retValue.get_str(), testSaplingKey);
@@ -682,7 +687,7 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_importexport)
 
     // Make new addresses for the set
     for (int i=0; i<n2; i++) {
-        myaddrs.insert(EncodePaymentAddress(pwalletMain->GenerateNewSproutZKey()));
+        myaddrs.insert(keyIO.EncodePaymentAddress(pwalletMain->GenerateNewSproutZKey()));
     }
 
     // Verify number of addresses stored in wallet is n1+n2
@@ -729,17 +734,18 @@ BOOST_AUTO_TEST_CASE(rpc_wallet_z_getnewaddress) {
         pwalletMain->GenerateNewSeed();
     }
 
+    KeyIO keyIO(Params());
     // No parameter defaults to sapling address
     addr = CallRPC("z_getnewaddress");
-    CheckHaveAddr<SaplingPaymentAddress>(DecodePaymentAddress(addr.get_str()));
+    CheckHaveAddr<SaplingPaymentAddress>(keyIO.DecodePaymentAddress(addr.get_str()));
 
     // Passing 'sapling' should also work
     addr = CallRPC("z_getnewaddress sapling");
-    CheckHaveAddr<SaplingPaymentAddress>(DecodePaymentAddress(addr.get_str()));
+    CheckHaveAddr<SaplingPaymentAddress>(keyIO.DecodePaymentAddress(addr.get_str()));
 
     // Should also support sprout
     addr = CallRPC("z_getnewaddress sprout");
-    CheckHaveAddr<SproutPaymentAddress>(DecodePaymentAddress(addr.get_str()));
+    CheckHaveAddr<SproutPaymentAddress>(keyIO.DecodePaymentAddress(addr.get_str()));
 
     // Should throw on invalid argument
     CheckRPCThrows("z_getnewaddress garbage", "Invalid address type");
@@ -1062,7 +1068,8 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_parameters)
     std::fill(v.begin(),v.end(), 'A');
     std::string badmemo(v.begin(), v.end());
     auto pa = pwalletMain->GenerateNewSproutZKey();
-    std::string zaddr1 = EncodePaymentAddress(pa);
+    KeyIO keyIO(Params());
+    std::string zaddr1 = keyIO.EncodePaymentAddress(pa);
     BOOST_CHECK_THROW(CallRPC(string("z_sendmany tmRr6yJonqGK23UVhrKuyvTpF8qxQQjKigJ ")
             + "[{\"address\":\"" + zaddr1 + "\", \"amount\":123.456}]"), runtime_error);
 
@@ -1153,7 +1160,8 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_internals)
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getnewaddress"));
     std::string taddr1 = retValue.get_str();
     auto pa = pwalletMain->GenerateNewSproutZKey();
-    std::string zaddr1 = EncodePaymentAddress(pa);
+    KeyIO keyIO(Params());
+    std::string zaddr1 = keyIO.EncodePaymentAddress(pa);
 
     // there are no utxos to spend
     {
@@ -1351,11 +1359,12 @@ BOOST_AUTO_TEST_CASE(rpc_z_sendmany_taddr_to_sapling)
 
     UniValue retValue;
 
+    KeyIO keyIO(Params());
     // add keys manually
     auto taddr = pwalletMain->GenerateNewKey().GetID();
-    std::string taddr1 = EncodeDestination(taddr);
+    std::string taddr1 = keyIO.EncodeDestination(taddr);
     auto pa = pwalletMain->GenerateNewSaplingZKey();
-    std::string zaddr1 = EncodePaymentAddress(pa);
+    std::string zaddr1 = keyIO.EncodePaymentAddress(pa);
 
     auto consensusParams = Params().GetConsensus();
     retValue = CallRPC("getblockcount");
@@ -1700,8 +1709,9 @@ BOOST_AUTO_TEST_CASE(rpc_z_shieldcoinbase_internals)
     CMutableTransaction mtx = CreateNewContextualCMutableTransaction(consensusParams, nHeight + 1);
 
     // Add keys manually
+    KeyIO keyIO(Params());
     auto pa = pwalletMain->GenerateNewSproutZKey();
-    std::string zaddr = EncodePaymentAddress(pa);
+    std::string zaddr = keyIO.EncodePaymentAddress(pa);
 
     // Insufficient funds
     {
@@ -1908,7 +1918,8 @@ BOOST_AUTO_TEST_CASE(rpc_z_mergetoaddress_internals)
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getnewaddress"));
     MergeToAddressRecipient taddr1(retValue.get_str(), "");
     auto pa = pwalletMain->GenerateNewSproutZKey();
-    MergeToAddressRecipient zaddr1(EncodePaymentAddress(pa), "DEADBEEF");
+    KeyIO keyIO(Params());
+    MergeToAddressRecipient zaddr1(keyIO.EncodePaymentAddress(pa), "DEADBEEF");
 
     // Insufficient funds
     {
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
index 6e20ae6d4..4e953ceca 100644
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -465,9 +465,10 @@ bool CWallet::LoadCScript(const CScript& redeemScript)
     /* A sanity check was added in pull #3843 to avoid adding redeemScripts
      * that never can be redeemed. However, old wallets may still contain
      * these. Do not add them to the wallet and warn. */
+    KeyIO keyIO(Params());
     if (redeemScript.size() > MAX_SCRIPT_ELEMENT_SIZE)
     {
-        std::string strAddr = EncodeDestination(CScriptID(redeemScript));
+        std::string strAddr = keyIO.EncodeDestination(CScriptID(redeemScript));
         LogPrintf("%s: Warning: This wallet contains a redeemScript of size %i which exceeds maximum size %i thus can never be redeemed. Do not use address %s.\n",
             __func__, redeemScript.size(), MAX_SCRIPT_ELEMENT_SIZE, strAddr);
         return true;
@@ -2271,13 +2272,14 @@ std::pair<SproutNotePlaintext, SproutPaymentAddress> CWalletTx::DecryptSproutNot
     auto nd = this->mapSproutNoteData.at(jsop);
     SproutPaymentAddress pa = nd.address;
 
+    KeyIO keyIO(Params());
     // Get cached decryptor
     ZCNoteDecryption decryptor;
     if (!pwallet->GetNoteDecryptor(pa, decryptor)) {
         // Note decryptors are created when the wallet is loaded, so it should always exist
         throw std::runtime_error(strprintf(
             "Could not find note decryptor for payment address %s",
-            EncodePaymentAddress(pa)));
+            keyIO.EncodePaymentAddress(pa)));
     }
 
     auto hSig = this->vJoinSplit[jsop.js].h_sig(this->joinSplitPubKey);
@@ -2294,12 +2296,12 @@ std::pair<SproutNotePlaintext, SproutPaymentAddress> CWalletTx::DecryptSproutNot
         // Couldn't decrypt with this spending key
         throw std::runtime_error(strprintf(
             "Could not decrypt note for payment address %s",
-            EncodePaymentAddress(pa)));
+            keyIO.EncodePaymentAddress(pa)));
     } catch (const std::exception &exc) {
         // Unexpected failure
         throw std::runtime_error(strprintf(
             "Error while decrypting note for payment address %s: %s",
-            EncodePaymentAddress(pa), exc.what()));
+            keyIO.EncodePaymentAddress(pa), exc.what()));
     }
 }
 
@@ -3955,22 +3957,24 @@ bool CWallet::SetAddressBook(const CTxDestination& address, const string& strNam
     }
     NotifyAddressBookChanged(this, address, strName, ::IsMine(*this, address) != ISMINE_NO,
                              strPurpose, (fUpdated ? CT_UPDATED : CT_NEW) );
+    KeyIO keyIO(Params());
     if (!fFileBacked)
         return false;
-    if (!strPurpose.empty() && !CWalletDB(strWalletFile).WritePurpose(EncodeDestination(address), strPurpose))
+    if (!strPurpose.empty() && !CWalletDB(strWalletFile).WritePurpose(keyIO.EncodeDestination(address), strPurpose))
         return false;
-    return CWalletDB(strWalletFile).WriteName(EncodeDestination(address), strName);
+    return CWalletDB(strWalletFile).WriteName(keyIO.EncodeDestination(address), strName);
 }
 
 bool CWallet::DelAddressBook(const CTxDestination& address)
 {
+    KeyIO keyIO(Params());
     {
         LOCK(cs_wallet); // mapAddressBook
 
         if(fFileBacked)
         {
             // Delete destdata tuples associated with address
-            std::string strAddress = EncodeDestination(address);
+            std::string strAddress = keyIO.EncodeDestination(address);
             BOOST_FOREACH(const PAIRTYPE(string, string) &item, mapAddressBook[address].destdata)
             {
                 CWalletDB(strWalletFile).EraseDestData(strAddress, item.first);
@@ -3983,8 +3987,8 @@ bool CWallet::DelAddressBook(const CTxDestination& address)
 
     if (!fFileBacked)
         return false;
-    CWalletDB(strWalletFile).ErasePurpose(EncodeDestination(address));
-    return CWalletDB(strWalletFile).EraseName(EncodeDestination(address));
+    CWalletDB(strWalletFile).ErasePurpose(keyIO.EncodeDestination(address));
+    return CWalletDB(strWalletFile).EraseName(keyIO.EncodeDestination(address));
 }
 
 bool CWallet::SetDefaultKey(const CPubKey &vchPubKey)
@@ -4558,7 +4562,8 @@ bool CWallet::AddDestData(const CTxDestination &dest, const std::string &key, co
     mapAddressBook[dest].destdata.insert(std::make_pair(key, value));
     if (!fFileBacked)
         return true;
-    return CWalletDB(strWalletFile).WriteDestData(EncodeDestination(dest), key, value);
+    KeyIO keyIO(Params());
+    return CWalletDB(strWalletFile).WriteDestData(keyIO.EncodeDestination(dest), key, value);
 }
 
 bool CWallet::EraseDestData(const CTxDestination &dest, const std::string &key)
@@ -4567,7 +4572,8 @@ bool CWallet::EraseDestData(const CTxDestination &dest, const std::string &key)
         return false;
     if (!fFileBacked)
         return true;
-    return CWalletDB(strWalletFile).EraseDestData(EncodeDestination(dest), key);
+    KeyIO keyIO(Params());
+    return CWalletDB(strWalletFile).EraseDestData(keyIO.EncodeDestination(dest), key);
 }
 
 bool CWallet::LoadDestData(const CTxDestination &dest, const std::string &key, const std::string &value)
@@ -4842,10 +4848,11 @@ bool CWallet::ParameterInteraction()
     bSpendZeroConfChange = GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
     fSendFreeTransactions = GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
 
+    KeyIO keyIO(Params());
     // Check Sapling migration address if set and is a valid Sapling address
     if (mapArgs.count("-migrationdestaddress")) {
         std::string migrationDestAddress = mapArgs["-migrationdestaddress"];
-        libzcash::PaymentAddress address = DecodePaymentAddress(migrationDestAddress);
+        libzcash::PaymentAddress address = keyIO.DecodePaymentAddress(migrationDestAddress);
         if (boost::get<libzcash::SaplingPaymentAddress>(&address) == nullptr) {
             return UIError(_("-migrationdestaddress must be a valid Sapling address."));
         }
@@ -4957,8 +4964,9 @@ void CWallet::GetFilteredNotes(
 {
     std::set<PaymentAddress> filterAddresses;
 
+    KeyIO keyIO(Params());
     if (address.length() > 0) {
-        filterAddresses.insert(DecodePaymentAddress(address));
+        filterAddresses.insert(keyIO.DecodePaymentAddress(address));
     }
 
     GetFilteredNotes(sproutEntries, saplingEntries, filterAddresses, minDepth, INT_MAX, ignoreSpent, requireSpendingKey);
@@ -4981,6 +4989,7 @@ void CWallet::GetFilteredNotes(
 {
     LOCK2(cs_main, cs_wallet);
 
+    KeyIO keyIO(Params());
     for (auto & p : mapWallet) {
         CWalletTx wtx = p.second;
 
@@ -5028,7 +5037,7 @@ void CWallet::GetFilteredNotes(
             ZCNoteDecryption decryptor;
             if (!GetNoteDecryptor(pa, decryptor)) {
                 // Note decryptors are created when the wallet is loaded, so it should always exist
-                throw std::runtime_error(strprintf("Could not find note decryptor for payment address %s", EncodePaymentAddress(pa)));
+                throw std::runtime_error(strprintf("Could not find note decryptor for payment address %s", keyIO.EncodePaymentAddress(pa)));
             }
 
             // determine amount of funds in the note
@@ -5046,10 +5055,10 @@ void CWallet::GetFilteredNotes(
 
             } catch (const note_decryption_failed &err) {
                 // Couldn't decrypt with this spending key
-                throw std::runtime_error(strprintf("Could not decrypt note for payment address %s", EncodePaymentAddress(pa)));
+                throw std::runtime_error(strprintf("Could not decrypt note for payment address %s", keyIO.EncodePaymentAddress(pa)));
             } catch (const std::exception &exc) {
                 // Unexpected failure
-                throw std::runtime_error(strprintf("Error while decrypting note for payment address %s: %s", EncodePaymentAddress(pa), exc.what()));
+                throw std::runtime_error(strprintf("Error while decrypting note for payment address %s: %s", keyIO.EncodePaymentAddress(pa), exc.what()));
             }
         }
 
@@ -5236,8 +5245,9 @@ KeyAddResult AddViewingKeyToWallet::operator()(const libzcash::InvalidEncoding&
 
 KeyAddResult AddSpendingKeyToWallet::operator()(const libzcash::SproutSpendingKey &sk) const {
     auto addr = sk.address();
+    KeyIO keyIO(Params());
     if (log){
-        LogPrint("zrpc", "Importing zaddr %s...\n", EncodePaymentAddress(addr));
+        LogPrint("zrpc", "Importing zaddr %s...\n", keyIO.EncodePaymentAddress(addr));
     }
     if (m_wallet->HaveSproutSpendingKey(addr)) {
         return KeyAlreadyExists;
@@ -5252,9 +5262,10 @@ KeyAddResult AddSpendingKeyToWallet::operator()(const libzcash::SproutSpendingKe
 KeyAddResult AddSpendingKeyToWallet::operator()(const libzcash::SaplingExtendedSpendingKey &sk) const {
     auto extfvk = sk.ToXFVK();
     auto ivk = extfvk.fvk.in_viewing_key();
+    KeyIO keyIO(Params());
     {
         if (log){
-            LogPrint("zrpc", "Importing zaddr %s...\n", EncodePaymentAddress(sk.DefaultAddress()));
+            LogPrint("zrpc", "Importing zaddr %s...\n", keyIO.EncodePaymentAddress(sk.DefaultAddress()));
         }
         // Don't throw error in case a key is already there
         if (m_wallet->HaveSaplingSpendingKey(extfvk)) {
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
index af35606ee..da7d9756f 100644
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -458,6 +458,8 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
              CWalletScanState &wss, string& strType, string& strErr)
 {
     try {
+        KeyIO keyIO(Params());
+
         // Unserialize
         // Taking advantage of the fact that pair serialization
         // is just the two items serialized one after the other
@@ -466,13 +468,13 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
         {
             string strAddress;
             ssKey >> strAddress;
-            ssValue >> pwallet->mapAddressBook[DecodeDestination(strAddress)].name;
+            ssValue >> pwallet->mapAddressBook[keyIO.DecodeDestination(strAddress)].name;
         }
         else if (strType == "purpose")
         {
             string strAddress;
             ssKey >> strAddress;
-            ssValue >> pwallet->mapAddressBook[DecodeDestination(strAddress)].purpose;
+            ssValue >> pwallet->mapAddressBook[keyIO.DecodeDestination(strAddress)].purpose;
         }
         else if (strType == "tx")
         {
@@ -829,7 +831,7 @@ ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue,
             ssKey >> strAddress;
             ssKey >> strKey;
             ssValue >> strValue;
-            if (!pwallet->LoadDestData(DecodeDestination(strAddress), strKey, strValue))
+            if (!pwallet->LoadDestData(keyIO.DecodeDestination(strAddress), strKey, strValue))
             {
                 strErr = "Error reading wallet database: LoadDestData failed";
                 return false;

From 9119ca8f86ec3246818f01e4b662cce3681f579b Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Thu, 9 Jul 2020 18:00:45 -0600
Subject: [PATCH 28/36] Rename KeyInfo -> KeyConstants and move out of
 Consensus namespace.

---
 src/chainparams.cpp      | 91 ++++++++++++++++++++--------------------
 src/chainparams.h        | 14 +++----
 src/consensus/params.cpp |  8 ++--
 src/consensus/params.h   | 36 ++--------------
 src/key_constants.h      | 39 +++++++++++++++++
 src/key_io.cpp           | 84 ++++++++++++++++++-------------------
 src/key_io.h             |  5 ++-
 7 files changed, 144 insertions(+), 133 deletions(-)
 create mode 100644 src/key_constants.h

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 51279ef0c..73b52e8c5 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -1,5 +1,6 @@
 // Copyright (c) 2010 Satoshi Nakamoto
 // Copyright (c) 2009-2014 The Bitcoin Core developers
+// Copyright (c) 2015-2020 The Zcash Developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or https://www.opensource.org/licenses/mit-license.php .
 
@@ -128,42 +129,42 @@ public:
         consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;
 
         // guarantees the first 2 characters, when base58 encoded, are "t1"
-        keyInfo.base58Prefixes[PUBKEY_ADDRESS]     = {0x1C,0xB8};
+        keyConstants.base58Prefixes[PUBKEY_ADDRESS]     = {0x1C,0xB8};
         // guarantees the first 2 characters, when base58 encoded, are "t3"
-        keyInfo.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBD};
+        keyConstants.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBD};
         // the first character, when base58 encoded, is "5" or "K" or "L" (as in Bitcoin)
-        keyInfo.base58Prefixes[SECRET_KEY]         = {0x80};
+        keyConstants.base58Prefixes[SECRET_KEY]         = {0x80};
         // do not rely on these BIP32 prefixes; they are not specified and may change
-        keyInfo.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x88,0xB2,0x1E};
-        keyInfo.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x88,0xAD,0xE4};
+        keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x88,0xB2,0x1E};
+        keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x88,0xAD,0xE4};
         // guarantees the first 2 characters, when base58 encoded, are "zc"
-        keyInfo.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0x9A};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0x9A};
         // guarantees the first 4 characters, when base58 encoded, are "ZiVK"
-        keyInfo.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAB,0xD3};
+        keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAB,0xD3};
         // guarantees the first 2 characters, when base58 encoded, are "SK"
-        keyInfo.base58Prefixes[ZCSPENDING_KEY]     = {0xAB,0x36};
+        keyConstants.base58Prefixes[ZCSPENDING_KEY]     = {0xAB,0x36};
 
-        keyInfo.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "zs";
-        keyInfo.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviews";
-        keyInfo.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivks";
-        keyInfo.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-main";
-        keyInfo.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviews";
+        keyConstants.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "zs";
+        keyConstants.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviews";
+        keyConstants.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivks";
+        keyConstants.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-main";
+        keyConstants.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviews";
 
         // TODO: This `if` can be removed once canopy activation height is set.
         if (consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
             std::vector<std::string> addresses(48, "");
             consensus.AddZIP207FundingStream(
-                keyInfo,
+                keyConstants,
                 Consensus::FS_ZIP214_ECC,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
                 addresses);
             consensus.AddZIP207FundingStream(
-                keyInfo,
+                keyConstants,
                 Consensus::FS_ZIP214_ZF,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
                 addresses);
             consensus.AddZIP207FundingStream(
-                keyInfo,
+                keyConstants,
                 Consensus::FS_ZIP214_MG,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
                 addresses);
@@ -357,42 +358,42 @@ public:
         consensus.nFundingPeriodLength = consensus.nPostBlossomSubsidyHalvingInterval / 48;
 
         // guarantees the first 2 characters, when base58 encoded, are "tm"
-        keyInfo.base58Prefixes[PUBKEY_ADDRESS]     = {0x1D,0x25};
+        keyConstants.base58Prefixes[PUBKEY_ADDRESS]     = {0x1D,0x25};
         // guarantees the first 2 characters, when base58 encoded, are "t2"
-        keyInfo.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBA};
+        keyConstants.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBA};
         // the first character, when base58 encoded, is "9" or "c" (as in Bitcoin)
-        keyInfo.base58Prefixes[SECRET_KEY]         = {0xEF};
+        keyConstants.base58Prefixes[SECRET_KEY]         = {0xEF};
         // do not rely on these BIP32 prefixes; they are not specified and may change
-        keyInfo.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
-        keyInfo.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
+        keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
+        keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
         // guarantees the first 2 characters, when base58 encoded, are "zt"
-        keyInfo.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
         // guarantees the first 4 characters, when base58 encoded, are "ZiVt"
-        keyInfo.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
+        keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
         // guarantees the first 2 characters, when base58 encoded, are "ST"
-        keyInfo.base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
+        keyConstants.base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
 
-        keyInfo.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "ztestsapling";
-        keyInfo.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewtestsapling";
-        keyInfo.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivktestsapling";
-        keyInfo.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-test";
-        keyInfo.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewtestsapling";
+        keyConstants.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "ztestsapling";
+        keyConstants.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewtestsapling";
+        keyConstants.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivktestsapling";
+        keyConstants.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-test";
+        keyConstants.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewtestsapling";
 
         // TODO: This `if` can be removed once canopy activation height is set.
         if (consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight != Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT) {
             std::vector<std::string> addresses(48, "");
             consensus.AddZIP207FundingStream(
-                keyInfo,
+                keyConstants,
                 Consensus::FS_ZIP214_ECC,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
                 addresses);
             consensus.AddZIP207FundingStream(
-                keyInfo,
+                keyConstants,
                 Consensus::FS_ZIP214_ZF,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
                 addresses);
             consensus.AddZIP207FundingStream(
-                keyInfo,
+                keyConstants,
                 Consensus::FS_ZIP214_MG,
                 consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight, 2726400,
                 addresses);
@@ -542,21 +543,21 @@ public:
         // Defined funding streams can be enabled with node config flags.
 
         // These prefixes are the same as the testnet prefixes
-        keyInfo.base58Prefixes[PUBKEY_ADDRESS]     = {0x1D,0x25};
-        keyInfo.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBA};
-        keyInfo.base58Prefixes[SECRET_KEY]         = {0xEF};
+        keyConstants.base58Prefixes[PUBKEY_ADDRESS]     = {0x1D,0x25};
+        keyConstants.base58Prefixes[SCRIPT_ADDRESS]     = {0x1C,0xBA};
+        keyConstants.base58Prefixes[SECRET_KEY]         = {0xEF};
         // do not rely on these BIP32 prefixes; they are not specified and may change
-        keyInfo.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
-        keyInfo.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
-        keyInfo.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
-        keyInfo.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
-        keyInfo.base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
+        keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
+        keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
+        keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
+        keyConstants.base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
 
-        keyInfo.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "zregtestsapling";
-        keyInfo.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewregtestsapling";
-        keyInfo.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivkregtestsapling";
-        keyInfo.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-regtest";
-        keyInfo.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewregtestsapling";
+        keyConstants.bech32HRPs[SAPLING_PAYMENT_ADDRESS]      = "zregtestsapling";
+        keyConstants.bech32HRPs[SAPLING_FULL_VIEWING_KEY]     = "zviewregtestsapling";
+        keyConstants.bech32HRPs[SAPLING_INCOMING_VIEWING_KEY] = "zivkregtestsapling";
+        keyConstants.bech32HRPs[SAPLING_EXTENDED_SPEND_KEY]   = "secret-extended-key-regtest";
+        keyConstants.bech32HRPs[SAPLING_EXTENDED_FVK]         = "zxviewregtestsapling";
 
         // The best chain should have at least this much work.
         consensus.nMinimumChainWork = uint256S("0x00");
diff --git a/src/chainparams.h b/src/chainparams.h
index 136b40a67..e38867ff5 100644
--- a/src/chainparams.h
+++ b/src/chainparams.h
@@ -32,13 +32,13 @@ struct CCheckpointData {
     double fTransactionsPerDay;
 };
 
-class CBaseKeyInfo : public Consensus::KeyInfo {
+class CBaseKeyConstants : public KeyConstants {
 public:
     const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
     const std::string& Bech32HRP(Bech32Type type) const { return bech32HRPs[type]; }
 
-    std::vector<unsigned char> base58Prefixes[Consensus::KeyInfo::MAX_BASE58_TYPES];
-    std::string bech32HRPs[Consensus::KeyInfo::MAX_BECH32_TYPES];
+    std::vector<unsigned char> base58Prefixes[KeyConstants::MAX_BASE58_TYPES];
+    std::string bech32HRPs[KeyConstants::MAX_BECH32_TYPES];
 };
 
 /**
@@ -48,7 +48,7 @@ public:
  * a regression test mode which is intended for private networks only. It has
  * minimal difficulty to ensure that blocks can be found instantly.
  */
-class CChainParams: public Consensus::KeyInfo 
+class CChainParams: public KeyConstants 
 {
 public:
     const Consensus::Params& GetConsensus() const { return consensus; }
@@ -79,10 +79,10 @@ public:
     std::string NetworkIDString() const { return strNetworkID; }
     const std::vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
     const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { 
-        return keyInfo.Base58Prefix(type); 
+        return keyConstants.Base58Prefix(type); 
     }
     const std::string& Bech32HRP(Bech32Type type) const { 
-        return keyInfo.Bech32HRP(type); 
+        return keyConstants.Bech32HRP(type); 
     }
     const std::vector<SeedSpec6>& FixedSeeds() const { return vFixedSeeds; }
     const CCheckpointData& Checkpoints() const { return checkpointData; }
@@ -102,7 +102,7 @@ protected:
     int nDefaultPort = 0;
     uint64_t nPruneAfterHeight = 0;
     std::vector<CDNSSeedData> vSeeds;
-    CBaseKeyInfo keyInfo;
+    CBaseKeyConstants keyConstants;
     std::string strNetworkID;
     std::string strCurrencyUnits;
     uint32_t bip44CoinType;
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 3623e0e48..76f8a877c 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -142,12 +142,12 @@ namespace Consensus {
 
     FundingStream FundingStream::ParseFundingStream(
         const Consensus::Params& params,
-        const Consensus::KeyInfo& keyInfo,
+        const KeyConstants& keyConstants,
         const int startHeight,
         const int endHeight,
         const std::vector<std::string>& strAddresses)
     {
-        KeyIO keyIO(keyInfo);
+        KeyIO keyIO(keyConstants);
 
         // Parse the address strings into concrete types.
         std::vector<FundingStreamAddress> addresses;
@@ -169,13 +169,13 @@ namespace Consensus {
     };
 
     void Params::AddZIP207FundingStream(
-        const Consensus::KeyInfo& keyInfo,
+        const KeyConstants& keyConstants,
         FundingStreamIndex idx,
         int startHeight,
         int endHeight,
         const std::vector<std::string>& strAddresses)
     {
-        vFundingStreams[idx] = FundingStream::ParseFundingStream(*this, keyInfo, startHeight, endHeight, strAddresses);
+        vFundingStreams[idx] = FundingStream::ParseFundingStream(*this, keyConstants, startHeight, endHeight, strAddresses);
     };
 
     FundingStreamAddress FundingStream::RecipientAddress(const Consensus::Params& params, int nHeight) const 
diff --git a/src/consensus/params.h b/src/consensus/params.h
index 2c36d879d..02ae97e47 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -8,6 +8,7 @@
 
 #include <script/script.h>
 #include "uint256.h"
+#include "key_constants.h"
 #include <zcash/address/sapling.hpp>
 
 #include <boost/optional.hpp>
@@ -101,37 +102,6 @@ enum FundingStreamError {
     INSUFFICIENT_ADDRESSES,
 };
 
-class KeyInfo 
-{
-public:
-    enum Base58Type {
-        PUBKEY_ADDRESS,
-        SCRIPT_ADDRESS,
-        SECRET_KEY,
-        EXT_PUBLIC_KEY,
-        EXT_SECRET_KEY,
-
-        ZCPAYMENT_ADDRRESS,
-        ZCSPENDING_KEY,
-        ZCVIEWING_KEY,
-
-        MAX_BASE58_TYPES
-    };
-
-    enum Bech32Type {
-        SAPLING_PAYMENT_ADDRESS,
-        SAPLING_FULL_VIEWING_KEY,
-        SAPLING_INCOMING_VIEWING_KEY,
-        SAPLING_EXTENDED_SPEND_KEY,
-        SAPLING_EXTENDED_FVK,
-
-        MAX_BECH32_TYPES
-    };
-
-    virtual const std::vector<unsigned char>& Base58Prefix(Base58Type type) const =0;
-    virtual const std::string& Bech32HRP(Bech32Type type) const =0;
-};
-
 class FundingStream
 {
 private:
@@ -154,7 +124,7 @@ public:
 
     static FundingStream ParseFundingStream(
         const Consensus::Params& params,
-        const Consensus::KeyInfo& keyInfo,
+        const KeyConstants& keyInfo,
         const int startHeight,
         const int endHeight,
         const std::vector<std::string>& strAddresses);
@@ -241,7 +211,7 @@ struct Params {
     int nFundingPeriodLength;
     boost::optional<FundingStream> vFundingStreams[MAX_FUNDING_STREAMS];
     void AddZIP207FundingStream(
-        const Consensus::KeyInfo& keyInfo,
+        const KeyConstants& keyInfo,
         FundingStreamIndex idx,
         int startHeight,
         int endHeight,
diff --git a/src/key_constants.h b/src/key_constants.h
new file mode 100644
index 000000000..c3769fd8f
--- /dev/null
+++ b/src/key_constants.h
@@ -0,0 +1,39 @@
+// Copyright (c) 2020 The Zcash developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or https://www.opensource.org/licenses/mit-license.php .
+
+#ifndef ZCASH_KEY_CONSTANTS_H
+#define ZCASH_KEY_CONSTANTS_H
+
+class KeyConstants 
+{
+public:
+    enum Base58Type {
+        PUBKEY_ADDRESS,
+        SCRIPT_ADDRESS,
+        SECRET_KEY,
+        EXT_PUBLIC_KEY,
+        EXT_SECRET_KEY,
+
+        ZCPAYMENT_ADDRRESS,
+        ZCSPENDING_KEY,
+        ZCVIEWING_KEY,
+
+        MAX_BASE58_TYPES
+    };
+
+    enum Bech32Type {
+        SAPLING_PAYMENT_ADDRESS,
+        SAPLING_FULL_VIEWING_KEY,
+        SAPLING_INCOMING_VIEWING_KEY,
+        SAPLING_EXTENDED_SPEND_KEY,
+        SAPLING_EXTENDED_FVK,
+
+        MAX_BECH32_TYPES
+    };
+
+    virtual const std::vector<unsigned char>& Base58Prefix(Base58Type type) const =0;
+    virtual const std::string& Bech32HRP(Bech32Type type) const =0;
+};
+
+#endif // ZCASH_KEY_CONSTANTS_H
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 9f3e9757b..18cd947fb 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -22,21 +22,21 @@ namespace
 class DestinationEncoder : public boost::static_visitor<std::string>
 {
 private:
-    const Consensus::KeyInfo& keyInfo;
+    const KeyConstants& keyConstants;
 
 public:
-    DestinationEncoder(const Consensus::KeyInfo& keyInfo) : keyInfo(keyInfo) {}
+    DestinationEncoder(const KeyConstants& keyConstants) : keyConstants(keyConstants) {}
 
     std::string operator()(const CKeyID& id) const
     {
-        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::PUBKEY_ADDRESS);
+        std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::PUBKEY_ADDRESS);
         data.insert(data.end(), id.begin(), id.end());
         return EncodeBase58Check(data);
     }
 
     std::string operator()(const CScriptID& id) const
     {
-        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::SCRIPT_ADDRESS);
+        std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::SCRIPT_ADDRESS);
         data.insert(data.end(), id.begin(), id.end());
         return EncodeBase58Check(data);
     }
@@ -47,16 +47,16 @@ public:
 class PaymentAddressEncoder : public boost::static_visitor<std::string>
 {
 private:
-    const Consensus::KeyInfo& keyInfo;
+    const KeyConstants& keyConstants;
 
 public:
-    PaymentAddressEncoder(const Consensus::KeyInfo& keyInfo) : keyInfo(keyInfo) {}
+    PaymentAddressEncoder(const KeyConstants& keyConstants) : keyConstants(keyConstants) {}
 
     std::string operator()(const libzcash::SproutPaymentAddress& zaddr) const
     {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << zaddr;
-        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::ZCPAYMENT_ADDRRESS);
+        std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::ZCPAYMENT_ADDRRESS);
         data.insert(data.end(), ss.begin(), ss.end());
         return EncodeBase58Check(data);
     }
@@ -71,7 +71,7 @@ public:
         // See calculation comment below
         data.reserve((seraddr.size() * 8 + 4) / 5);
         ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, seraddr.begin(), seraddr.end());
-        return bech32::Encode(keyInfo.Bech32HRP(Consensus::KeyInfo::SAPLING_PAYMENT_ADDRESS), data);
+        return bech32::Encode(keyConstants.Bech32HRP(KeyConstants::SAPLING_PAYMENT_ADDRESS), data);
     }
 
     std::string operator()(const libzcash::InvalidEncoding& no) const { return {}; }
@@ -80,16 +80,16 @@ public:
 class ViewingKeyEncoder : public boost::static_visitor<std::string>
 {
 private:
-    const Consensus::KeyInfo& keyInfo;
+    const KeyConstants& keyConstants;
 
 public:
-    ViewingKeyEncoder(const Consensus::KeyInfo& keyInfo) : keyInfo(keyInfo) {}
+    ViewingKeyEncoder(const KeyConstants& keyConstants) : keyConstants(keyConstants) {}
 
     std::string operator()(const libzcash::SproutViewingKey& vk) const
     {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << vk;
-        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::ZCVIEWING_KEY);
+        std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::ZCVIEWING_KEY);
         data.insert(data.end(), ss.begin(), ss.end());
         std::string ret = EncodeBase58Check(data);
         memory_cleanse(data.data(), data.size());
@@ -106,7 +106,7 @@ public:
         // See calculation comment below
         data.reserve((serkey.size() * 8 + 4) / 5);
         ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, serkey.begin(), serkey.end());
-        std::string ret = bech32::Encode(keyInfo.Bech32HRP(Consensus::KeyInfo::SAPLING_EXTENDED_FVK), data);
+        std::string ret = bech32::Encode(keyConstants.Bech32HRP(KeyConstants::SAPLING_EXTENDED_FVK), data);
         memory_cleanse(serkey.data(), serkey.size());
         memory_cleanse(data.data(), data.size());
         return ret;
@@ -118,16 +118,16 @@ public:
 class SpendingKeyEncoder : public boost::static_visitor<std::string>
 {
 private:
-    const Consensus::KeyInfo& keyInfo;
+    const KeyConstants& keyConstants;
 
 public:
-    SpendingKeyEncoder(const Consensus::KeyInfo& keyInfo) : keyInfo(keyInfo) {}
+    SpendingKeyEncoder(const KeyConstants& keyConstants) : keyConstants(keyConstants) {}
 
     std::string operator()(const libzcash::SproutSpendingKey& zkey) const
     {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << zkey;
-        std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::ZCSPENDING_KEY);
+        std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::ZCSPENDING_KEY);
         data.insert(data.end(), ss.begin(), ss.end());
         std::string ret = EncodeBase58Check(data);
         memory_cleanse(data.data(), data.size());
@@ -144,7 +144,7 @@ public:
         // See calculation comment below
         data.reserve((serkey.size() * 8 + 4) / 5);
         ConvertBits<8, 5, true>([&](unsigned char c) { data.push_back(c); }, serkey.begin(), serkey.end());
-        std::string ret = bech32::Encode(keyInfo.Bech32HRP(Consensus::KeyInfo::SAPLING_EXTENDED_SPEND_KEY), data);
+        std::string ret = bech32::Encode(keyConstants.Bech32HRP(KeyConstants::SAPLING_EXTENDED_SPEND_KEY), data);
         memory_cleanse(serkey.data(), serkey.size());
         memory_cleanse(data.data(), data.size());
         return ret;
@@ -170,14 +170,14 @@ CTxDestination KeyIO::DecodeDestination(const std::string& str)
         // base58-encoded Bitcoin addresses.
         // Public-key-hash-addresses have version 0 (or 111 testnet).
         // The data vector contains RIPEMD160(SHA256(pubkey)), where pubkey is the serialized public key.
-        const std::vector<unsigned char>& pubkey_prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::PUBKEY_ADDRESS);
+        const std::vector<unsigned char>& pubkey_prefix = keyConstants.Base58Prefix(KeyConstants::PUBKEY_ADDRESS);
         if (data.size() == hash.size() + pubkey_prefix.size() && std::equal(pubkey_prefix.begin(), pubkey_prefix.end(), data.begin())) {
             std::copy(data.begin() + pubkey_prefix.size(), data.end(), hash.begin());
             return CKeyID(hash);
         }
         // Script-hash-addresses have version 5 (or 196 testnet).
         // The data vector contains RIPEMD160(SHA256(cscript)), where cscript is the serialized redemption script.
-        const std::vector<unsigned char>& script_prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::SCRIPT_ADDRESS);
+        const std::vector<unsigned char>& script_prefix = keyConstants.Base58Prefix(KeyConstants::SCRIPT_ADDRESS);
         if (data.size() == hash.size() + script_prefix.size() && std::equal(script_prefix.begin(), script_prefix.end(), data.begin())) {
             std::copy(data.begin() + script_prefix.size(), data.end(), hash.begin());
             return CScriptID(hash);
@@ -191,7 +191,7 @@ CKey KeyIO::DecodeSecret(const std::string& str)
     CKey key;
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& privkey_prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::SECRET_KEY);
+        const std::vector<unsigned char>& privkey_prefix = keyConstants.Base58Prefix(KeyConstants::SECRET_KEY);
         if ((data.size() == 32 + privkey_prefix.size() || (data.size() == 33 + privkey_prefix.size() && data.back() == 1)) &&
             std::equal(privkey_prefix.begin(), privkey_prefix.end(), data.begin())) {
             bool compressed = data.size() == 33 + privkey_prefix.size();
@@ -205,7 +205,7 @@ CKey KeyIO::DecodeSecret(const std::string& str)
 std::string KeyIO::EncodeSecret(const CKey& key)
 {
     assert(key.IsValid());
-    std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::SECRET_KEY);
+    std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::SECRET_KEY);
     data.insert(data.end(), key.begin(), key.end());
     if (key.IsCompressed()) {
         data.push_back(1);
@@ -220,7 +220,7 @@ CExtPubKey KeyIO::DecodeExtPubKey(const std::string& str)
     CExtPubKey key;
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::EXT_PUBLIC_KEY);
+        const std::vector<unsigned char>& prefix = keyConstants.Base58Prefix(KeyConstants::EXT_PUBLIC_KEY);
         if (data.size() == BIP32_EXTKEY_SIZE + prefix.size() && std::equal(prefix.begin(), prefix.end(), data.begin())) {
             key.Decode(data.data() + prefix.size());
         }
@@ -230,7 +230,7 @@ CExtPubKey KeyIO::DecodeExtPubKey(const std::string& str)
 
 std::string KeyIO::EncodeExtPubKey(const CExtPubKey& key)
 {
-    std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::EXT_PUBLIC_KEY);
+    std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::EXT_PUBLIC_KEY);
     size_t size = data.size();
     data.resize(size + BIP32_EXTKEY_SIZE);
     key.Encode(data.data() + size);
@@ -243,7 +243,7 @@ CExtKey KeyIO::DecodeExtKey(const std::string& str)
     CExtKey key;
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& prefix = keyInfo.Base58Prefix(Consensus::KeyInfo::EXT_SECRET_KEY);
+        const std::vector<unsigned char>& prefix = keyConstants.Base58Prefix(KeyConstants::EXT_SECRET_KEY);
         if (data.size() == BIP32_EXTKEY_SIZE + prefix.size() && std::equal(prefix.begin(), prefix.end(), data.begin())) {
             key.Decode(data.data() + prefix.size());
         }
@@ -253,7 +253,7 @@ CExtKey KeyIO::DecodeExtKey(const std::string& str)
 
 std::string KeyIO::EncodeExtKey(const CExtKey& key)
 {
-    std::vector<unsigned char> data = keyInfo.Base58Prefix(Consensus::KeyInfo::EXT_SECRET_KEY);
+    std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::EXT_SECRET_KEY);
     size_t size = data.size();
     data.resize(size + BIP32_EXTKEY_SIZE);
     key.Encode(data.data() + size);
@@ -264,7 +264,7 @@ std::string KeyIO::EncodeExtKey(const CExtKey& key)
 
 std::string KeyIO::EncodeDestination(const CTxDestination& dest)
 {
-    return boost::apply_visitor(DestinationEncoder(keyInfo), dest);
+    return boost::apply_visitor(DestinationEncoder(keyConstants), dest);
 }
 
 bool KeyIO::IsValidDestinationString(const std::string& str)
@@ -274,19 +274,19 @@ bool KeyIO::IsValidDestinationString(const std::string& str)
 
 std::string KeyIO::EncodePaymentAddress(const libzcash::PaymentAddress& zaddr)
 {
-    return boost::apply_visitor(PaymentAddressEncoder(keyInfo), zaddr);
+    return boost::apply_visitor(PaymentAddressEncoder(keyConstants), zaddr);
 }
 
 template<typename T1, typename T2, typename T3>
 T1 DecodeAny(
-    const Consensus::KeyInfo& keyInfo,
+    const KeyConstants& keyConstants,
     const std::string& str,
-    std::pair<Consensus::KeyInfo::Base58Type, size_t> sprout,
-    std::pair<Consensus::KeyInfo::Bech32Type, size_t> sapling)
+    std::pair<KeyConstants::Base58Type, size_t> sprout,
+    std::pair<KeyConstants::Bech32Type, size_t> sapling)
 {
     std::vector<unsigned char> data;
     if (DecodeBase58Check(str, data)) {
-        const std::vector<unsigned char>& prefix = keyInfo.Base58Prefix(sprout.first);
+        const std::vector<unsigned char>& prefix = keyConstants.Base58Prefix(sprout.first);
         if ((data.size() == sprout.second + prefix.size()) &&
             std::equal(prefix.begin(), prefix.end(), data.begin())) {
             CSerializeData serialized(data.begin() + prefix.size(), data.end());
@@ -301,7 +301,7 @@ T1 DecodeAny(
 
     data.clear();
     auto bech = bech32::Decode(str);
-    if (bech.first == keyInfo.Bech32HRP(sapling.first) &&
+    if (bech.first == keyConstants.Bech32HRP(sapling.first) &&
         bech.second.size() == sapling.second) {
         // Bech32 decoding
         data.reserve((bech.second.size() * 5) / 8);
@@ -323,10 +323,10 @@ libzcash::PaymentAddress KeyIO::DecodePaymentAddress(const std::string& str)
     return DecodeAny<libzcash::PaymentAddress,
         libzcash::SproutPaymentAddress,
         libzcash::SaplingPaymentAddress>(
-            keyInfo,
+            keyConstants,
             str,
-            std::make_pair(Consensus::KeyInfo::ZCPAYMENT_ADDRRESS, libzcash::SerializedSproutPaymentAddressSize),
-            std::make_pair(Consensus::KeyInfo::SAPLING_PAYMENT_ADDRESS, ConvertedSaplingPaymentAddressSize)
+            std::make_pair(KeyConstants::ZCPAYMENT_ADDRRESS, libzcash::SerializedSproutPaymentAddressSize),
+            std::make_pair(KeyConstants::SAPLING_PAYMENT_ADDRESS, ConvertedSaplingPaymentAddressSize)
         );
 }
 
@@ -336,7 +336,7 @@ bool KeyIO::IsValidPaymentAddressString(const std::string& str) {
 
 std::string KeyIO::EncodeViewingKey(const libzcash::ViewingKey& vk)
 {
-    return boost::apply_visitor(ViewingKeyEncoder(keyInfo), vk);
+    return boost::apply_visitor(ViewingKeyEncoder(keyConstants), vk);
 }
 
 libzcash::ViewingKey KeyIO::DecodeViewingKey(const std::string& str)
@@ -344,16 +344,16 @@ libzcash::ViewingKey KeyIO::DecodeViewingKey(const std::string& str)
     return DecodeAny<libzcash::ViewingKey,
         libzcash::SproutViewingKey,
         libzcash::SaplingExtendedFullViewingKey>(
-            keyInfo,
+            keyConstants,
             str,
-            std::make_pair(Consensus::KeyInfo::ZCVIEWING_KEY, libzcash::SerializedSproutViewingKeySize),
-            std::make_pair(Consensus::KeyInfo::SAPLING_EXTENDED_FVK, ConvertedSaplingExtendedFullViewingKeySize)
+            std::make_pair(KeyConstants::ZCVIEWING_KEY, libzcash::SerializedSproutViewingKeySize),
+            std::make_pair(KeyConstants::SAPLING_EXTENDED_FVK, ConvertedSaplingExtendedFullViewingKeySize)
         );
 }
 
 std::string KeyIO::EncodeSpendingKey(const libzcash::SpendingKey& zkey)
 {
-    return boost::apply_visitor(SpendingKeyEncoder(keyInfo), zkey);
+    return boost::apply_visitor(SpendingKeyEncoder(keyConstants), zkey);
 }
 
 libzcash::SpendingKey KeyIO::DecodeSpendingKey(const std::string& str)
@@ -362,9 +362,9 @@ libzcash::SpendingKey KeyIO::DecodeSpendingKey(const std::string& str)
     return DecodeAny<libzcash::SpendingKey,
         libzcash::SproutSpendingKey,
         libzcash::SaplingExtendedSpendingKey>(
-            keyInfo,
+            keyConstants,
             str,
-            std::make_pair(Consensus::KeyInfo::ZCSPENDING_KEY, libzcash::SerializedSproutSpendingKeySize),
-            std::make_pair(Consensus::KeyInfo::SAPLING_EXTENDED_SPEND_KEY, ConvertedSaplingExtendedSpendingKeySize)
+            std::make_pair(KeyConstants::ZCSPENDING_KEY, libzcash::SerializedSproutSpendingKeySize),
+            std::make_pair(KeyConstants::SAPLING_EXTENDED_SPEND_KEY, ConvertedSaplingExtendedSpendingKeySize)
         );
 }
diff --git a/src/key_io.h b/src/key_io.h
index 68f538b5b..dd7e62468 100644
--- a/src/key_io.h
+++ b/src/key_io.h
@@ -13,14 +13,15 @@
 #include <script/standard.h>
 #include <zcash/Address.hpp>
 
+#include <vector>
 #include <string>
 
 class KeyIO {
 private:
-    const Consensus::KeyInfo& keyInfo;
+    const KeyConstants& keyConstants;
 
 public:
-    KeyIO(const Consensus::KeyInfo& keyInfo): keyInfo(keyInfo) { }
+    KeyIO(const KeyConstants& keyConstants): keyConstants(keyConstants) { }
 
     CKey DecodeSecret(const std::string& str);
     std::string EncodeSecret(const CKey& key);

From 9228c3113dcd3e9c0896a01b4068d4cc073cf58a Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Thu, 9 Jul 2020 18:26:11 -0600
Subject: [PATCH 29/36] Fix typo in constant.

---
 src/chainparams.cpp | 6 +++---
 src/key_constants.h | 2 +-
 src/key_io.cpp      | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 73b52e8c5..7df48a80b 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -138,7 +138,7 @@ public:
         keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x88,0xB2,0x1E};
         keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x88,0xAD,0xE4};
         // guarantees the first 2 characters, when base58 encoded, are "zc"
-        keyConstants.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0x9A};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS] = {0x16,0x9A};
         // guarantees the first 4 characters, when base58 encoded, are "ZiVK"
         keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAB,0xD3};
         // guarantees the first 2 characters, when base58 encoded, are "SK"
@@ -367,7 +367,7 @@ public:
         keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
         keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
         // guarantees the first 2 characters, when base58 encoded, are "zt"
-        keyConstants.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS] = {0x16,0xB6};
         // guarantees the first 4 characters, when base58 encoded, are "ZiVt"
         keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
         // guarantees the first 2 characters, when base58 encoded, are "ST"
@@ -549,7 +549,7 @@ public:
         // do not rely on these BIP32 prefixes; they are not specified and may change
         keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
         keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
-        keyConstants.base58Prefixes[ZCPAYMENT_ADDRRESS] = {0x16,0xB6};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS] = {0x16,0xB6};
         keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
         keyConstants.base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
 
diff --git a/src/key_constants.h b/src/key_constants.h
index c3769fd8f..ebd07dbed 100644
--- a/src/key_constants.h
+++ b/src/key_constants.h
@@ -15,7 +15,7 @@ public:
         EXT_PUBLIC_KEY,
         EXT_SECRET_KEY,
 
-        ZCPAYMENT_ADDRRESS,
+        ZCPAYMENT_ADDRESS,
         ZCSPENDING_KEY,
         ZCVIEWING_KEY,
 
diff --git a/src/key_io.cpp b/src/key_io.cpp
index 18cd947fb..27a1b8a2e 100644
--- a/src/key_io.cpp
+++ b/src/key_io.cpp
@@ -56,7 +56,7 @@ public:
     {
         CDataStream ss(SER_NETWORK, PROTOCOL_VERSION);
         ss << zaddr;
-        std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::ZCPAYMENT_ADDRRESS);
+        std::vector<unsigned char> data = keyConstants.Base58Prefix(KeyConstants::ZCPAYMENT_ADDRESS);
         data.insert(data.end(), ss.begin(), ss.end());
         return EncodeBase58Check(data);
     }
@@ -325,7 +325,7 @@ libzcash::PaymentAddress KeyIO::DecodePaymentAddress(const std::string& str)
         libzcash::SaplingPaymentAddress>(
             keyConstants,
             str,
-            std::make_pair(KeyConstants::ZCPAYMENT_ADDRRESS, libzcash::SerializedSproutPaymentAddressSize),
+            std::make_pair(KeyConstants::ZCPAYMENT_ADDRESS, libzcash::SerializedSproutPaymentAddressSize),
             std::make_pair(KeyConstants::SAPLING_PAYMENT_ADDRESS, ConvertedSaplingPaymentAddressSize)
         );
 }

From 9161071b0234310e33c5662031b6db956b17978c Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 10 Jul 2020 01:55:05 +0100
Subject: [PATCH 30/36] Use ValueFromAmount instead of double arithmetic, and
 improve variable names.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 src/rpc/mining.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index 51bf83a41..d9a73b785 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -902,11 +902,11 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
     UniValue result(UniValue::VOBJ);
     if (canopyActive) {
         UniValue fundingstreams(UniValue::VOBJ);
-        auto elems = Consensus::GetActiveFundingStreams(nHeight, consensus);
-        for (auto elem : elems) {
-            CAmount value = elem.Value(nBlockSubsidy);
-            fundingstreams.pushKV(elem.recipient, (double) value / COIN);
-            nMinerReward -= value;
+        auto fsinfos = Consensus::GetActiveFundingStreams(nHeight, consensus);
+        for (auto fsinfo : fsinfos) {
+            CAmount nStreamAmount = fsinfo.Value(nBlockSubsidy);
+            fundingstreams.pushKV(fsinfo.recipient, ValueFromAmount(nStreamAmount));
+            nMinerReward -= nStreamAmount;
         }
         result.pushKV("fundingstreams", fundingstreams);
     } else if (nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight(nHeight)) {

From aa1b924427361d2fbb645aedc736f178472b06a9 Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 10 Jul 2020 02:10:05 +0100
Subject: [PATCH 31/36] Cosmetic spacing changes.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 src/chainparams.cpp      |  6 +++---
 src/consensus/params.cpp | 26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/chainparams.cpp b/src/chainparams.cpp
index 7df48a80b..39e2b0a65 100644
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -138,7 +138,7 @@ public:
         keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x88,0xB2,0x1E};
         keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x88,0xAD,0xE4};
         // guarantees the first 2 characters, when base58 encoded, are "zc"
-        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS] = {0x16,0x9A};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS]  = {0x16,0x9A};
         // guarantees the first 4 characters, when base58 encoded, are "ZiVK"
         keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAB,0xD3};
         // guarantees the first 2 characters, when base58 encoded, are "SK"
@@ -367,7 +367,7 @@ public:
         keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
         keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
         // guarantees the first 2 characters, when base58 encoded, are "zt"
-        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS] = {0x16,0xB6};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS]  = {0x16,0xB6};
         // guarantees the first 4 characters, when base58 encoded, are "ZiVt"
         keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
         // guarantees the first 2 characters, when base58 encoded, are "ST"
@@ -549,7 +549,7 @@ public:
         // do not rely on these BIP32 prefixes; they are not specified and may change
         keyConstants.base58Prefixes[EXT_PUBLIC_KEY]     = {0x04,0x35,0x87,0xCF};
         keyConstants.base58Prefixes[EXT_SECRET_KEY]     = {0x04,0x35,0x83,0x94};
-        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS] = {0x16,0xB6};
+        keyConstants.base58Prefixes[ZCPAYMENT_ADDRESS]  = {0x16,0xB6};
         keyConstants.base58Prefixes[ZCVIEWING_KEY]      = {0xA8,0xAC,0x0C};
         keyConstants.base58Prefixes[ZCSPENDING_KEY]     = {0xAC,0x08};
 
diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 76f8a877c..600cacf95 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -40,12 +40,12 @@ namespace Consensus {
     }
 
     /**
-     * This method determines the block height of the `halvingIndex`th 
-     * halving, as known at the specified `nHeight` block height. 
+     * This method determines the block height of the `halvingIndex`th
+     * halving, as known at the specified `nHeight` block height.
      *
      * Previous implementations of this logic were specialized to the
      * first halving.
-     */ 
+     */
     int Params::HalvingHeight(int nHeight, int halvingIndex) const {
         // zip208
         // HalvingHeight(i) := max({ height ⦂ N | Halving(height) < i }) + 1
@@ -55,10 +55,10 @@ namespace Consensus {
         // function, so it's sufficient to solve for f(height) = halvingIndex
         // in the rationals and then take ceiling(height).
         //
-        // H := blossom activation height; 
-        // SS := SubsidySlowStartShift(); 
+        // H := blossom activation height;
+        // SS := SubsidySlowStartShift();
         // R := 1 / (postInterval / preInterval) = BLOSSOM_POW_TARGET_SPACING_RATIO
-        // (The following calculation depends on BLOSSOM_POW_TARGET_SPACING_RATIO being an integer.) 
+        // (The following calculation depends on BLOSSOM_POW_TARGET_SPACING_RATIO being an integer.)
         //
         // preBlossom:
         // i = (height - SS) / preInterval
@@ -70,11 +70,11 @@ namespace Consensus {
         // i = (H - SS) / (postInterval / R) + (HalvingHeight(i) - H) / postInterval
         // i = (R * (H - SS) + HalvingHeight(i) - H) / postInterval
         // postInterval * i = R * (H - SS) + HalvingHeight(i) - H
-        // HalvingHeight(i) = postInterval * i - R * (H - SS) + H  
+        // HalvingHeight(i) = postInterval * i - R * (H - SS) + H
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
             int blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
 
-            return 
+            return
                 (nPostBlossomSubsidyHalvingInterval * halvingIndex)
                 - (BLOSSOM_POW_TARGET_SPACING_RATIO * (blossomActivationHeight - SubsidySlowStartShift()))
                 + blossomActivationHeight;
@@ -90,9 +90,9 @@ namespace Consensus {
     int Params::FundingPeriodIndex(int fundingStreamStartHeight, int nHeight) const {
         int firstHalvingHeight = HalvingHeight(fundingStreamStartHeight, 1);
 
-        // If the start height of the funding period is not aligned to a multiple of the 
+        // If the start height of the funding period is not aligned to a multiple of the
         // funding period length, the first funding period will be shorter than the
-        // funding period length. 
+        // funding period length.
         auto startPeriodOffset = (fundingStreamStartHeight - firstHalvingHeight) % nFundingPeriodLength;
         if (startPeriodOffset < 0) startPeriodOffset += nFundingPeriodLength; // C++ '%' is remainder, not modulus!
 
@@ -158,8 +158,8 @@ namespace Consensus {
             } else {
                 auto zaddr = keyIO.DecodePaymentAddress(addr);
                 // If the string is not a valid transparent or Sapling address, we will
-                // throw here. 
-                
+                // throw here.
+
                 addresses.push_back(boost::get<libzcash::SaplingPaymentAddress>(zaddr));
             }
         }
@@ -178,7 +178,7 @@ namespace Consensus {
         vFundingStreams[idx] = FundingStream::ParseFundingStream(*this, keyConstants, startHeight, endHeight, strAddresses);
     };
 
-    FundingStreamAddress FundingStream::RecipientAddress(const Consensus::Params& params, int nHeight) const 
+    FundingStreamAddress FundingStream::RecipientAddress(const Consensus::Params& params, int nHeight) const
     {
         auto addressIndex = params.FundingPeriodIndex(startHeight, nHeight);
 

From 64cfbab3db0564d731f226d0fa839c728c539d43 Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 10 Jul 2020 12:33:27 +0100
Subject: [PATCH 32/36] Apply suggestions from code review

keyInfo -> keyConstants

Co-authored-by: ying tong <yingtong@z.cash>
---
 src/consensus/params.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/consensus/params.h b/src/consensus/params.h
index 02ae97e47..1d637235b 100644
--- a/src/consensus/params.h
+++ b/src/consensus/params.h
@@ -124,7 +124,7 @@ public:
 
     static FundingStream ParseFundingStream(
         const Consensus::Params& params,
-        const KeyConstants& keyInfo,
+        const KeyConstants& keyConstants,
         const int startHeight,
         const int endHeight,
         const std::vector<std::string>& strAddresses);
@@ -211,7 +211,7 @@ struct Params {
     int nFundingPeriodLength;
     boost::optional<FundingStream> vFundingStreams[MAX_FUNDING_STREAMS];
     void AddZIP207FundingStream(
-        const KeyConstants& keyInfo,
+        const KeyConstants& keyConstants,
         FundingStreamIndex idx,
         int startHeight,
         int endHeight,

From 69cf041d5de47d0c35e877d99e15a83e53e0dc1f Mon Sep 17 00:00:00 2001
From: Daira Hopwood <daira@jacaranda.org>
Date: Fri, 10 Jul 2020 14:05:40 +0100
Subject: [PATCH 33/36] Change the format of `getblocksubsidy` output to use an
 array of funding stream objects.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---
 src/rpc/mining.cpp                   | 21 +++++++++++++-----
 src/wallet/test/rpc_wallet_tests.cpp | 33 ++++++++++++++++++----------
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
index d9a73b785..bb85d3b03 100644
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -879,9 +879,15 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
             "1. height         (numeric, optional) The block height.  If not provided, defaults to the current height of the chain.\n"
             "\nResult:\n"
             "{\n"
-            "  \"miner\" : x.xxx           (numeric) The mining reward amount in " + CURRENCY_UNIT + ".\n"
-            "  \"founders\" : x.xxx        (numeric) The founders reward amount in " + CURRENCY_UNIT + ".\n"
-            "  \"fundingstreams\" : {...}  (optional map) A map from funding stream recipients to amounts in " + CURRENCY_UNIT + ".\n"
+            "  \"miner\" : x.xxx,              (numeric) The mining reward amount in " + CURRENCY_UNIT + ".\n"
+            "  \"founders\" : x.xxx,           (numeric) The founders' reward amount in " + CURRENCY_UNIT + ".\n"
+            "  \"fundingstreams\" : [          (array) An array of funding stream descriptions (present only when Canopy has activated).\n"
+            "    {\n"
+            "      \"recipient\" : \"...\",      (string) A description of the funding stream recipient.\n"
+            "      \"specification\" : \"url\",  (string) A URL for the specification of this funding stream.\n"
+            "      \"value\" : x.xxx           (numeric) The funding stream amount in " + CURRENCY_UNIT + ".\n"
+            "    }, ...\n"
+            "  ]\n"
             "}\n"
             "\nExamples:\n"
             + HelpExampleCli("getblocksubsidy", "1000")
@@ -901,12 +907,17 @@ UniValue getblocksubsidy(const UniValue& params, bool fHelp)
 
     UniValue result(UniValue::VOBJ);
     if (canopyActive) {
-        UniValue fundingstreams(UniValue::VOBJ);
+        UniValue fundingstreams(UniValue::VARR);
         auto fsinfos = Consensus::GetActiveFundingStreams(nHeight, consensus);
         for (auto fsinfo : fsinfos) {
             CAmount nStreamAmount = fsinfo.Value(nBlockSubsidy);
-            fundingstreams.pushKV(fsinfo.recipient, ValueFromAmount(nStreamAmount));
             nMinerReward -= nStreamAmount;
+
+            UniValue fsobj(UniValue::VOBJ);
+            fsobj.pushKV("recipient", fsinfo.recipient);
+            fsobj.pushKV("specification", fsinfo.specification);
+            fsobj.pushKV("value", ValueFromAmount(nStreamAmount));
+            fundingstreams.push_back(fsobj);
         }
         result.pushKV("fundingstreams", fundingstreams);
     } else if (nHeight > 0 && nHeight <= consensus.GetLastFoundersRewardBlockHeight(nHeight)) {
diff --git a/src/wallet/test/rpc_wallet_tests.cpp b/src/wallet/test/rpc_wallet_tests.cpp
index 3c5f536ee..f14736315 100644
--- a/src/wallet/test/rpc_wallet_tests.cpp
+++ b/src/wallet/test/rpc_wallet_tests.cpp
@@ -297,14 +297,19 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 1.25);
     BOOST_CHECK(!obj.exists("fundingstreams"));
 
-    auto check_funding_streams = [](UniValue obj, double ecc_slice, double zf_slice, double mg_slice) {
-        std::map<std::string, UniValue> fundingstreams;
-        find_value(obj, "fundingstreams").getObjMap(fundingstreams);
-        BOOST_CHECK_EQUAL(fundingstreams.size(), 3);
-        if (fundingstreams.size() != 3) return;
-        BOOST_CHECK_EQUAL(fundingstreams["Electric Coin Company"].get_real(), ecc_slice);
-        BOOST_CHECK_EQUAL(fundingstreams["Zcash Foundation"].get_real(), zf_slice);
-        BOOST_CHECK_EQUAL(fundingstreams["Major Grants"].get_real(), mg_slice);
+    auto check_funding_streams = [](UniValue obj, std::vector<std::string> recipients, std::vector<double> amounts) {
+        size_t n = recipients.size();
+        BOOST_REQUIRE_EQUAL(amounts.size(), n);
+        UniValue fundingstreams = find_value(obj, "fundingstreams");
+        BOOST_CHECK_EQUAL(fundingstreams.size(), n);
+        if (fundingstreams.size() != n) return;
+
+        for (int i = 0; i < n; i++) {
+            UniValue fsobj = fundingstreams[i];
+            BOOST_CHECK_EQUAL(find_value(fsobj, "recipient").get_str(), recipients[i]);
+            BOOST_CHECK_EQUAL(find_value(fsobj, "specification").get_str(), "https://zips.z.cash/zip-0214");
+            BOOST_CHECK_EQUAL(find_value(fsobj, "value").get_real(), amounts[i]);
+        }
     };
 
     bool canopyEnabled =
@@ -315,15 +320,19 @@ BOOST_AUTO_TEST_CASE(rpc_wallet)
     obj = retValue.get_obj();
     BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), canopyEnabled ? 2.5 : 3.125);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 0.0);
-    if (canopyEnabled)
-        check_funding_streams(obj, 0.21875, 0.15625, 0.25);
+    if (canopyEnabled) {
+        check_funding_streams(obj, {"Electric Coin Company", "Zcash Foundation", "Major Grants" },
+                                   { 0.21875,                 0.15625,            0.25          });
+    }
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 2726399"));
     obj = retValue.get_obj();
     BOOST_CHECK_EQUAL(find_value(obj, "miner").get_real(), canopyEnabled ? 2.5 : 3.125);
     BOOST_CHECK_EQUAL(find_value(obj, "founders").get_real(), 0.0);
-    if (canopyEnabled)
-        check_funding_streams(obj, 0.21875, 0.15625, 0.25);
+    if (canopyEnabled) {
+        check_funding_streams(obj, {"Electric Coin Company", "Zcash Foundation", "Major Grants" },
+                                   { 0.21875,                 0.15625,            0.25          });
+    }
 
     BOOST_CHECK_NO_THROW(retValue = CallRPC("getblocksubsidy 2726400"));
     obj = retValue.get_obj();

From 0e7ae0690590fd75b162c7f5f7aa3413265a3d27 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Fri, 10 Jul 2020 08:25:57 -0600
Subject: [PATCH 34/36] Fix assertion check in GetBlockSubsidy

---
 src/main.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main.cpp b/src/main.cpp
index 364c8f6f6..1e4c1972a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -911,8 +911,6 @@ bool ContextualCheckTransaction(
     if (canopyActive) {
         fundingStreamElements = Consensus::GetActiveFundingStreamElements(
             nHeight,
-            // GetBlockSubsidy must be guarded because it will throw
-            // if called at slow-start period heights.
             GetBlockSubsidy(nHeight, chainparams.GetConsensus()),
             chainparams.GetConsensus());
     }
@@ -1868,7 +1866,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
     // Mining slow start
     // The subsidy is ramped up linearly, skipping the middle payout of
     // MAX_SUBSIDY/2 to keep the monetary curve consistent with no slow start.
-    if (nHeight < consensusParams.nSubsidySlowStartInterval / 2) {
+    if (nHeight < consensusParams.SubsidySlowStartShift()) {
         nSubsidy /= consensusParams.nSubsidySlowStartInterval;
         nSubsidy *= nHeight;
         return nSubsidy;
@@ -1878,7 +1876,7 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams)
         return nSubsidy;
     }
 
-    assert(nHeight > consensusParams.SubsidySlowStartShift());
+    assert(nHeight >= consensusParams.SubsidySlowStartShift());
 
     int halvings = consensusParams.Halving(nHeight);
 

From c88b461f891505be11d34dae036c7a8a63e0ba46 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris.nuttycombe@gmail.com>
Date: Fri, 10 Jul 2020 08:29:47 -0600
Subject: [PATCH 35/36] Apply suggestions from code review

Co-authored-by: Daira Hopwood <daira@jacaranda.org>
---
 src/miner.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/miner.cpp b/src/miner.cpp
index ef1651a6c..3a1af0fd1 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -181,13 +181,14 @@ public:
     }
 
     CAmount SetFoundersRewardAndGetMinerValue(void* ctx) const {
-        auto miner_reward = GetBlockSubsidy(nHeight, chainparams.GetConsensus());
+        auto block_subsidy = GetBlockSubsidy(nHeight, chainparams.GetConsensus());
+        auto miner_reward = block_subsidy; // founders' reward or funding stream amounts will be subtracted below
 
         if (nHeight > 0) {
             if (chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_CANOPY)) {
                 auto fundingStreamElements = Consensus::GetActiveFundingStreamElements(
                     nHeight,
-                    miner_reward,
+                    block_subsidy,
                     chainparams.GetConsensus());
 
                 for (Consensus::FundingStreamElement fselem : fundingStreamElements) {

From d80857f2b533841ccc3409c57316c1eb177a76f1 Mon Sep 17 00:00:00 2001
From: Kris Nuttycombe <kris@electriccoin.co>
Date: Fri, 10 Jul 2020 08:31:46 -0600
Subject: [PATCH 36/36] Trivial whitespace fix.

---
 src/consensus/params.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/consensus/params.cpp b/src/consensus/params.cpp
index 600cacf95..48ff3909a 100644
--- a/src/consensus/params.cpp
+++ b/src/consensus/params.cpp
@@ -26,7 +26,7 @@ namespace Consensus {
         if (NetworkUpgradeActive(nHeight, Consensus::UPGRADE_BLOSSOM)) {
             int64_t blossomActivationHeight = vUpgrades[Consensus::UPGRADE_BLOSSOM].nActivationHeight;
             // Ideally we would say:
-            // halvings = (blossomActivationHeight - consensusParams.SubsidySlowStartShift()) / consensusParams.nPreBlossomSubsidyHalvingInterval 
+            // halvings = (blossomActivationHeight - consensusParams.SubsidySlowStartShift()) / consensusParams.nPreBlossomSubsidyHalvingInterval
             //     + (nHeight - blossomActivationHeight) / consensusParams.nPostBlossomSubsidyHalvingInterval;
             // But, (blossomActivationHeight - consensusParams.SubsidySlowStartShift()) / consensusParams.nPreBlossomSubsidyHalvingInterval
             // would need to be treated as a rational number in order for this to work.