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

instagibbs · promag · commit e2c45d89f721 · 2020-01-15T09:58:56.000Z
Github-Pull: #17924 Rebased-From: 4b8f1e9
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1087,7 +1087,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
`@@ -1087,7 +1087,7 @@ bool CWallet::IsUsedDestination(const uint256& hash, unsigned int n) const`
`1087`	`1087`	`if (GetDestData(wpkh_dest, "used", nullptr)) {`
`1088`	`1088`	`return true;`
`1089`	`1089`	`}`
`1090`		`- ScriptHash sh_wpkh_dest(wpkh_dest);`
	`1090`	`+ ScriptHash sh_wpkh_dest(GetScriptForDestination(wpkh_dest));`
`1091`	`1091`	`if (GetDestData(sh_wpkh_dest, "used", nullptr)) {`
`1092`	`1092`	`return true;`
`1093`	`1093`	`}`