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

Catching up with upstream post NU6 updates #69

Merged
merged 32 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
4d2ad7e
Adjust Makefile so that we never generate `nu6.pdf`.
daira Aug 28, 2024
b56c7aa
ZIP 1015: correct the key word boilerplate.
daira Sep 5, 2024
957b810
ZIP 227 is not proposed to activate with NU6.
daira Sep 5, 2024
4c7c618
ZIP 236 will definitely be deployed with NU6.
daira Sep 3, 2024
4b69b99
ZIP 236: add reference implementation links for zcashd and zebrad.
daira Sep 3, 2024
918e4f6
ZIP 207: typos, cosmetics, and minor wording changes.
daira Sep 5, 2024
d1bcb1a
Add missing references, and update references to the protocol spec fr…
daira Aug 28, 2024
b625ca3
ZIP 2001: improve the wording of the funding stream consensus change.
daira Sep 3, 2024
f9bbf31
Clarify that ZIP 207 changes apply from NU6.
daira Sep 3, 2024
be8cddc
ZIP 2001: correct the key word boilerplate.
daira Sep 23, 2024
caa0541
ZIP 2001: cosmetics.
daira Sep 24, 2024
597eb45
ZIP 214: add the Mainnet address for ``FS_FPF_ZCG``.
daira Sep 25, 2024
91900f5
Protocol spec: cosmetics and indexing.
daira Sep 5, 2024
c3a3de1
Protocol spec: rename ``FS_ZIP214_ECC`` to ``FS_ZIP214_BP``, consistent
daira Sep 24, 2024
6c793a8
Protocol spec: refactor the descriptions of Chain Value Pool Balances…
daira Sep 24, 2024
cfba30f
Apply changes from ZIP 2001 to ZIP 207 and the protocol spec.
daira Sep 24, 2024
b3876ed
Apply changes from ZIP 236 to the protocol spec.
daira Sep 5, 2024
8a15a16
Protocol spec: clarify the section on sighash algorithms, and which ZIPs
daira Sep 24, 2024
ce33046
Cosmetics, and renaming $\mathsf{PoolValue}_Deferred$ to
daira Sep 26, 2024
d034d3d
Protocol spec: definition of total issued supply.
daira Sep 26, 2024
8e04f13
Protocol spec: update acknowledgements.
daira Sep 26, 2024
d4f1e73
Set NU6 Mainnet activation height.
daira Sep 3, 2024
dd4629d
Protocol spec and ZIPs 214 and 1015: swap the order of ``FS_DEFERRED`…
daira Sep 25, 2024
e4e29d7
Protocol spec: refactor section 4.10 (SIGHASH).
daira Sep 26, 2024
3ba2c74
Protocol spec: say explicitly that there are no changes to the block …
daira Sep 26, 2024
cdd996e
ZIP 207: minor fixes.
daira Sep 26, 2024
334bca3
ZIP 2001: minor fixes.
daira Sep 26, 2024
9d99f95
Regenerate HTML.
daira Sep 26, 2024
a671083
Set Change History date for v2024.5.1.
daira Sep 26, 2024
c8d3553
Regenerate PDFs.
daira Sep 26, 2024
9d9a1eb
Merge pull request #904 from daira/nu6-updates
daira Sep 26, 2024
0da1b34
commenting out CI token lines to allow CI to build
vivek-arte Sep 25, 2024
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
Prev Previous commit
Next Next commit
Regenerate PDFs.
  • Loading branch information
daira committed Sep 26, 2024
commit c8d3553d3200f262efd859164fe942a2a34ad437
Binary file modified rendered/protocol/blossom.pdf
Binary file not shown.
Binary file modified rendered/protocol/canopy.pdf
Binary file not shown.
Binary file modified rendered/protocol/heartwood.pdf
Binary file not shown.
Binary file modified rendered/protocol/nu5.pdf
Binary file not shown.
Binary file modified rendered/protocol/protocol.pdf
Binary file not shown.
Binary file modified rendered/protocol/sapling.pdf
Binary file not shown.