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

Add fees to tx-wide caps (backport #22081) #23095

Merged
merged 2 commits into from
Feb 15, 2022
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 12, 2022

This is an automatic backport of pull request #22081 done by Mergify.
Cherry-pick of 3d9874b has failed:

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

You are currently cherry-picking commit 3d9874b95.
  (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/tests/nonce.rs
	modified:   cli/tests/stake.rs
	modified:   cli/tests/transfer.rs
	modified:   docs/src/developing/programming-model/runtime.md
	modified:   program-runtime/src/compute_budget.rs
	modified:   program-runtime/src/invoke_context.rs
	modified:   programs/bpf/tests/programs.rs
	modified:   rpc/src/transaction_status_service.rs
	modified:   runtime/src/accounts.rs
	modified:   runtime/src/message_processor.rs
	modified:   sdk/src/compute_budget.rs
	new file:   sdk/src/fee.rs
	modified:   sdk/src/lib.rs
	modified:   tokens/src/commands.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   runtime/src/bank.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 Feb 12, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 12, 2022

automerge label removed due to a CI failure

@mergify mergify bot removed the automerge Merge this Pull Request automatically once CI passes label Feb 12, 2022
(cherry picked from commit 3d9874b)

# Conflicts:
#	runtime/src/bank.rs
@jackcmay jackcmay force-pushed the mergify/bp/v1.9/pr-22081 branch from dc40b12 to 454cd10 Compare February 14, 2022 23:05
@mergify mergify bot added the automerge Merge this Pull Request automatically once CI passes label Feb 14, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Feb 15, 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 Feb 15, 2022
@mergify mergify bot merged commit 2c8cfdb into v1.9 Feb 15, 2022
@mergify mergify bot deleted the mergify/bp/v1.9/pr-22081 branch February 15, 2022 01:36
@github-actions
Copy link
Contributor

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 Mar 30, 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