IsUsedDestination shouldn't use key id as script id for ScriptHash

instagibbs · instagibbs · commit 4b8f1e989f3b · 2020-01-14T13:23:24.000-05:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -734,7 +734,7 @@ bool CWallet::IsUsedDestination(const uint256& hash, unsigned int n) const
             if (GetDestData(wpkh_dest, "used", nullptr)) {
                 return true;
             }
-            ScriptHash sh_wpkh_dest(wpkh_dest);
+            ScriptHash sh_wpkh_dest(GetScriptForDestination(wpkh_dest));
             if (GetDestData(sh_wpkh_dest, "used", nullptr)) {
                 return true;
             }

Original file line number	Diff line number	Diff line change
`@@ -734,7 +734,7 @@ bool CWallet::IsUsedDestination(const uint256& hash, unsigned int n) const`
`734`	`734`	`if (GetDestData(wpkh_dest, "used", nullptr)) {`
`735`	`735`	`return true;`
`736`	`736`	`}`
`737`		`- ScriptHash sh_wpkh_dest(wpkh_dest);`
	`737`	`+ ScriptHash sh_wpkh_dest(GetScriptForDestination(wpkh_dest));`
`738`	`738`	`if (GetDestData(sh_wpkh_dest, "used", nullptr)) {`
`739`	`739`	`return true;`
`740`	`740`	`}`