Merge bitcoin#11529: Avoid slow transaction search with txindex enabled

laanwj · codablock · commit 371feda4cec6 · 2017-11-19T20:26:34.000+01:00
7a5f930 Avoid slow transaction search with txindex enabled (João Barbosa) Pull request description: This is an alternative to bitcoin#11507 where a slow search is not attempted (in any case) if `txindex` is enabled. Tree-SHA512: e680621781a9241c0513ddd79d23b0b42f3ccec8a63ed1c926b35c43321c81c39a1028770397dd5070501dcf644d897026a2bd68a161a4b435f19227c1bbca48
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -1112,6 +1112,9 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P
                 return error("%s: txid mismatch", __func__);
             return true;
         }
+
+        // transaction not found in index, nothing more can be done
+        return false;
     }
 
     if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it

Original file line number	Diff line number	Diff line change
`@@ -1112,6 +1112,9 @@ bool GetTransaction(const uint256 &hash, CTransaction &txOut, const Consensus::P`
`1112`	`1112`	`return error("%s: txid mismatch", __func__);`
`1113`	`1113`	`return true;`
`1114`	`1114`	`}`
	`1115`	`+`
	`1116`	`+ // transaction not found in index, nothing more can be done`
	`1117`	`+ return false;`
`1115`	`1118`	`}`
`1116`	`1119`
`1117`	`1120`	`if (fAllowSlow) { // use coin database to locate block that contains transaction, and scan it`