Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.17: [zk-token-proof] Feature gate transfer with fee related proofs (backport of #34103) #34129

Merged
merged 2 commits into from
Nov 17, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 17, 2023

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

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

You are currently cherry-picking commit a8863bd9fe.
  (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:   programs/zk-token-proof/src/lib.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	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

feature gate zk-token-proof transfer with fee

(cherry picked from commit a8863bd)

# Conflicts:
#	sdk/src/feature_set.rs
Copy link

codecov bot commented Nov 17, 2023

Codecov Report

Merging #34129 (ff1e9a3) into v1.17 (a9d5a5b) will increase coverage by 0.0%.
The diff coverage is 100.0%.

Additional details and impacted files
@@           Coverage Diff           @@
##            v1.17   #34129   +/-   ##
=======================================
  Coverage    81.8%    81.8%           
=======================================
  Files         803      803           
  Lines      217911   217912    +1     
=======================================
+ Hits       178347   178398   +51     
+ Misses      39564    39514   -50     

@samkim-crypto samkim-crypto merged commit 0a195ad into v1.17 Nov 17, 2023
32 checks passed
@samkim-crypto samkim-crypto deleted the mergify/bp/v1.17/pr-34103 branch November 17, 2023 20:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants