Make CScript -> CScriptID conversion explicit

sipa · sipa · commit 952d8213a6d4 · 2018-04-18T17:08:50.000-07:00
diff --git a/src/script/standard.h b/src/script/standard.h
@@ -23,7 +23,7 @@ class CScriptID : public uint160
 {
 public:
     CScriptID() : uint160() {}
-    CScriptID(const CScript& in);
+    explicit CScriptID(const CScript& in);
     CScriptID(const uint160& in) : uint160(in) {}
 };
 
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -224,10 +224,11 @@ void ImportScript(CWallet* const pwallet, const CScript& script, const std::stri
     }
 
     if (isRedeemScript) {
-        if (!pwallet->HaveCScript(script) && !pwallet->AddCScript(script)) {
+        const CScriptID id(script);
+        if (!pwallet->HaveCScript(id) && !pwallet->AddCScript(script)) {
             throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");
         }
-        ImportAddress(pwallet, CScriptID(script), strLabel);
+        ImportAddress(pwallet, id, strLabel);
     } else {
         CTxDestination destination;
         if (ExtractDestination(script, destination)) {
@@ -602,7 +603,8 @@ UniValue importwallet(const JSONRPCRequest& request)
             } else if(IsHex(vstr[0])) {
                std::vector<unsigned char> vData(ParseHex(vstr[0]));
                CScript script = CScript(vData.begin(), vData.end());
-               if (pwallet->HaveCScript(script)) {
+               CScriptID id(script);
+               if (pwallet->HaveCScript(id)) {
                    LogPrintf("Skipping import of %s (script already present)\n", vstr[0]);
                    continue;
                }
@@ -613,7 +615,7 @@ UniValue importwallet(const JSONRPCRequest& request)
                }
                int64_t birth_time = DecodeDumpTime(vstr[1]);
                if (birth_time > 0) {
-                   pwallet->m_script_metadata[CScriptID(script)].nCreateTime = birth_time;
+                   pwallet->m_script_metadata[id].nCreateTime = birth_time;
                    nTimeBegin = std::min(nTimeBegin, birth_time);
                }
             }
@@ -899,12 +901,12 @@ UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, const int6
                 throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
             }
 
-            if (!pwallet->HaveCScript(redeemScript) && !pwallet->AddCScript(redeemScript)) {
+            CScriptID redeem_id(redeemScript);
+            if (!pwallet->HaveCScript(redeem_id) && !pwallet->AddCScript(redeemScript)) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");
             }
 
-            CTxDestination redeem_dest = CScriptID(redeemScript);
-            CScript redeemDestination = GetScriptForDestination(redeem_dest);
+            CScript redeemDestination = GetScriptForDestination(redeem_id);
 
             if (::IsMine(*pwallet, redeemDestination) == ISMINE_SPENDABLE) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ class CScriptID : public uint160`
`23`	`23`	`{`
`24`	`24`	`public:`
`25`	`25`	`CScriptID() : uint160() {}`
`26`		`- CScriptID(const CScript& in);`
	`26`	`+ explicit CScriptID(const CScript& in);`
`27`	`27`	`CScriptID(const uint160& in) : uint160(in) {}`
`28`	`28`	`};`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -224,10 +224,11 @@ void ImportScript(CWallet* const pwallet, const CScript& script, const std::stri`
`224`	`224`	`}`
`225`	`225`
`226`	`226`	`if (isRedeemScript) {`
`227`		`- if (!pwallet->HaveCScript(script) && !pwallet->AddCScript(script)) {`
	`227`	`+ const CScriptID id(script);`
	`228`	`+ if (!pwallet->HaveCScript(id) && !pwallet->AddCScript(script)) {`
`228`	`229`	`throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");`
`229`	`230`	`}`
`230`		`- ImportAddress(pwallet, CScriptID(script), strLabel);`
	`231`	`+ ImportAddress(pwallet, id, strLabel);`
`231`	`232`	`} else {`
`232`	`233`	`CTxDestination destination;`
`233`	`234`	`if (ExtractDestination(script, destination)) {`
`@@ -602,7 +603,8 @@ UniValue importwallet(const JSONRPCRequest& request)`
`602`	`603`	`} else if(IsHex(vstr[0])) {`
`603`	`604`	`std::vector<unsigned char> vData(ParseHex(vstr[0]));`
`604`	`605`	`CScript script = CScript(vData.begin(), vData.end());`
`605`		`- if (pwallet->HaveCScript(script)) {`
	`606`	`+ CScriptID id(script);`
	`607`	`+ if (pwallet->HaveCScript(id)) {`
`606`	`608`	`LogPrintf("Skipping import of %s (script already present)\n", vstr[0]);`
`607`	`609`	`continue;`
`608`	`610`	`}`
`@@ -613,7 +615,7 @@ UniValue importwallet(const JSONRPCRequest& request)`
`613`	`615`	`}`
`614`	`616`	`int64_t birth_time = DecodeDumpTime(vstr[1]);`
`615`	`617`	`if (birth_time > 0) {`
`616`		`- pwallet->m_script_metadata[CScriptID(script)].nCreateTime = birth_time;`
	`618`	`+ pwallet->m_script_metadata[id].nCreateTime = birth_time;`
`617`	`619`	`nTimeBegin = std::min(nTimeBegin, birth_time);`
`618`	`620`	`}`
`619`	`621`	`}`
`@@ -899,12 +901,12 @@ UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, const int6`
`899`	`901`	`throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");`
`900`	`902`	`}`
`901`	`903`
`902`		`- if (!pwallet->HaveCScript(redeemScript) && !pwallet->AddCScript(redeemScript)) {`
	`904`	`+ CScriptID redeem_id(redeemScript);`
	`905`	`+ if (!pwallet->HaveCScript(redeem_id) && !pwallet->AddCScript(redeemScript)) {`
`903`	`906`	`throw JSONRPCError(RPC_WALLET_ERROR, "Error adding p2sh redeemScript to wallet");`
`904`	`907`	`}`
`905`	`908`
`906`		`- CTxDestination redeem_dest = CScriptID(redeemScript);`
`907`		`- CScript redeemDestination = GetScriptForDestination(redeem_dest);`
	`909`	`+ CScript redeemDestination = GetScriptForDestination(redeem_id);`
`908`	`910`
`909`	`911`	`if (::IsMine(*pwallet, redeemDestination) == ISMINE_SPENDABLE) {`
`910`	`912`	`throw JSONRPCError(RPC_WALLET_ERROR, "The wallet already contains the private key for this address or script");`