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

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Feb 9, 2024

This is an automatic backport of pull request #34691 done by Mergify.
Cherry-pick of 8869d0c has failed:

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

You are currently cherry-picking commit 8869d0c8a0.
  (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:   programs/sbf/c/src/invoked/invoked.c
	modified:   programs/sbf/c/src/read_program/read_program.c
	modified:   programs/sbf/rust/invoked/src/processor.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   programs/sbf/tests/programs.rs

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 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

* update sbf test to use bpf_loader v2

* update test_program_sbf_invoke_sanity test

* update test bpf program owner

* update test_program_sbf_invoke_upgradeable_via_cpi

* update test_program_sbf_disguised_as_sbf_loader

* update test_program_reads_from_program_account

* update test_program_sbf_program_id_spoofing

* update test_program_sbf_caller_has_access_to_cpi_program

* update 3 more tests

* fix program buffer size in minimul for rent exempt calculation

* more test updates

* more update

* more test updates

* comments

* undo c format

* typo

* add sol_alloc_free not deployable and deployable tests

* comments

* review feedback - move buffer_keypair and program_keypair inside callee
fn.

* more refactor

* delete sof_alloc_free_syscall enabled tests

* revert lamport change

---------

Co-authored-by: HaoranYi <[email protected]>
(cherry picked from commit 8869d0c)

# Conflicts:
#	programs/sbf/tests/programs.rs
@mergify mergify bot added the conflicts label Feb 9, 2024
@HaoranYi HaoranYi force-pushed the mergify/bp/v1.17/pr-34691 branch from b678c29 to 1447ef7 Compare February 10, 2024 01:31
@HaoranYi HaoranYi force-pushed the mergify/bp/v1.17/pr-34691 branch from 1447ef7 to b3603cb Compare February 10, 2024 01:48
sakridge
sakridge previously approved these changes Feb 10, 2024
@codecov
Copy link

codecov bot commented Feb 10, 2024

Codecov Report

Attention: 1 lines in your changes are missing coverage. Please review.

Comparison is base (4ae690d) 81.6% compared to head (f470254) 81.6%.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #35162   +/-   ##
=======================================
  Coverage    81.6%    81.6%           
=======================================
  Files         806      806           
  Lines      218980   218980           
=======================================
+ Hits       178771   178802   +31     
+ Misses      40209    40178   -31     

@sakridge sakridge merged commit 5bf32b4 into v1.17 Feb 10, 2024
@sakridge sakridge deleted the mergify/bp/v1.17/pr-34691 branch February 10, 2024 21:27
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.

4 participants