From cd12c3e62f27d0b0d4536236375dc2811d610ca9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jorge=20Tim=C3=B3n?= Date: Fri, 23 Sep 2016 03:02:40 +0200 Subject: [PATCH] Introduce static CScript StrHexToScriptWithDefault() in chainparams.cpp --- src/chainparams.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 1e9a50d745..226e78630a 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -18,6 +18,18 @@ #include "chainparamsseeds.h" +static CScript StrHexToScriptWithDefault(std::string strScript, const CScript defaultScript) +{ + CScript returnScript; + if (!strScript.empty()) { + std::vector scriptData = ParseHex(strScript); + returnScript = CScript(scriptData.begin(), scriptData.end()); + } else { + returnScript = defaultScript; + } + return returnScript; +} + static CBlock CreateGenesisBlock(const char* pszTimestamp, const CScript& genesisOutputScript, uint32_t nTime, const CScript& scriptChallenge, int32_t nVersion, const CAmount& genesisReward, const uint32_t rewardShards) { // Shards must be evenly divisible