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

v2.1: Reapply changes from reverted PR 3423 (backport of #4257) #4671

Open
wants to merge 2 commits into
base: v2.1
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 28, 2025

This PR adds back changes from PR 3423 but this time with less API changes which allows to simplify backport to 2.1.

Problem

In order to be able to use new client code in the SendTransactionService (see #3444), I need to wrap network-related code with the new structure ConnectionCacheClient.

Summary of Changes

To extract network code into a new structure, I had to move some auxiliary code into separate files.
Beside of that, changes are pretty minimal and I deliberately haven't tried to optimize existing code to keep changes minimal. It just does almost exactly the same as the old one.


This is an automatic backport of pull request #4257 done by [Mergify](https://mergify.com).

* Extract client code in send_transaction_service into a new structure.

This is the same as PR#3423 but with minimized API changes in STS.
In order to be able to use new client code in the `SendTransactionService`, I need to wrap network-related code with the new structure ConnectionCacheClient.
To to that I also had to move some auxiliary code into separate files.

* reexport some structures in the send_transaction_service

* move back all the displaced structs

* modify one log message

* Move back Config to threads

* unpack config only in process_transactions

* Use reference structure unpack in arg list

(cherry picked from commit 4fe5092)

# Conflicts:
#	svm/examples/Cargo.lock
@mergify mergify bot added the conflicts label Jan 28, 2025
@mergify mergify bot requested a review from a team as a code owner January 28, 2025 19:52
Copy link
Author

mergify bot commented Jan 28, 2025

Cherry-pick of 4fe5092 has failed:

On branch mergify/bp/v2.1/pr-4257
Your branch is up to date with 'origin/v2.1'.

You are currently cherry-picking commit 4fe50924e.
  (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:   Cargo.lock
	modified:   programs/sbf/Cargo.lock
	modified:   send-transaction-service/Cargo.toml
	modified:   send-transaction-service/src/send_transaction_service.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   svm/examples/Cargo.lock

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

@KirillLykov
Copy link

Hm, cherry-picking seems to be fine but CI breaks with missing /solana/svm/examples/Cargo.toml

@t-nelson
Copy link

the problem is that the corresponding lock file was committed, but not the toml. delete the lock file

@t-nelson
Copy link

t-nelson commented Jan 29, 2025

who's sme for this? @lijunwangs @alessandrod ?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants