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

[zk-token-proof] Feature gate transfer with fee related proofs #34103

Merged
merged 1 commit into from
Nov 17, 2023
Merged

[zk-token-proof] Feature gate transfer with fee related proofs #34103

merged 1 commit into from
Nov 17, 2023

Conversation

samkim-crypto
Copy link
Contributor

@samkim-crypto samkim-crypto commented Nov 16, 2023

Problem

The confidential transfer with fee part of the token-2022 is targeting 1.18.

Summary of Changes

Add feature gate for processing zk token proof instructions related to transfer with fee.

Fixes #

@samkim-crypto samkim-crypto added the work in progress This isn't quite right yet label Nov 16, 2023
Copy link

codecov bot commented Nov 16, 2023

Codecov Report

Merging #34103 (18a929c) into master (32993b2) will increase coverage by 0.0%.
Report is 1358 commits behind head on master.
The diff coverage is 90.9%.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #34103      +/-   ##
==========================================
  Coverage    81.8%    81.9%              
==========================================
  Files         766      818      +52     
  Lines      209077   219940   +10863     
==========================================
+ Hits       171130   180224    +9094     
- Misses      37947    39716    +1769     

@samkim-crypto samkim-crypto added v1.17 PRs that should be backported to v1.17 and removed work in progress This isn't quite right yet labels Nov 16, 2023
joncinque
joncinque previously approved these changes Nov 16, 2023
Copy link
Contributor

@joncinque joncinque left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good! Just to check, you'll also use a new feature gate for the zk proof program, right?

@samkim-crypto
Copy link
Contributor Author

Looks good! Just to check, you'll also use a new feature gate for the zk proof program, right?

Yep, I will put in a new feature gate for the zk proof program.

@samkim-crypto samkim-crypto merged commit a8863bd into solana-labs:master Nov 17, 2023
42 checks passed
mergify bot pushed a commit that referenced this pull request Nov 17, 2023
feature gate zk-token-proof transfer with fee

(cherry picked from commit a8863bd)

# Conflicts:
#	sdk/src/feature_set.rs
samkim-crypto added a commit that referenced this pull request Nov 17, 2023
… (backport of #34103) (#34129)

* [zk-token-proof] Feature gate transfer with fee related proofs (#34103)

feature gate zk-token-proof transfer with fee

(cherry picked from commit a8863bd)

# Conflicts:
#	sdk/src/feature_set.rs

* resolve conflict

---------

Co-authored-by: samkim-crypto <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
v1.17 PRs that should be backported to v1.17
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants