Merge pull request #587 from aguycalled/createrawscriptaddress

Add support for raw script addresses

Author: proletesseract

qa/pull-tester/rpc-tests.py

@@ -187,6 +187,7 @@
     'sendtoaddress.py',
     'stakeimmaturebalance.py',
     'rpc-help.py',
+    'createrawscriptaddress.py'
 ]
 #if ENABLE_ZMQ:
 #    testScripts.append('zmq_test.py')

qa/rpc-tests/createrawscriptaddress.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+# Copyright (c) 2019 The Navcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+from test_framework.test_framework import NavCoinTestFramework
+from test_framework.util import *
+
+class CreateRawScriptAddress(NavCoinTestFramework):
+    """Tests the creation of a raw script address."""
+
+    def __init__(self):
+        super().__init__()
+        self.setup_clean_chain = True
+        self.num_nodes = 1
+
+    def setup_network(self, split=False):
+        self.nodes = self.setup_nodes()
+        self.is_network_split = split
+
+    def run_test(self):
+        assert(self.nodes[0].createrawscriptaddress("6ac1") == "3HnzbJ4TR9")
+        assert(self.nodes[0].validateaddress("3HnzbJ4TR9")["isvalid"] == True)
+        assert(self.nodes[0].validateaddress("3HnzbJ4TR9")["scriptPubKey"] == "6ac1")
+
+        self.nodes[0].staking(False)
+        self.nodes[0].generate(100)
+        self.nodes[0].sendtoaddress("3HnzbJ4TR9", 100)
+        self.nodes[0].generate(1)
+
+        assert(self.nodes[0].getinfo()["communityfund"]["available"] == 100)
+
+if __name__ == '__main__':
+    CreateRawScriptAddress().main()

src/base58.cpp

@@ -252,6 +252,12 @@ bool CNavCoinAddress::Set(const CScriptID& id)
     return true;
 }
 
+bool CNavCoinAddress::Set(const CScript& scriptIn)
+{
+    SetData(Params().Base58Prefix(CChainParams::RAW_SCRIPT_ADDRESS), &scriptIn[0], scriptIn.size());
+    return true;
+}
+
 bool CNavCoinAddress::Set(const CTxDestination& dest)
 {
     return boost::apply_visitor(CNavCoinAddressVisitor(this), dest);
@@ -286,6 +292,8 @@ bool CNavCoinAddress::IsValid(const CChainParams& params) const
 {
     if (vchVersion == params.Base58Prefix(CChainParams::COLDSTAKING_ADDRESS))
         return vchData.size() == 40;
+    if (vchVersion == params.Base58Prefix(CChainParams::RAW_SCRIPT_ADDRESS))
+        return vchData.size() > 0;
     bool fCorrectSize = vchData.size() == 20;
     bool fKnownVersion = vchVersion == params.Base58Prefix(CChainParams::PUBKEY_ADDRESS) ||
                          vchVersion == params.Base58Prefix(CChainParams::SCRIPT_ADDRESS);
@@ -311,6 +319,12 @@ CTxDestination CNavCoinAddress::Get() const
         return CKeyID(id);
     else if (vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS))
         return CScriptID(id);
+    else if (vchVersion == Params().Base58Prefix(CChainParams::RAW_SCRIPT_ADDRESS))
+    {
+        std::vector<unsigned char> vData(vchData.size());
+        memcpy(&vData[0], &vchData[0], vchData.size());
+        return CScript(vData.begin(), vData.end());
+    }
     else
         return CNoDestination();
 }
@@ -371,6 +385,11 @@ bool CNavCoinAddress::IsScript() const
     return IsValid() && vchVersion == Params().Base58Prefix(CChainParams::SCRIPT_ADDRESS);
 }
 
+bool CNavCoinAddress::IsRawScript() const
+{
+    return IsValid() && vchVersion == Params().Base58Prefix(CChainParams::RAW_SCRIPT_ADDRESS);
+}
+
 void CNavCoinSecret::SetKey(const CKey& vchSecret)
 {
     assert(vchSecret.IsValid());

src/base58.h

@@ -109,16 +109,19 @@ class CNavCoinAddress : public CBase58Data {
     bool Set(const CKeyID &id);
     bool Set(const CKeyID &id, const CKeyID &id2);
     bool Set(const CScriptID &id);
+    bool Set(const CScript &scriptIn);
     bool Set(const CTxDestination &dest);
     bool IsValid() const;
     bool IsValid(const CChainParams &params) const;
     bool IsColdStakingAddress(const CChainParams& params) const;
+    bool IsRawScript() const;
 
     CNavCoinAddress() {}
     CNavCoinAddress(const CTxDestination &dest) { Set(dest); }
     CNavCoinAddress(const CKeyID &id, const CKeyID &id2) { Set(id, id2); }
     CNavCoinAddress(const std::string& strAddress) { SetString(strAddress); }
     CNavCoinAddress(const char* pszAddress) { SetString(pszAddress); }
+    CNavCoinAddress(const CScript &scriptIn) { Set(scriptIn); }
 
     CTxDestination Get() const;
     bool GetKeyID(CKeyID &keyID) const;

src/chainparams.cpp

@@ -222,6 +222,7 @@ class CMainParams : public CChainParams {
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,53);
         base58Prefixes[COLDSTAKING_ADDRESS] = std::vector<unsigned char>(1,21); // cold staking addresses start with 'X'
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,85);
+        base58Prefixes[RAW_SCRIPT_ADDRESS] = std::vector<unsigned char>(1,60);
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,150);
         base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x04)(0x88)(0xB2)(0x1E).convert_to_container<std::vector<unsigned char> >();
         base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x04)(0x88)(0xAD)(0xE4).convert_to_container<std::vector<unsigned char> >();
