Skip to content

Merge a prefix of #960 #974

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.

Sign up for GitHub

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

Merged
str4d merged 15 commits into from
Feb 4, 2025
Merged

Merge a prefix of #960 #974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2e1c16b
Catching up with upstream (#77)
vivek-arte Nov 11, 2024
5416929
Some smaller updates (#79)
vivek-arte Nov 13, 2024
bb6b791
[ZSAs] Ensuring Finalization occurs immediately rather than at the bl…
vivek-arte Nov 13, 2024
ddd1d9c
Removal of redundant encoding definitions in ZIP 227 (#82)
vivek-arte Nov 14, 2024
9322489
[ZSAs] Updates to include Action Groups in TxV6 (#78)
vivek-arte Nov 28, 2024
b59af87
[ZSAs] Rewriting the consensus rules (#83)
vivek-arte Dec 17, 2024
e4f279f
Shifting the OrchardZSA fee specification from ZIP 230 to ZIP 227 (#86)
vivek-arte Dec 17, 2024
47ab5b8
Merge branch 'main' into upstream_update_20241217
vivek-arte Dec 17, 2024
dcf7489
Upstream update (#87)
vivek-arte Dec 18, 2024
e8f628a
Adding the specification of the Issue Note to ZIP 227 (#89)
vivek-arte Dec 26, 2024
06f63ca
Adding specification of derivation of the rho value in Issue Notes (#90)
vivek-arte Dec 31, 2024
6298f90
Simplification of encoding in the computation of rho (#92)
vivek-arte Jan 2, 2025
3a180e2
Improving the typing and consistency of OrchardZSA and Issue Notes (#93)
vivek-arte Jan 8, 2025
2ef0f1a
Adding reference notes (#94)
vivek-arte Jan 8, 2025
b5b434c
Resolving comments from ZIP Editors (#96)
vivek-arte Feb 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
362 changes: 213 additions & 149 deletions rendered/zip-0226.html
View file
Open in desktop

Large diffs are not rendered by default.

808 changes: 509 additions & 299 deletions rendered/zip-0227.html
View file
Open in desktop

Large diffs are not rendered by default.

300 changes: 128 additions & 172 deletions rendered/zip-0230.html
View file
Open in desktop

Large diffs are not rendered by default.

268 changes: 182 additions & 86 deletions zips/zip-0226.rst
View file
Open in desktop

Large diffs are not rendered by default.

389 changes: 261 additions & 128 deletions zips/zip-0227.rst
View file
Open in desktop

Large diffs are not rendered by default.

344 changes: 153 additions & 191 deletions zips/zip-0230.rst
View file
Open in desktop

Large diffs are not rendered by default.