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

v1.16: [zk-token-sdk] remove non-pod structs TransferPubkeys and TransferWithFeePubkeys (backport of #32042) #32198

Merged
merged 2 commits into from
Jun 22, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 19, 2023

This is an automatic backport of pull request #32042 done by Mergify.
Cherry-pick of d654715 has failed:

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

You are currently cherry-picking commit d654715ad.
  (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:   zk-token-sdk/src/instruction/transfer/without_fee.rs
	modified:   zk-token-sdk/src/zk_token_elgamal/pod/mod.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   zk-token-sdk/src/instruction/transfer/with_fee.rs
	both modified:   zk-token-sdk/src/zk_token_elgamal/convert.rs
	both modified:   zk-token-sdk/src/zk_token_elgamal/pod/instruction.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 the conflicts label Jun 19, 2023
@samkim-crypto samkim-crypto force-pushed the mergify/bp/v1.16/pr-32042 branch from 30507d6 to 1bb3651 Compare June 20, 2023 23:09
…WithFeePubkeys` (#32042)

* remove decoded `TransferWithFeePubkeys`

* remove decoded `TransferPubkey`

* rename `TransferPubkeys` and `TransferWithFeePubkeys` fields

* relocate `TransferPubkeys` and `TransferWithFeePubkeys`

* reorder proof verify parameters for transfer and transfer with fee

* clippy

(cherry picked from commit d654715)
@samkim-crypto samkim-crypto force-pushed the mergify/bp/v1.16/pr-32042 branch from 1bb3651 to d90d1f3 Compare June 21, 2023 22:44
@codecov
Copy link

codecov bot commented Jun 21, 2023

Codecov Report

Merging #32198 (912d718) into v1.16 (912d718) will not change coverage.
The diff coverage is n/a.

❗ Current head 912d718 differs from pull request most recent head d90d1f3. Consider uploading reports for the commit d90d1f3 to get more accurate results

@@           Coverage Diff           @@
##            v1.16   #32198   +/-   ##
=======================================
  Coverage    81.9%    81.9%           
=======================================
  Files         760      760           
  Lines      207501   207501           
=======================================
  Hits       169991   169991           
  Misses      37510    37510           

@samkim-crypto samkim-crypto merged commit ad23679 into v1.16 Jun 22, 2023
@samkim-crypto samkim-crypto deleted the mergify/bp/v1.16/pr-32042 branch June 22, 2023 01:28
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants