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

Parse address-lookup-table instructions (backport #27316) #28135

Merged
merged 2 commits into from
Oct 1, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 29, 2022

This is an automatic backport of pull request #27316 done by Mergify.
Cherry-pick of 62eebe6 has failed:

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

You are currently cherry-picking commit 62eebe6e6.
  (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:   Cargo.lock
	modified:   programs/bpf/Cargo.lock
	modified:   transaction-status/src/lib.rs
	new file:   transaction-status/src/parse_address_lookup_table.rs
	modified:   transaction-status/src/parse_instruction.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/src/developing/clients/jsonrpc-api.md
	both modified:   transaction-status/Cargo.toml

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

* Parse address-lookup-table instructions

* Finish extend instruction handling

* Rename payer, recipient

* Update docs parsing status

(cherry picked from commit 62eebe6)

# Conflicts:
#	docs/src/developing/clients/jsonrpc-api.md
#	transaction-status/Cargo.toml
@mergify mergify bot added the conflicts label Sep 29, 2022
@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 Sep 29, 2022
@mergify
Copy link
Contributor Author

mergify bot commented Sep 29, 2022

automerge label removed due to a CI failure

@jstarry jstarry added the no-automerge Prevent the automerge label from being applied label Sep 29, 2022
@jstarry jstarry merged commit 9e9f778 into v1.14 Oct 1, 2022
@jstarry jstarry deleted the mergify/bp/v1.14/pr-27316 branch October 1, 2022 08:19
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
conflicts no-automerge Prevent the automerge label from being applied
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants