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

Parse ConfidentialTransaction extensions (backport #26820)#26966

Merged
mergify[bot] merged 2 commits intov1.10from
mergify/bp/v1.10/pr-26820
Aug 6, 2022
Merged

Parse ConfidentialTransaction extensions (backport #26820)#26966
mergify[bot] merged 2 commits intov1.10from
mergify/bp/v1.10/pr-26820

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify Bot commented Aug 6, 2022

This is an automatic backport of pull request #26820 done by Mergify.
Cherry-pick of 9d31b1d has failed:

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

You are currently cherry-picking commit 9d31b1d29.
  (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:   account-decoder/src/parse_token_extension.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   Cargo.lock
	both modified:   account-decoder/Cargo.toml
	both modified:   client/Cargo.toml
	both modified:   programs/bpf/Cargo.lock
	both modified:   rpc/Cargo.toml
	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

* Bump spl-token-2022 to 0.4.2

* Revert Cargo.lock changes in #26746 and update spl solana crates to v1.10.33

* Parse ConfidentialTransfer extensions

(cherry picked from commit 9d31b1d)

# Conflicts:
#	Cargo.lock
#	account-decoder/Cargo.toml
#	client/Cargo.toml
#	programs/bpf/Cargo.lock
#	rpc/Cargo.toml
#	transaction-status/Cargo.toml
@mergify mergify Bot added the conflicts label Aug 6, 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 Aug 6, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 6, 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 Aug 6, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 6, 2022

automerge label removed due to a CI failure

@mergify mergify Bot added the automerge Merge this Pull Request automatically once CI passes label Aug 6, 2022
@mergify
Copy link
Copy Markdown
Contributor Author

mergify Bot commented Aug 6, 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 Aug 6, 2022
@mergify mergify Bot merged commit b316488 into v1.10 Aug 6, 2022
@mergify mergify Bot deleted the mergify/bp/v1.10/pr-26820 branch August 6, 2022 17:28
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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants