wallet: Remove IsMine from migration code #30328

1725 | -            // Add ScriptHash for scripts that are not already P2SH
1726 | -            if (!script.IsPayToScriptHash()) {
1727 | +        std::vector<std::vector<unsigned char>> sols;
1728 | +        TxoutType type = Solver(script, sols);
1729 | +        switch (type) {
1730 | +        // We don't care aboue these types because they are not spendable

---

1868 | +            return true;
1869 | +        }
1870 | +        case TxoutType::MULTISIG:
1871 | +        {
1872 | +            if (ctx == ScriptContext::P2WSH) {
1873 | +                std::vector<valtype> keys(sols.begin() + 1, sols.begin() + sols.size() - 1);

---

1720 | @@ -1721,37 +1721,157 @@ std::unordered_set<CScript, SaltedSipHasher> LegacyDataSPKM::GetScriptPubKeys()
1721 |      // For all keys, if they have segwit scripts, those scripts will end up in mapScripts
1722 |      for (const auto& script_pair : mapScripts) {
1723 |          const CScript& script = script_pair.second;
1724 | -        if (IsMine(script) == ISMINE_SPENDABLE) {

---

1802 | +        const CScript& script = script_pair.second;
1803 | +        std::vector<std::vector<unsigned char>> sols;
1804 | +        TxoutType type = Solver(script, sols);
1805 | +        if (type == TxoutType::WITNESS_V0_SCRIPTHASH) {
1806 | +            uint160 hash;
1807 | +            CRIPEMD160().Write(sols[0].data(), sols[0].size()).Finalize(hash.begin());

---

1786 | +                    if (key.size() != 33) {
1787 | +                        allowed = false;
1788 | +                        break;
1789 | +                    }
1790 | +                }
1791 | +                if (allowed) {

---

1730 |      for (const auto& script_pair : mapScripts) {
1731 |          const CScript& script = script_pair.second;
1732 | -        if (IsMine(script) == ISMINE_SPENDABLE) {
1733 | -            // Add ScriptHash for scripts that are not already P2SH
1734 | -            if (!script.IsPayToScriptHash()) {
1735 | +        std::vector<std::vector<unsigned char>> sols;

---

1726 | +    // Insert every P2PK, P2PKH, and P2WPKH script. Multisigs are only included if we know
1727 | +    // all of the keys (matches legacy wallet IsMine behavior).
1728 |      // The watchonly ones will be in setWatchOnly which we deal with later
1729 |      // For all keys, if they have segwit scripts, those scripts will end up in mapScripts
1730 |      for (const auto& script_pair : mapScripts) {
1731 |          const CScript& script = script_pair.second;

---

1740 | +        case TxoutType::NULL_DATA:
1741 | +        case TxoutType::WITNESS_UNKNOWN:
1742 | +        case TxoutType::WITNESS_V1_TAPROOT:
1743 | +        case TxoutType::SCRIPTHASH:
1744 | +        case TxoutType::ANCHOR:
1745 | +        // These are only spendable if the witness scripts is also spendable as a scriptPubKey

---

1762 | +        {
1763 | +            CKeyID key_id{uint160(sols[0])};
1764 | +            CPubKey pubkey;
1765 | +            if (GetPubKey(key_id, pubkey) && pubkey.IsCompressed() && HaveKey(key_id)) {
1766 |                  spks.insert(script);
1767 | +                spks.insert(GetScriptForDestination(ScriptHash(script)));

---

1777 | -                    spks.insert(ms_spk);
1778 | +            break;
1779 | +        }
1780 | +        case TxoutType::MULTISIG:
1781 | +        {
1782 | +            // Multisigs are only spendable if we have all of their keys

---

1803 | +    for (const auto& script_pair : mapScripts) {
1804 | +        const CScript& script = script_pair.second;
1805 | +        std::vector<std::vector<unsigned char>> sols;
1806 | +        TxoutType type = Solver(script, sols);
1807 | +        if (type == TxoutType::WITNESS_V0_SCRIPTHASH) {
1808 | +            uint160 hash{RIPEMD160(sols[0])};

---

1813 | +                !witness_script.IsPayToScriptHash() &&
1814 | +                !witness_script.IsWitnessProgram(wit_ver, wit_prog) &&
1815 | +                spks.count(witness_script) > 0) {
1816 | +                spks.insert(script);
1817 | +                spks.insert(GetScriptForDestination(ScriptHash(script)));
1818 | +            }

---

1809 | +            CScript witness_script;
1810 | +            int wit_ver = -1;
1811 | +            std::vector<unsigned char> wit_prog;
1812 | +            if (GetCScript(CScriptID(hash), witness_script) &&
1813 | +                !witness_script.IsPayToScriptHash() &&
1814 | +                !witness_script.IsWitnessProgram(wit_ver, wit_prog) &&

---

1716 | @@ -1717,42 +1717,160 @@ std::unordered_set<CScript, SaltedSipHasher> LegacyDataSPKM::GetScriptPubKeys()
1717 |          spks.insert(GetScriptForDestination(PKHash(pub)));
1718 |      }
1719 |  
1720 | -    // For every script in mapScript, only the ISMINE_SPENDABLE ones are being tracked.
1721 | +    const auto& all_keys_compressed = [](const std::vector<valtype>& keys) -> bool {
1722 | +        return std::all_of(keys.cbegin(), keys.cend(),
1723 | +               [](const auto& key) { return key.size() == 33; });
1724 | +    };

---

1721 | +    const auto& all_keys_compressed = [](const std::vector<valtype>& keys) -> bool {
1722 | +        return std::all_of(keys.cbegin(), keys.cend(),
1723 | +               [](const auto& key) { return key.size() == 33; });
1724 | +    };
1725 | +
1726 | +    // Insert every P2PK, P2PKH, and P2WPKH script. Multisigs are only included if we know

---

1737 | +        switch (type) {
1738 | +        // We don't care about these types because they are not spendable
1739 | +        case TxoutType::NONSTANDARD:
1740 | +        case TxoutType::NULL_DATA:
1741 | +        case TxoutType::WITNESS_UNKNOWN:
1742 | +        case TxoutType::WITNESS_V1_TAPROOT:

---

1741 | +        case TxoutType::WITNESS_UNKNOWN:
1742 | +        case TxoutType::WITNESS_V1_TAPROOT:
1743 | +        case TxoutType::SCRIPTHASH:
1744 | +        case TxoutType::ANCHOR:
1745 | +        // These are only spendable if the witness scripts is also spendable as a scriptPubKey
1746 | +        // We will check these later after spks has been updated with spks from scripts.

---

1745 | +        // These are only spendable if the witness scripts is also spendable as a scriptPubKey
1746 | +        // We will check these later after spks has been updated with spks from scripts.
1747 | +        case TxoutType::WITNESS_V0_SCRIPTHASH:
1748 | +            break;
1749 | +        // These scriptPubKeys have already been handled by dealing with the keys
1750 | +        // However if these scripts are here, then the P2SH nested spk will be spendable if these are also scriptPubKeys

---

1784 | +            if (!HaveKeys(keys, *this)) {
1785 | +                break;
1786 | +            }
1787 | +            // Multisigs are always spendable inside of P2SH scripts
1788 | +            spks.insert(GetScriptForDestination(ScriptHash(script)));
1789 | +            // We need to have the P2WSH script for the P2WSH to be spendable.

---

1818 | +            }
1819 |          }
1820 |      }
1821 |  
1822 | +    enum class ScriptContext {
1823 | +        TOP,

---

1842 | +        case TxoutType::WITNESS_V0_KEYHASH:
1843 | +            return ctx != ScriptContext::P2WSH;
1844 | +        case TxoutType::PUBKEYHASH:
1845 | +            if (ctx == ScriptContext::P2WSH) {
1846 | +                CPubKey pubkey;
1847 | +                if (GetPubKey(CKeyID(uint160(sols[0])), pubkey) && !pubkey.IsCompressed()) {

---

1860 | +            return true;
1861 | +        }
1862 | +        case TxoutType::WITNESS_V0_SCRIPTHASH:
1863 | +        {
1864 | +            if (ctx == ScriptContext::P2WSH) return false;
1865 | +            CScriptID script_id{RIPEMD160(sols[0])};

---

1904 | +                !witness_script.IsWitnessProgram(wit_ver, wit_prog) && // Witness programs are not allowed inside of P2WSH
1905 | +                // We only allow scripts that we would consider spendable as an output script.
1906 | +                // Note that while this would exclude P2WSH-multisigs, we are already handling those in the first loop.
1907 | +                spks.count(witness_script) > 0 &&
1908 | +                // Pubkeys must be compressed.
1909 | +                is_valid_script(script, ScriptContext::P2WSH)) {

---

1716 | @@ -1717,42 +1717,187 @@ std::unordered_set<CScript, SaltedSipHasher> LegacyDataSPKM::GetScriptPubKeys()
1717 |          spks.insert(GetScriptForDestination(PKHash(pub)));
1718 |      }
1719 |  
1720 | -    // For every script in mapScript, only the ISMINE_SPENDABLE ones are being tracked.
1721 | -    // The watchonly ones will be in setWatchOnly which we deal with later
1722 | -    // For all keys, if they have segwit scripts, those scripts will end up in mapScripts
1723 | +    // Lamba helper to check that all keys found by the solver are compressed

---

1821 | +        std::vector<valtype> sols;
1822 | +        TxoutType spk_type = Solver(script, sols);
1823 | +
1824 | +        CKeyID keyID;
1825 | +        switch (spk_type) {
1826 | +        // Scripts with no nesting (arbitraty, unknown scripts) are always valid.

---

1809 | +            break;
1810 | +        }
1811 |          }
1812 |      }
1813 |  
1814 | +    enum class ScriptContext {

---

1721 | -    // The watchonly ones will be in setWatchOnly which we deal with later
1722 | -    // For all keys, if they have segwit scripts, those scripts will end up in mapScripts
1723 | +    // Lamba helper to check that all keys found by the solver are compressed
1724 | +    const auto& all_keys_compressed = [](const std::vector<valtype>& keys) -> bool {
1725 | +        return std::all_of(keys.cbegin(), keys.cend(),
1726 | +               [](const auto& key) { return key.size() == 33; });

---

1735 | +    // as redeemScripts and witnessScripts.
1736 | +    //
1737 | +    // mapScripts contains redeemScripts and witnessScripts. It may also contain output scripts which,
1738 | +    // in addition to being treated as output scripts, are also treated as redeemScripts and witnessScripts.
1739 | +    // All scripts in mapScripts are treated as redeemScripts, unless that script is also a P2SH.
1740 | +    // A script is only treated as a witnessScript if there its corresponding P2WSH output script is in the map.

---

1794 | +        }
1795 | +        // Multisig scripts are spendable if they are inside of a P2SH or P2WSH, and we have all of the private keys.
1796 | +        // Bare multisigs are never considered spendable
1797 | +        case TxoutType::MULTISIG:
1798 | +        {
1799 | +            std::vector<std::vector<unsigned char>> keys(solutions.begin() + 1, solutions.begin() + solutions.size() - 1);

---

1757 | +        case TxoutType::SCRIPTHASH:
1758 | +            break;
1759 | +        // Any P2PK or P2PKH scripts found in mapScripts can be spent as P2SH-P2PK or P2SH-P2PKH respectively,
1760 | +        // if we have the private key.
1761 | +        // Since all private keys were iterated earlier and their corresponding P2PK and P2PKH scripts inserted
1762 | +        // to "spks", we can simply check whether this P2PK or P2PKH script is in "spk" to determine spendability.

---

1760 | +        // if we have the private key.
1761 | +        // Since all private keys were iterated earlier and their corresponding P2PK and P2PKH scripts inserted
1762 | +        // to "spks", we can simply check whether this P2PK or P2PKH script is in "spk" to determine spendability.
1763 | +        case TxoutType::PUBKEY:
1764 | +        case TxoutType::PUBKEYHASH:
1765 | +            if (spks.count(script) > 0) {

---

1907 | +            std::vector<unsigned char> wit_prog;
1908 | +            CScriptID script_id{RIPEMD160(solutions[0])};
1909 | +            // For a P2WSH output script to be spendable, we must know and inspect its witnessScript.
1910 | +            if (GetCScript(script_id, witness_script) &&
1911 | +                !witness_script.IsPayToScriptHash() && // P2SH inside of P2WSH is not allowed
1912 | +                !witness_script.IsWitnessProgram(wit_ver, wit_prog) && // Witness programs are not allowed inside of P2WSH

---

1013 | @@ -1012,6 +1014,140 @@ def check_comments():
1014 |  
1015 |          wallet.unloadwallet()
1016 |  
1017 | +    def test_p2wsh(self):
1018 | +        self.log.info("Test that P2WSH output scripts are migrated")

---

1031 | +
1032 | +        def_wallet.sendtoaddress(wsh_pkh_addr, 5)
1033 | +        self.generate(self.nodes[0], 6)
1034 | +        assert_equal(wallet.getbalances()['mine']['trusted'], 5)
1035 | +
1036 | +        wallet.migratewallet()

---

1122 | +        assert "embedded" in comp_wsh_pkh_addr_info
1123 | +
1124 | +        for addr in invalid_addrs:
1125 | +            addr_info = wallet.getaddressinfo(addr)
1126 | +            assert_equal(addr_info["ismine"], False)
1127 | +            assert_equal(addr_info["iswatchonly"], False)

---

1143 | +
1144 | +        for addr in invalid_addrs:
1145 | +            addr_info = wallet.getaddressinfo(addr)
1146 | +            assert_equal(addr_info["ismine"], False)
1147 | +            assert_equal(addr_info["iswatchonly"], False)
1148 | +            assert "embedded" not in addr_info

---

1042 | +        assert_equal(addr_info["solvable"], True)
1043 | +
1044 | +        wallet.unloadwallet()
1045 | +
1046 | +    def test_disallowed_p2wsh(self):
1047 | +        self.log.info("Test that P2WSH output scripts with invalid witnessScripts are not migrated")

---

1751 | +        case TxoutType::WITNESS_V1_TAPROOT:
1752 | +        // These are only spendable if the witness script is also spendable as a scriptPubKey
1753 | +        // We will check these later after "spks" has been updated with the computed output scripts from mapScripts.
1754 | +        case TxoutType::WITNESS_V0_SCRIPTHASH:
1755 | +        // For P2SH to be spendable, we need to have the redeemScript, and if we have it, it will be handled when
1756 | +        // this loop gets to it. A P2SH script itself cannot be nested in anything, so we can skip them.

---

1776 | +            CKeyID key_id{uint160(solutions[0])};
1777 | +            CPubKey pubkey;
1778 | +            if (GetPubKey(key_id, pubkey) && pubkey.IsCompressed() && HaveKey(key_id)) {
1779 |                  spks.insert(script);
1780 | +                // Also insert P2SH-P2WPKH output script
1781 | +                spks.insert(GetScriptForDestination(ScriptHash(script)));

---

1794 | +        }
1795 | +        // Multisig scripts are spendable if they are inside of a P2SH or P2WSH, and we have all of the private keys.
1796 | +        // Bare multisigs are never considered spendable
1797 | +        case TxoutType::MULTISIG:
1798 | +        {
1799 | +            Assert(solutions.size() >= 2);

---

1798 | +        {
1799 | +            Assert(solutions.size() >= 2);
1800 | +            std::vector<std::vector<unsigned char>> keys(solutions.begin() + 1, solutions.begin() + solutions.size() - 1);
1801 | +            if (!HaveKeys(keys, *this)) {
1802 | +                break;
1803 |              }

---

1896 | +            return true;
1897 | +        }
1898 | +        }
1899 | +        assert(false);
1900 | +    };
1901 | +    // Iterate again for all the P2WSH scripts

---

1117 | +        # importmulti and wrap the wsh(pkh()) inside of a sh(). This will insert the sh(wsh(pkh())) into
1118 | +        # setWatchOnly but not the wsh(pkh()).
1119 | +        # Furthermore, migration should not migrate the wsh(pkh()) if the key is uncompressed.
1120 | +        comp_eckey = ECKey()
1121 | +        comp_eckey.generate(compressed=True)
1122 | +        comp_pubkey = comp_eckey.get_pubkey().get_bytes().hex()

---

1842 | +        }
1843 | +        // Multisig in any nesting level is valid, but inside of P2WSH, all pubkeys must be compressed.
1844 | +        case TxoutType::MULTISIG:
1845 | +        {
1846 | +            if (ctx == ScriptContext::P2WSH) {
1847 | +                std::vector<std::vector<unsigned char>> keys(solutions.begin() + 1, solutions.begin() + solutions.size() - 1);

---

1914 | +            // Insert P2SH-Multisig
1915 | +            spks.insert(GetScriptForDestination(ScriptHash(script)));
1916 | +            // P2WSH-Multisig output scripts are spendable if the P2WSH output script is also in mapScripts,
1917 | +            // and all keys are compressed
1918 | +            CScript ms_wsh = GetScriptForDestination(WitnessV0ScriptHash(script));
1919 | +            if (HaveCScript(CScriptID(ms_wsh)) && all_keys_compressed(keys)) {

---