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

Add AccountsDataMeter to InvokeContext (backport #21813)#22299

Merged
mergify[bot] merged 1 commit intov1.9from
mergify/bp/v1.9/pr-21813
Jan 6, 2022
Merged

Add AccountsDataMeter to InvokeContext (backport #21813)#22299
mergify[bot] merged 1 commit intov1.9from
mergify/bp/v1.9/pr-21813

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Jan 5, 2022

This is an automatic backport of pull request #21813 done by Mergify.
Cherry-pick of 800472d has failed:

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

You are currently cherry-picking commit 800472ddf.
  (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:
	new file:   program-runtime/src/accounts_data_meter.rs
	modified:   program-runtime/src/invoke_context.rs
	modified:   program-runtime/src/lib.rs
	modified:   programs/bpf_loader/src/lib.rs
	modified:   runtime/src/message_processor.rs
	modified:   sdk/program/src/instruction.rs
	modified:   sdk/program/src/program_error.rs
	modified:   storage-proto/proto/transaction_by_addr.proto
	modified:   storage-proto/src/convert.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.rs
	both modified:   sdk/src/feature_set.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 conflicts automerge Merge this Pull Request automatically once CI passes labels Jan 5, 2022
@brooksprumo brooksprumo self-assigned this Jan 5, 2022
@mergify mergify Bot removed the automerge Merge this Pull Request automatically once CI passes label Jan 5, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 5, 2022

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 5, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 5, 2022

automerge label removed due to a CI failure

@brooksprumo
Copy link
Copy Markdown
Contributor

@Mergifyio rebase

@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 5, 2022

rebase

❌ Base branch update has failed

Details

Git reported the following error:

Rebasing (1/2)
Auto-merging runtime/src/bank.rs
CONFLICT (content): Merge conflict in runtime/src/bank.rs
error: could not apply 37bc964cd... Add AccountsDataMeter to InvokeContext (#21813)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 37bc964cd... Add AccountsDataMeter to InvokeContext (#21813)

err-code: 17F2A

@brooksprumo brooksprumo force-pushed the mergify/bp/v1.9/pr-21813 branch from 5a94659 to 71bfe6e Compare January 5, 2022 17:20
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 5, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 5, 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 5, 2022
@brooksprumo brooksprumo force-pushed the mergify/bp/v1.9/pr-21813 branch from 71bfe6e to bde558f Compare January 5, 2022 18:03
@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 5, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 5, 2022

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 5, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Jan 5, 2022

automerge label removed due to a CI failure

@brooksprumo brooksprumo force-pushed the mergify/bp/v1.9/pr-21813 branch from bde558f to 0811146 Compare January 5, 2022 23:20
@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Jan 5, 2022
@codecov
Copy link
Copy Markdown

codecov Bot commented Jan 6, 2022

Codecov Report

Merging #22299 (0811146) into v1.9 (840ec06) will increase coverage by 0.0%.
The diff coverage is 87.0%.

@@           Coverage Diff            @@
##             v1.9   #22299    +/-   ##
========================================
  Coverage    81.1%    81.1%            
========================================
  Files         518      519     +1     
  Lines      145186   145297   +111     
========================================
+ Hits       117760   117884   +124     
+ Misses      27426    27413    -13     

@mergify mergify Bot merged commit 687cd47 into v1.9 Jan 6, 2022
@mergify mergify Bot deleted the mergify/bp/v1.9/pr-21813 branch January 6, 2022 01:31
@github-actions
Copy link
Copy Markdown
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