Skip to content
This repository has been archived by the owner on Jan 22, 2025. It is now read-only.

Add transaction index in slot to geyser plugin TransactionInfo (backport #25688) #26190

Closed
wants to merge 2 commits into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2022

This is an automatic backport of pull request #25688 done by Mergify.
Cherry-pick of a6ba5a9 has failed:

On branch mergify/bp/v1.10/pr-25688
Your branch is up to date with 'origin/v1.10'.

You are currently cherry-picking commit a6ba5a9a0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   banking-bench/src/main.rs
	modified:   core/benches/banking_stage.rs
	modified:   core/src/replay_stage.rs
	modified:   geyser-plugin-interface/src/geyser_plugin_interface.rs
	modified:   geyser-plugin-manager/src/transaction_notifier.rs
	modified:   poh/src/poh_service.rs
	modified:   rpc/src/transaction_notifier_interface.rs
	modified:   rpc/src/transaction_status_service.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/banking_stage.rs
	both modified:   ledger/src/blockstore_processor.rs
	both modified:   poh/src/poh_recorder.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Define shuffle to prep using same shuffle for multiple slices

* Determine transaction indexes and plumb to execute_batch

* Pair transaction_index with transaction in TransactionStatusService

* Add new ReplicaTransactionInfoVersion

* Plumb transaction_indexes through BankingStage

* Prepare BankingStage to receive transaction indexes from PohRecorder

* Determine transaction indexes in PohRecorder; add field to WorkingBank

* Add PohRecorder::record unit test

* Only pass starting_transaction_index around PohRecorder

* Add helper structs to simplify test DashMap

* Pass entry and starting-index into process_entries_with_callback together

* Add tx-index checks to test_rebatch_transactions

* Revert shuffle definition and use zip/unzip

* Only zip/unzip if randomize

* Add confirm_slot_entries test

* Review nits

* Add type alias to make sender docs more clear

(cherry picked from commit a6ba5a9)

# Conflicts:
#	core/src/banking_stage.rs
#	ledger/src/blockstore_processor.rs
#	poh/src/poh_recorder.rs
@mergify mergify bot added the conflicts label Jun 23, 2022
@mergify mergify bot added automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Jun 23, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jun 23, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jun 23, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jun 23, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jun 23, 2022
@CriesofCarrots
Copy link
Contributor

Nevermind, this can ride the v1.11 train

@mergify mergify bot deleted the mergify/bp/v1.10/pr-25688 branch June 23, 2022 20:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant