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

Demote write locks on transaction program ids (backport #19593) #19633

Merged
merged 2 commits into from
Sep 4, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 4, 2021

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

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

You are currently cherry-picking commit decec3cd8.
  (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/src/display.rs
	modified:   program-test/src/lib.rs
	modified:   sdk/program/src/message.rs
	modified:   sdk/src/feature_set.rs
	modified:   transaction-status/src/parse_accounts.rs

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   core/src/banking_stage.rs
	deleted by us:   core/src/cost_model.rs
	deleted by us:   core/src/cost_tracker.rs
	both modified:   ledger-tool/src/main.rs
	deleted by us:   program-runtime/src/instruction_processor.rs
	both modified:   programs/bpf/tests/programs.rs
	both modified:   programs/bpf_loader/src/syscalls.rs
	both modified:   rpc/src/transaction_status_service.rs
	both modified:   runtime/src/accounts.rs
	both modified:   runtime/src/bank.rs
	both modified:   runtime/src/message_processor.rs
	both modified:   sdk/benches/serialize_instructions.rs
	deleted by us:   sdk/program/src/message/mapped.rs
	deleted by us:   sdk/program/src/message/sanitized.rs
	deleted by us:   sdk/src/transaction/sanitized.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.io/

* Add feature

* Demote write lock on program ids

* Fixup bpf tests

* Update MappedMessage::is_writable

* Comma nit

* Review comments

(cherry picked from commit decec3c)

# Conflicts:
#	core/src/banking_stage.rs
#	core/src/cost_model.rs
#	core/src/cost_tracker.rs
#	ledger-tool/src/main.rs
#	program-runtime/src/instruction_processor.rs
#	programs/bpf/tests/programs.rs
#	programs/bpf_loader/src/syscalls.rs
#	rpc/src/transaction_status_service.rs
#	runtime/src/accounts.rs
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
#	sdk/benches/serialize_instructions.rs
#	sdk/program/src/message/mapped.rs
#	sdk/program/src/message/sanitized.rs
#	sdk/src/transaction/sanitized.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes and removed automerge Merge this Pull Request automatically once CI passes labels Sep 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Sep 4, 2021

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 4, 2021
@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-19593 branch from ccb37a7 to 5a09cb7 Compare September 4, 2021 04:14
@solana-grimes
Copy link
Contributor

😱 New commits were pushed while the automerge label was present.

@solana-grimes solana-grimes removed the automerge Merge this Pull Request automatically once CI passes label Sep 4, 2021
@CriesofCarrots CriesofCarrots added the automerge Merge this Pull Request automatically once CI passes label Sep 4, 2021
@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Sep 4, 2021
@mergify
Copy link
Contributor Author

mergify bot commented Sep 4, 2021

automerge label removed due to a CI failure

@CriesofCarrots CriesofCarrots force-pushed the mergify/bp/v1.7/pr-19593 branch from 5a09cb7 to 1c238a1 Compare September 4, 2021 04:28
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Sep 4, 2021
@codecov
Copy link

codecov bot commented Sep 4, 2021

Codecov Report

Merging #19633 (1c238a1) into v1.7 (aa2098d) will decrease coverage by 0.0%.
The diff coverage is 86.4%.

@@            Coverage Diff            @@
##             v1.7   #19633     +/-   ##
=========================================
- Coverage    82.2%    82.2%   -0.1%     
=========================================
  Files         437      437             
  Lines      123862   124036    +174     
=========================================
+ Hits       101893   102004    +111     
- Misses      21969    22032     +63     

@mergify mergify bot merged commit fcda5d4 into v1.7 Sep 4, 2021
mergify bot added a commit that referenced this pull request Sep 4, 2021
* Demote write locks on transaction program ids (#19593)

* Add feature

* Demote write lock on program ids

* Fixup bpf tests

* Update MappedMessage::is_writable

* Comma nit

* Review comments

(cherry picked from commit decec3c)

# Conflicts:
#	core/src/banking_stage.rs
#	core/src/cost_model.rs
#	core/src/cost_tracker.rs
#	ledger-tool/src/main.rs
#	program-runtime/src/instruction_processor.rs
#	programs/bpf/tests/programs.rs
#	programs/bpf_loader/src/syscalls.rs
#	rpc/src/transaction_status_service.rs
#	runtime/src/accounts.rs
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
#	sdk/benches/serialize_instructions.rs
#	sdk/program/src/message/mapped.rs
#	sdk/program/src/message/sanitized.rs
#	sdk/src/transaction/sanitized.rs

* Fix conflicts

Co-authored-by: Tyera Eulberg <[email protected]>
Co-authored-by: Tyera Eulberg <[email protected]>
(cherry picked from commit fcda5d4)

# Conflicts:
#	cli-output/src/display.rs
#	core/src/transaction_status_service.rs
#	program-test/src/lib.rs
#	programs/bpf_loader/src/syscalls.rs
#	runtime/src/accounts.rs
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
#	sdk/benches/serialize_instructions.rs
#	sdk/program/src/message.rs
#	sdk/src/feature_set.rs
#	transaction-status/src/parse_accounts.rs
@mergify mergify bot deleted the mergify/bp/v1.7/pr-19593 branch September 4, 2021 06:46
mergify bot added a commit that referenced this pull request Sep 4, 2021
…port #19633) (#19637)

* Demote write locks on transaction program ids (backport #19593) (#19633)

* Demote write locks on transaction program ids (#19593)

* Add feature

* Demote write lock on program ids

* Fixup bpf tests

* Update MappedMessage::is_writable

* Comma nit

* Review comments

(cherry picked from commit decec3c)

# Conflicts:
#	core/src/banking_stage.rs
#	core/src/cost_model.rs
#	core/src/cost_tracker.rs
#	ledger-tool/src/main.rs
#	program-runtime/src/instruction_processor.rs
#	programs/bpf/tests/programs.rs
#	programs/bpf_loader/src/syscalls.rs
#	rpc/src/transaction_status_service.rs
#	runtime/src/accounts.rs
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
#	sdk/benches/serialize_instructions.rs
#	sdk/program/src/message/mapped.rs
#	sdk/program/src/message/sanitized.rs
#	sdk/src/transaction/sanitized.rs

* Fix conflicts

Co-authored-by: Tyera Eulberg <[email protected]>
Co-authored-by: Tyera Eulberg <[email protected]>
(cherry picked from commit fcda5d4)

# Conflicts:
#	cli-output/src/display.rs
#	core/src/transaction_status_service.rs
#	program-test/src/lib.rs
#	programs/bpf_loader/src/syscalls.rs
#	runtime/src/accounts.rs
#	runtime/src/bank.rs
#	runtime/src/message_processor.rs
#	sdk/benches/serialize_instructions.rs
#	sdk/program/src/message.rs
#	sdk/src/feature_set.rs
#	transaction-status/src/parse_accounts.rs

* Replace feature and fix conflicts

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
Co-authored-by: Tyera Eulberg <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants