Prefer explicit CScriptID construction

Empact · Empact · commit 3fcc46812334 · 2020-06-19T12:14:07.000-07:00
diff --git a/src/script/sign.cpp b/src/script/sign.cpp
@@ -131,7 +131,7 @@ static bool SignStep(const SigningProvider& provider, const BaseSignatureCreator
     }
     case TX_SCRIPTHASH:
         h160 = uint160(vSolutions[0]);
-        if (GetCScript(provider, sigdata, h160, scriptRet)) {
+        if (GetCScript(provider, sigdata, CScriptID{h160}, scriptRet)) {
             ret.push_back(std::vector<unsigned char>(scriptRet.begin(), scriptRet.end()));
             return true;
         }
@@ -165,7 +165,7 @@ static bool SignStep(const SigningProvider& provider, const BaseSignatureCreator
 
     case TX_WITNESS_V0_SCRIPTHASH:
         CRIPEMD160().Write(&vSolutions[0][0], vSolutions[0].size()).Finalize(h160.begin());
-        if (GetCScript(provider, sigdata, h160, scriptRet)) {
+        if (GetCScript(provider, sigdata, CScriptID{h160}, scriptRet)) {
             ret.push_back(std::vector<unsigned char>(scriptRet.begin(), scriptRet.end()));
             return true;
         }
@@ -458,7 +458,7 @@ bool IsSegWitOutput(const SigningProvider& provider, const CScript& script)
     if (whichtype == TX_SCRIPTHASH) {
         auto h160 = uint160(solutions[0]);
         CScript subscript;
-        if (provider.GetCScript(h160, subscript)) {
+        if (provider.GetCScript(CScriptID{h160}, subscript)) {
             whichtype = Solver(subscript, solutions);
             if (whichtype == TX_WITNESS_V0_SCRIPTHASH || whichtype == TX_WITNESS_V0_KEYHASH || whichtype == TX_WITNESS_UNKNOWN) return true;
         }
diff --git a/src/script/standard.h b/src/script/standard.h
@@ -25,7 +25,7 @@ class CScriptID : public uint160
 public:
     CScriptID() : uint160() {}
     explicit CScriptID(const CScript& in);
-    CScriptID(const uint160& in) : uint160(in) {}
+    explicit CScriptID(const uint160& in) : uint160(in) {}
 };
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ static bool SignStep(const SigningProvider& provider, const BaseSignatureCreator`
`131`	`131`	`}`
`132`	`132`	`case TX_SCRIPTHASH:`
`133`	`133`	`h160 = uint160(vSolutions[0]);`
`134`		`- if (GetCScript(provider, sigdata, h160, scriptRet)) {`
	`134`	`+ if (GetCScript(provider, sigdata, CScriptID{h160}, scriptRet)) {`
`135`	`135`	`ret.push_back(std::vector<unsigned char>(scriptRet.begin(), scriptRet.end()));`
`136`	`136`	`return true;`
`137`	`137`	`}`
`@@ -165,7 +165,7 @@ static bool SignStep(const SigningProvider& provider, const BaseSignatureCreator`
`165`	`165`
`166`	`166`	`case TX_WITNESS_V0_SCRIPTHASH:`
`167`	`167`	`CRIPEMD160().Write(&vSolutions[0][0], vSolutions[0].size()).Finalize(h160.begin());`
`168`		`- if (GetCScript(provider, sigdata, h160, scriptRet)) {`
	`168`	`+ if (GetCScript(provider, sigdata, CScriptID{h160}, scriptRet)) {`
`169`	`169`	`ret.push_back(std::vector<unsigned char>(scriptRet.begin(), scriptRet.end()));`
`170`	`170`	`return true;`
`171`	`171`	`}`
`@@ -458,7 +458,7 @@ bool IsSegWitOutput(const SigningProvider& provider, const CScript& script)`
`458`	`458`	`if (whichtype == TX_SCRIPTHASH) {`
`459`	`459`	`auto h160 = uint160(solutions[0]);`
`460`	`460`	`CScript subscript;`
`461`		`- if (provider.GetCScript(h160, subscript)) {`
	`461`	`+ if (provider.GetCScript(CScriptID{h160}, subscript)) {`
`462`	`462`	`whichtype = Solver(subscript, solutions);`
`463`	`463`	`if (whichtype == TX_WITNESS_V0_SCRIPTHASH \|\| whichtype == TX_WITNESS_V0_KEYHASH \|\| whichtype == TX_WITNESS_UNKNOWN) return true;`
`464`	`464`	`}`