Keyset ID V2 Implementation (NUT-02) #1505
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
a1denvalu3
reviewed
Jan 8, 2026
Collaborator
|
I rebased and fixed the test in my branch https://github.com/thesimplekid/cdk/tree/keyset-v2-derivation if youre alright with me force pushing here. |
Resolved merge conflicts in: - crates/cashu/src/nuts/nut02.rs - crates/cdk-sql-common/src/wallet/mod.rs Updated input_fee_ppk from Option<u64> to u64 in: - cashu: KeySet, KeySetInfo, MintKeySet - cdk-common: MintKeySetInfo - cdk-signatory: SignatoryKeySet, RotateKeyArguments, and conversions - cdk-sql-common: database schema and queries - cdk-ffi: KeySet and conversions - cdk: wallet fee calculation and metadata cache
- Re-added deserialize_input_fee_ppk and default_input_fee_ppk in cashu nut02 - Re-added default_fee in cdk-common mint - Fixed missing input_fee_ppk in cdk-ffi keys
thesimplekid
force-pushed
the
keyset-v2-derivation
branch
from
5d7a480 to
45741a9
Compare
thesimplekid
approved these changes
Jan 15, 2026
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
This PR implements Keyset ID V2 generation and validation as specified in cashubtc/nuts#182. It updates the keyset ID derivation logic to include fees and expiration in the preimage, and ensures consistent handling of optional fields across the codebase.
Changes
NUT-02 Keyset ID V2
v2_from_dataincrates/cashu/src/nuts/nut02.rsto derive V2 IDs.keys:{amount}:{pubkey},...|unit:{unit}|input_fee_ppk:{fee}|final_expiry:{expiry}.input_fee_ppkandfinal_expiryare only included in the preimage if they are present (Some) and non-zero.Consistency Improvements
KeySetInfoandMintKeySetInfoto useOption<u64>forinput_fee_ppk, aligning it withfinal_expiry.input_fee_ppkin favor of standardOptionhandling.input_fee_ppk(defaulting to 0 where necessary).Affected Crates
cashu: Core ID generation logic.cdk-common: Struct updates forMintKeySetInfo.cdk-signatory: Updated keyset generation and storage to support optional fees.cdk-sql-common: DB schema handling for nullable fee columns.cdk: Wallet fee calculation updates.References