@@ -428,6 +429,7 @@ class CTestNetParams : public CChainParams {
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
         base58Prefixes[COLDSTAKING_ADDRESS] = std::vector<unsigned char>(1,8); // cold staking addresses start with 'C/D'
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
+        base58Prefixes[RAW_SCRIPT_ADDRESS] = std::vector<unsigned char>(1,60);
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,239);
         base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x40)(0x88)(0x2B)(0xE1).convert_to_container<std::vector<unsigned char> >();
         base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x40)(0x88)(0xDA)(0x4E).convert_to_container<std::vector<unsigned char> >();
@@ -618,6 +620,7 @@ class CDevNetParams : public CChainParams {
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
         base58Prefixes[COLDSTAKING_ADDRESS] = std::vector<unsigned char>(1,63); // cold staking addresses start with 'S'
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
+        base58Prefixes[RAW_SCRIPT_ADDRESS] = std::vector<unsigned char>(1,60);
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,239);
         base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x40)(0x88)(0x2B)(0xE1).convert_to_container<std::vector<unsigned char> >();
         base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x40)(0x88)(0xDA)(0x4E).convert_to_container<std::vector<unsigned char> >();
@@ -798,6 +801,7 @@ class CRegTestParams : public CChainParams {
         base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
         base58Prefixes[COLDSTAKING_ADDRESS] = std::vector<unsigned char>(1,63); // cold staking addresses start with 'S'
         base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
+        base58Prefixes[RAW_SCRIPT_ADDRESS] = std::vector<unsigned char>(1,60);
         base58Prefixes[SECRET_KEY] =     std::vector<unsigned char>(1,239);
         base58Prefixes[EXT_PUBLIC_KEY] = boost::assign::list_of(0x40)(0x88)(0x2B)(0xE1).convert_to_container<std::vector<unsigned char> >();
         base58Prefixes[EXT_SECRET_KEY] = boost::assign::list_of(0x40)(0x88)(0xDA)(0x4E).convert_to_container<std::vector<unsigned char> >();

src/chainparams.h

@@ -47,6 +47,7 @@ class CChainParams
     enum Base58Type {
         PUBKEY_ADDRESS,
         SCRIPT_ADDRESS,
+        RAW_SCRIPT_ADDRESS,
         SECRET_KEY,
         EXT_PUBLIC_KEY,
         EXT_SECRET_KEY,

src/script/standard.cpp

@@ -368,6 +368,12 @@ class CScriptVisitor : public boost::static_visitor<bool>
         *script << OP_HASH160 << ToByteVector(scriptID) << OP_EQUAL;
         return true;
     }
+
+    bool operator()(const CScript &scriptIn) const {
+        script->clear();
+        *script += scriptIn;
+        return true;
+    }
 };
 }
 

src/script/standard.h

@@ -76,7 +76,7 @@ class CNoDestination {
  *  * Pair of two CKeyID: TX_COLDSTAKING destination
  *  A CTxDestination is the internal data type encoded in a CNavCoinAddress
  */
-typedef boost::variant<CNoDestination, CKeyID, CScriptID, pair<CKeyID, CKeyID>> CTxDestination;
+typedef boost::variant<CNoDestination, CKeyID, CScriptID, pair<CKeyID, CKeyID>, CScript> CTxDestination;
 
 const char* GetTxnOutputType(txnouttype t);
 

src/wallet/rpcwallet.cpp

@@ -115,6 +115,42 @@ string AccountFromValue(const UniValue& value)
     return strAccount;
 }
 
+UniValue createrawscriptaddress(const UniValue& params, bool fHelp)
+{
+    if (fHelp || params.size() != 1)
+        throw runtime_error(
+            "createrawscriptaddress \"hex script\"\n"
+            "\nReturns the NavCoin address for the specified raw hex script.\n"
+            "\nArguments:\n"
+            "1. \"hex script\"        (string) The hex script to encode in the address.\n"
+            "\nResult:\n"
+            "\"navcoinaddress\"    (string) The  navcoin address\n"
+            "\nExamples:\n"
+            + HelpExampleCli("createrawscriptaddress", "6ac4c5")
+        );
+
+    std::string data = params[0].get_str();
+
+    if (!IsHex(data))
+        throw JSONRPCError(RPC_MISC_ERROR, "the script is not expressed in hexadecimal");
+
+    std::vector<unsigned char> vData = ParseHex(data);
+
+    CScript script(vData.begin(), vData.end());
+
+    std::string strAsm = ScriptToAsmStr(script);
+
+    if (strAsm.find("[error]") != std::string::npos || strAsm.find("OP_UNKNOWN") != std::string::npos)
+        throw JSONRPCError(RPC_MISC_ERROR, "the script includes invalid or unknown op codes");
+
+    CNavCoinAddress address(script);
+
+    if (!address.IsValid())
+        throw JSONRPCError(RPC_MISC_ERROR, "the generated address is not valid");
+
+    return address.ToString();
+}
+
 UniValue getnewaddress(const UniValue& params, bool fHelp)
 {
     if (!EnsureWalletIsAvailable(fHelp))
@@ -3683,6 +3719,7 @@ static const CRPCCommand commands[] =
     { "wallet",             "addmultisigaddress",       &addmultisigaddress,       true  },
     { "wallet",             "addwitnessaddress",        &addwitnessaddress,        true  },
     { "wallet",             "backupwallet",             &backupwallet,             true  },
+    { "wallet",             "createrawscriptaddress",   &createrawscriptaddress,   true  },
     { "wallet",             "dumpprivkey",              &dumpprivkey,              true  },
     { "wallet",             "dumpmasterprivkey",        &dumpmasterprivkey,        true  },
     { "wallet",             "dumpmnemonic",             &dumpmnemonic,             true  },