fixup: for base hasher

domob1812 · domob1812 · commit f92bc9a6d302 · 2021-01-19T13:32:50.000+01:00
diff --git a/divi/src/BlockMemoryPoolTransactionCollector.cpp b/divi/src/BlockMemoryPoolTransactionCollector.cpp
@@ -290,7 +290,6 @@ std::vector<PrioritizedTransactionData> BlockMemoryPoolTransactionCollector::Pri
        this should be good enough.  */
     const ActivationState as(chainActive.Tip());
     const TransactionUtxoHasher utxoHasher(as);
-    const bool segwitLight = as.IsActive(Fork::SegwitLight);
 
     uint64_t nBlockSize = 1000;
     int nBlockSigOps = 100;
@@ -354,8 +353,7 @@ std::vector<PrioritizedTransactionData> BlockMemoryPoolTransactionCollector::Pri
         }
 
         // Add transactions that depend on this one to the priority queue
-        const uint256 outpointHash = (segwitLight ? tx.GetBareTxid() : tx.GetHash());
-        AddDependingTransactionsToPriorityQueue(dependentTransactions, outpointHash, vecPriority, comparer);
+        AddDependingTransactionsToPriorityQueue(dependentTransactions, utxoHasher.GetUtxoHash(tx), vecPriority, comparer);
     }
 
     LogPrintf("CreateNewBlock(): total size %u\n", nBlockSize);

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,6 @@ std::vector<PrioritizedTransactionData> BlockMemoryPoolTransactionCollector::Pri`
`290`	`290`	`this should be good enough. */`
`291`	`291`	`const ActivationState as(chainActive.Tip());`
`292`	`292`	`const TransactionUtxoHasher utxoHasher(as);`
`293`		`- const bool segwitLight = as.IsActive(Fork::SegwitLight);`
`294`	`293`
`295`	`294`	`uint64_t nBlockSize = 1000;`
`296`	`295`	`int nBlockSigOps = 100;`
`@@ -354,8 +353,7 @@ std::vector<PrioritizedTransactionData> BlockMemoryPoolTransactionCollector::Pri`
`354`	`353`	`}`
`355`	`354`
`356`	`355`	`// Add transactions that depend on this one to the priority queue`
`357`		`- const uint256 outpointHash = (segwitLight ? tx.GetBareTxid() : tx.GetHash());`
`358`		`- AddDependingTransactionsToPriorityQueue(dependentTransactions, outpointHash, vecPriority, comparer);`
	`356`	`+ AddDependingTransactionsToPriorityQueue(dependentTransactions, utxoHasher.GetUtxoHash(tx), vecPriority, comparer);`
`359`	`357`	`}`
`360`	`358`
`361`	`359`	`LogPrintf("CreateNewBlock(): total size %u\n", nBlockSize);`