Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore incoming pending transactions when sync mode is blockchair #649

Merged
merged 1 commit into from
Mar 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -344,13 +344,15 @@ class BitcoinCoreBuilder {
val transactionExtractor = TransactionExtractor(addressConverter, storage, pluginManager, metadataExtractor)

val conflictsResolver = TransactionConflictsResolver(storage)
val ignorePendingIncoming = syncMode is BitcoinCore.SyncMode.Blockchair
val pendingTransactionProcessor = PendingTransactionProcessor(
storage,
transactionExtractor,
publicKeyManager,
irregularOutputFinder,
dataProvider,
conflictsResolver
conflictsResolver,
ignorePendingIncoming
)
val invalidator = TransactionInvalidator(storage, transactionInfoConverter, dataProvider)
val blockTransactionProcessor = BlockTransactionProcessor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import io.horizontalsystems.bitcoincore.extensions.toReversedHex
import io.horizontalsystems.bitcoincore.managers.BloomFilterManager
import io.horizontalsystems.bitcoincore.managers.IIrregularOutputFinder
import io.horizontalsystems.bitcoincore.models.Transaction
import io.horizontalsystems.bitcoincore.models.TransactionType
import io.horizontalsystems.bitcoincore.storage.FullTransaction
import io.horizontalsystems.bitcoincore.transactions.extractors.TransactionExtractor

Expand All @@ -18,7 +19,8 @@ class PendingTransactionProcessor(
private val publicKeyManager: IPublicKeyManager,
private val irregularOutputFinder: IIrregularOutputFinder,
private val dataListener: IBlockchainDataListener,
private val conflictsResolver: TransactionConflictsResolver
private val conflictsResolver: TransactionConflictsResolver,
private val ignorePendingIncoming: Boolean
) {

private val notMineTransactions = HashSet<ByteArray>()
Expand Down Expand Up @@ -112,6 +114,9 @@ class PendingTransactionProcessor(
}

resolveConflicts(transaction, updated)
if (ignorePendingIncoming && transaction.metadata.type == TransactionType.Incoming) {
continue
}
storage.addTransaction(transaction)
inserted.add(transaction.header)

Expand Down
Loading