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

Prevent the invoke and upgrade of programs in the same tx batch (bp #14653)#14679

Merged
mvines merged 2 commits into
v1.4from
mergify/bp/v1.4/pr-14653
Jan 20, 2021
Merged

Prevent the invoke and upgrade of programs in the same tx batch (bp #14653)#14679
mvines merged 2 commits into
v1.4from
mergify/bp/v1.4/pr-14653

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 20, 2021

This is an automatic backport of pull request #14653 done by Mergify.

Cherry-pick of e3bd9e5 has failed:

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

You are currently cherry-picking commit e3bd9e530.
  (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/bpf_loader/src/lib.rs
	modified:   runtime/src/loader_utils.rs
	modified:   sdk/program/src/bpf_loader_upgradeable.rs
	modified:   sdk/program/src/loader_upgradeable_instruction.rs
	modified:   sdk/src/feature_set.rs
	modified:   transaction-status/src/lib.rs

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

To fixup this pull request, you can check out it locally. See documentation: https://help.github.com/articles/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.io/

* Prevent the invoke and upgrade of programs in the same tx batch

* Pass program address as writable in the upgrade instruction

(cherry picked from commit e3bd9e5)

# Conflicts:
#	programs/bpf/Cargo.lock
#	programs/bpf/Cargo.toml
#	programs/bpf/tests/programs.rs
@mergify mergify Bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jan 20, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 20, 2021

automerge label removed due to a CI failure

@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 Jan 20, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 20, 2021

automerge label removed due to a CI failure

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 20, 2021
@jackcmay jackcmay force-pushed the mergify/bp/v1.4/pr-14653 branch from 3abf42a to cb9263e Compare January 20, 2021 00:49
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 20, 2021
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 20, 2021

Codecov Report

Merging #14679 (e3bd9e5) into v1.4 (afa1905) will decrease coverage by 2.1%.
The diff coverage is 65.8%.

@@           Coverage Diff            @@
##            v1.4   #14679     +/-   ##
========================================
- Coverage   82.5%    80.4%   -2.2%     
========================================
  Files        387      403     +16     
  Lines      99620   101126   +1506     
========================================
- Hits       82279    81315    -964     
- Misses     17341    19811   +2470     

@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 20, 2021
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 20, 2021

automerge label removed due to a CI failure

@mvines mvines merged commit 540e23c into v1.4 Jan 20, 2021
@mergify mergify Bot deleted the mergify/bp/v1.4/pr-14653 branch January 20, 2021 02:28
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.

2 participants