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

v1.17: Bump solana_rbpf to v0.8.0 (backport of #33679) #33793

Merged
merged 2 commits into from
Oct 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 20, 2023

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

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

You are currently cherry-picking commit a5c7c999e2.
  (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:   ledger/src/blockstore_processor.rs
	modified:   program-runtime/src/invoke_context.rs
	modified:   program-runtime/src/loaded_programs.rs
	modified:   program-runtime/src/message_processor.rs
	modified:   program-runtime/src/stable_log.rs
	modified:   program-test/Cargo.toml
	modified:   program-test/src/lib.rs
	modified:   programs/address-lookup-table-tests/tests/common.rs
	modified:   programs/address-lookup-table-tests/tests/create_lookup_table_ix.rs
	modified:   programs/address-lookup-table/src/processor.rs
	modified:   programs/bpf-loader-tests/tests/common.rs
	modified:   programs/bpf_loader/src/lib.rs
	modified:   programs/bpf_loader/src/syscalls/cpi.rs
	modified:   programs/bpf_loader/src/syscalls/logging.rs
	modified:   programs/bpf_loader/src/syscalls/mem_ops.rs
	modified:   programs/bpf_loader/src/syscalls/sysvar.rs
	modified:   programs/compute-budget/src/lib.rs
	modified:   programs/config/src/config_processor.rs
	modified:   programs/loader-v4/src/lib.rs
	modified:   programs/sbf/Cargo.lock
	modified:   programs/sbf/tests/programs.rs
	modified:   programs/stake/src/stake_instruction.rs
	modified:   programs/system/src/system_processor.rs
	modified:   programs/vote/benches/process_vote.rs
	modified:   programs/vote/src/vote_processor.rs
	modified:   programs/zk-token-proof/src/lib.rs
	modified:   runtime/benches/bank.rs
	modified:   runtime/src/bank.rs
	modified:   runtime/src/builtins.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.toml
	both modified:   programs/bpf_loader/src/syscalls/mod.rs
	both modified:   programs/sbf/Cargo.toml
	both modified:   runtime/src/bank/tests.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

@mergify mergify bot added the conflicts label Oct 20, 2023
@Lichtso Lichtso force-pushed the mergify/bp/v1.17/pr-33679 branch 2 times, most recently from 4b19c4b to 16e369e Compare October 20, 2023 22:32
* updated inner_call for hashing fn to follow generic approach

* different hash compute budget values for all digests

* fixed conflicts

* reverted changes to compute_budget.rs and added 3method to trait to get compute budget values

* updated type for result fn for HasherImpl

* using Hash directly in result fn, got rid of HASH_BYTES and removed comment form compute_budget

* updated import statement

* cargo fmt -all

* removed unused import and reference related warning

* oops forgot semicolon

* removed trailing white space

(cherry picked from commit a60d185)
* Bumps solana_rbpf to v0.8.0

* Adjustments:
Replaces declare_syscall!() with declare_builtin_function!().
Removes Config::encrypt_runtime_environment.
Simplifies error propagation.

(cherry picked from commit a5c7c99)
@codecov
Copy link

codecov bot commented Oct 21, 2023

Codecov Report

Merging #33793 (3e56c55) into v1.17 (a5188a4) will increase coverage by 0.0%.
The diff coverage is 79.9%.

@@           Coverage Diff            @@
##            v1.17   #33793    +/-   ##
========================================
  Coverage    81.7%    81.8%            
========================================
  Files         804      804            
  Lines      218334   217496   -838     
========================================
- Hits       178523   178044   -479     
+ Misses      39811    39452   -359     

@Lichtso Lichtso merged commit 9021d22 into v1.17 Oct 21, 2023
31 checks passed
@Lichtso Lichtso deleted the mergify/bp/v1.17/pr-33679 branch October 21, 2023 12:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants