Skip to content

v2.2: Add agave-reserved-account-keys crate (backport of #5513)#5516

Merged
jstarry merged 2 commits intov2.2from
mergify/bp/v2.2/pr-5513
Mar 27, 2025
Merged

v2.2: Add agave-reserved-account-keys crate (backport of #5513)#5516
jstarry merged 2 commits intov2.2from
mergify/bp/v2.2/pr-5513

Conversation

@mergify
Copy link
Copy Markdown

@mergify mergify Bot commented Mar 26, 2025

Problem

Reserved account key set composition is subject to runtime feature gates and should live in the agave monorepo rather than creating a circular dependency between agave and the sdk repos.

Summary of Changes

  • Copy in solana-reserved-account-keys
  • Rename to agave-reserved-account-keys
  • Update usages of solana-reserved-account-keys and solana-sdk::solana-reserved-account-keys to `agave-reserved-account-keys

Fixes #


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

(cherry picked from commit df2d3d8)

# Conflicts:
#	Cargo.lock
#	Cargo.toml
#	core/Cargo.toml
#	core/src/banking_stage/unprocessed_packet_batches.rs
#	ledger/Cargo.toml
#	programs/sbf/Cargo.lock
#	svm/examples/Cargo.lock
@mergify mergify Bot requested a review from a team as a code owner March 26, 2025 22:26
@mergify mergify Bot added the conflicts label Mar 26, 2025
@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Mar 26, 2025

Cherry-pick of df2d3d8 has failed:

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

You are currently cherry-picking commit df2d3d83c.
  (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:   cli-output/Cargo.toml
	modified:   cli-output/src/display.rs
	modified:   core/src/banking_stage/consumer.rs
	modified:   cost-model/Cargo.toml
	modified:   cost-model/src/transaction_cost.rs
	modified:   entry/Cargo.toml
	modified:   entry/benches/entry_sigverify.rs
	modified:   entry/src/entry.rs
	modified:   ledger-tool/Cargo.toml
	modified:   ledger-tool/src/main.rs
	modified:   ledger/src/transaction_address_lookup_table_scanner.rs
	modified:   programs/sbf/Cargo.toml
	modified:   programs/sbf/tests/programs.rs
	new file:   reserved-account-keys/Cargo.toml
	new file:   reserved-account-keys/src/lib.rs
	modified:   rpc/Cargo.toml
	modified:   rpc/src/rpc.rs
	modified:   rpc/src/transaction_status_service.rs
	modified:   runtime-transaction/Cargo.toml
	modified:   runtime-transaction/src/runtime_transaction/sdk_transactions.rs
	modified:   runtime-transaction/src/runtime_transaction/transaction_view.rs
	modified:   runtime/Cargo.toml
	modified:   runtime/src/bank.rs
	modified:   runtime/src/snapshot_minimizer.rs
	modified:   storage-bigtable/Cargo.toml
	modified:   storage-bigtable/src/lib.rs
	modified:   svm/Cargo.toml
	modified:   svm/examples/Cargo.toml
	modified:   svm/examples/json-rpc/server/Cargo.toml
	modified:   svm/examples/json-rpc/server/src/rpc_process.rs
	modified:   svm/src/account_loader.rs
	modified:   svm/src/message_processor.rs
	modified:   svm/src/transaction_account_state_info.rs
	modified:   svm/src/transaction_processor.rs
	modified:   svm/tests/transaction_builder.rs
	modified:   transaction-status/Cargo.toml
	modified:   transaction-status/src/lib.rs
	modified:   transaction-status/src/parse_accounts.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   Cargo.toml
	both modified:   core/Cargo.toml
	both modified:   core/src/banking_stage/unprocessed_packet_batches.rs
	both modified:   ledger/Cargo.toml
	both modified:   programs/sbf/Cargo.lock
	both modified:   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

@mergify
Copy link
Copy Markdown
Author

mergify Bot commented Mar 26, 2025

If this PR represents a change to the public RPC API:

  1. Make sure it includes a complementary update to rpc-client/ (example)
  2. Open a follow-up PR to update the JavaScript client @solana/web3.js (example)

Thank you for keeping the RPC clients in sync with the server API @mergify[bot].

@jstarry jstarry requested a review from apfitzge March 26, 2025 23:33
@codecov-commenter
Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 94.73684% with 6 lines in your changes missing coverage. Please review.

Project coverage is 83.3%. Comparing base (508c68c) to head (7218420).

Additional details and impacted files
@@           Coverage Diff            @@
##             v2.2    #5516    +/-   ##
========================================
  Coverage    83.3%    83.3%            
========================================
  Files         800      801     +1     
  Lines      370256   370370   +114     
========================================
+ Hits       308513   308650   +137     
+ Misses      61743    61720    -23     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@jstarry jstarry requested review from joncinque and pgarg66 March 27, 2025 01:53
@jstarry jstarry merged commit ea4bbc4 into v2.2 Mar 27, 2025
46 checks passed
@jstarry jstarry deleted the mergify/bp/v2.2/pr-5513 branch March 27, 2025 12:39
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.

4 participants