Merge a prefix of #960#974
Merged
Merged
Conversation
This merges in the changes from upstream post the merging of our PR#854 to upstream.
This makes a few changes to the usage of terminology such as the use of the capital MUST terms in the specification.
This removes the tables with the encoding of the issuance action description and issuance bundle from ZIP 227. This same material has been included in ZIP 230 as part of the V6 transaction format, and thus it is simpler to have it defined in a single place. ZIP 227 has been updated with references to the relevant sections of ZIP 230 where necessary.
This changes the encoding of the transaction format to add Action Groups to TxV6. The motivation is to avoid the need of a further transaction format upgrade while introducing Asset Swaps for ZSAs in a subsequent upgrade. It also makes some consistency improvements to the ZIPs, and updates outdated references.
This PR adds an explicit upper bound of $$2^{64} - 1$$ to the total
supply of issued assets in the specification of ZIP 227.
It also does a major rewrite of the consensus rule changes, bringing
them more in line with the protocol specification, and using MUST
terminology where necessary.
Furthermore, these changes make explicit the order of processing fields
within a transaction, and the order of updates to the issuance state.
This PR moves the description of the fees required for OrchardZSA issuance and transfer to ZIP 227. This is a more contextual place to have the material, compared to ZIP 230, which specifies the V6 transaction format.
This updates the `zsa1` branch with the changes from upstream, and resolves conflicts.
This adds the explicit specification (with types) for the Issue Note.
This defines a new function and uses it to derive the value of the $\rho$ field in Issue Notes. It also updates the consensus rules accordingly and makes some typographical improvements.
This simplifies the encoding of the $\mathsf{nf}$ argument in the
computation of $\rho$, so that it avoids the double use of
$\mathsf{LEBS2OSP(I2LEOSP(...))}$.
This adjusts the type and specification of the notes to mirror the implementation, specifically that the Asset Base occurs in the middle of the tuple, and not at the end.
This adds the specification of reference notes, which are to be created at the time of first issuance of a Custom Asset. Alongside, we also update the issuance state and consensus rules to account for these changes.
This makes various changes based on the comments on #960 made during ZIP Editor syncs.
This was referenced Nov 5, 2025
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.