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

Limit number of accounts that a transaction can lock (backport #22201) #22263

Merged
merged 2 commits into from
Jan 4, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 4, 2022

This is an automatic backport of pull request #22201 done by Mergify.
Cherry-pick of 2b5e00d has failed:

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

You are currently cherry-picking commit 2b5e00d36.
  (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:   rpc/src/transaction_status_service.rs
	modified:   sdk/program/src/message/sanitized.rs
	modified:   sdk/src/transaction/sanitized.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   accountsdb-plugin-postgres/src/postgres_client/postgres_client_transaction.rs
	both modified:   runtime/src/accounts.rs
	both modified:   runtime/src/bank.rs
	both modified:   sdk/src/feature_set.rs
	both modified:   sdk/src/transaction/error.rs
	both modified:   storage-proto/proto/transaction_by_addr.proto
	both modified:   storage-proto/src/convert.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

(cherry picked from commit 2b5e00d)

# Conflicts:
#	accountsdb-plugin-postgres/src/postgres_client/postgres_client_transaction.rs
#	runtime/src/accounts.rs
#	runtime/src/bank.rs
#	sdk/src/feature_set.rs
#	sdk/src/transaction/error.rs
#	storage-proto/proto/transaction_by_addr.proto
#	storage-proto/src/convert.rs
@mergify mergify bot added conflicts automerge Merge this Pull Request automatically once CI passes labels Jan 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 4, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@jstarry
Copy link
Member

jstarry commented Jan 4, 2022

@brooksprumo just an fyi that I added your WouldExceedMaxAccountDataCostLimit type in v1.9 here

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Jan 4, 2022

automerge label removed due to a CI failure

@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Jan 4, 2022
@codecov
Copy link

codecov bot commented Jan 4, 2022

Codecov Report

Merging #22263 (6cfcb25) into v1.9 (f8bf478) will increase coverage by 0.0%.
The diff coverage is 97.5%.

@@           Coverage Diff            @@
##             v1.9   #22263    +/-   ##
========================================
  Coverage    81.0%    81.1%            
========================================
  Files         518      518            
  Lines      144946   145026    +80     
========================================
+ Hits       117543   117650   +107     
+ Misses      27403    27376    -27     

@mergify mergify bot merged commit 3b59f67 into v1.9 Jan 4, 2022
@mergify mergify bot deleted the mergify/bp/v1.9/pr-22201 branch January 4, 2022 11:34
@brooksprumo brooksprumo mentioned this pull request Jan 5, 2022
@github-actions
Copy link
Contributor

github-actions bot commented Apr 2, 2022

This PR has been automatically locked since there has not been any activity in past 14 days after it was merged.

@github-actions github-actions bot locked as resolved and limited conversation to collaborators Apr 2, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
automerge Merge this Pull Request automatically once CI passes conflicts locked PR
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant