ZSA integration (step 2): Add Network Upgrade 7 (Nu7) support to Zebra #15

dmidem · 2024-10-17T08:00:52Z

This PR introduces support for Network Upgrade 7 (Nu7) in the Zebra codebase. This update is one of the steps towards enabling ZSA (Zcash Shielded Assets) support in Zebra.

Changes

Implemented Network Upgrade 7 (Nu7) support across the relevant crates.
Marked several areas with FIXME comments where further attention is needed, such as determining the proper activation height and other related details.

…main

arya2 · 2024-10-30T20:53:26Z

zebra-chain/src/parameters/network_upgrade.rs

@@ -126,6 +133,8 @@ pub(super) const TESTNET_ACTIVATION_HEIGHTS: &[(block::Height, NetworkUpgrade)]
    (block::Height(1_028_500), Canopy),
    (block::Height(1_842_420), Nu5),
    (block::Height(2_976_000), Nu6),
+    // FIXME: TODO: Set a correct value for NU7
+    (block::Height(2_942_001), Nu7),


It would be better to defer setting this at all until the release PR for a version that deploys NU7 on Testnet and to set this in the configuration until then.

NetworkUpgrade::current() will return NU6 as the current network upgrade if the activation height is higher than NU7, so this should be set above the NU6 activation height.

Suggested change

(block::Height(2_942_001), Nu7),

// (block::Height(2_976_001), Nu7),

or consider putting this under the nu7 flag :#[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]

Link to this comment copied to #37

arya2 · 2024-10-30T21:06:33Z

zebra-chain/src/parameters/network_upgrade.rs

@@ -216,6 +226,8 @@ pub(crate) const CONSENSUS_BRANCH_IDS: &[(NetworkUpgrade, ConsensusBranchId)] =
    (Canopy, ConsensusBranchId(0xe9ff75a6)),
    (Nu5, ConsensusBranchId(0xc2d6d0b4)),
    (Nu6, ConsensusBranchId(0xc8e71055)),
+    // FIXME: use a proper value below
+    (Nu7, ConsensusBranchId(0xc8e71056)),


Zebra will panic if this doesn't match the one in zcash_protocol, so it would be good to generate a random one now, get started on the NU7 deployment ZIP, and make the change there as well (behind the compilation cfg flag).

yes, let's add a random number and the flag

Opened a PR adding a draft NU7 deployment ZIP with 0x77190AD8 as the consensus branch id, it could still change, but we may as well use it here as it's much less likely to need an update later than a random number.

Link to this comment copied to #37

arya2 · 2024-10-30T21:15:11Z

zebra-network/src/protocol/external/types.rs

+            (Testnet(params), Nu7) if params.is_default_testnet() => 170_111,
+            (Mainnet, Nu7) => 170_121,


The only requirement here is that there should be some versions between the prior min specified protocol versions and new ones in case something goes wrong with the prior NU deployment.

This PR could also update the CURRENT_NETWORK_PROTOCOL_VERSION (and should if it includes an NU7 activation height on Testnet, though it would be better to remove the Testnet activation height).

Update: 170_130 & 170_140 are the currently the values prescribed in the draft ZIP for NU7 deployment, though they may still change before it's out of draft status.

Suggested change

(Testnet(params), Nu7) if params.is_default_testnet() => 170_111,

(Mainnet, Nu7) => 170_121,

(Testnet(params), Nu7) if params.is_default_testnet() => 170_130,

(Mainnet, Nu7) => 170_140,

Link to this comment copied to #37

arya2 · 2024-10-30T21:17:53Z

zebrad/tests/common/configs/v1.9.0.toml

@@ -73,6 +73,8 @@ Heartwood = 903_800
 Canopy = 1_028_500
 NU5 = 1_842_420
 NU6 = 2_000_000
+# FIXME: Use a proper value for NU7.


This value is already okay. These test configs are just meant to ensure that valid past configs can still be parsed whenever the config is changed and, secondarily, to provide examples.

Suggested change

# FIXME: Use a proper value for NU7.

Link to this comment copied to #37

PaulLaux

added few minor comments

PaulLaux · 2024-10-31T10:12:05Z

zebra-chain/src/parameters/network_upgrade.rs

@@ -90,6 +94,8 @@ pub(super) const MAINNET_ACTIVATION_HEIGHTS: &[(block::Height, NetworkUpgrade)]
    (block::Height(1_046_400), Canopy),
    (block::Height(1_687_104), Nu5),
    (block::Height(2_726_400), Nu6),
+    // FIXME: TODO: Add NU7 with a correct value
+    // (block::Height(2_726_401), Nu7),


Let's add an estimated value under the flag #[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]

Link to this comment copied to #37

PaulLaux · 2024-10-31T10:13:48Z

zebra-chain/src/parameters/network_upgrade.rs

@@ -126,6 +133,8 @@ pub(super) const TESTNET_ACTIVATION_HEIGHTS: &[(block::Height, NetworkUpgrade)]
    (block::Height(1_028_500), Canopy),
    (block::Height(1_842_420), Nu5),
    (block::Height(2_976_000), Nu6),
+    // FIXME: TODO: Set a correct value for NU7
+    (block::Height(2_942_001), Nu7),


or consider putting this under the nu7 flag :#[cfg(zcash_unstable = "nu6" /* TODO nu7 */ )]

PaulLaux · 2024-10-31T14:59:47Z

zebra-chain/src/parameters/network_upgrade.rs

@@ -216,6 +226,8 @@ pub(crate) const CONSENSUS_BRANCH_IDS: &[(NetworkUpgrade, ConsensusBranchId)] =
    (Canopy, ConsensusBranchId(0xe9ff75a6)),
    (Nu5, ConsensusBranchId(0xc2d6d0b4)),
    (Nu6, ConsensusBranchId(0xc8e71055)),
+    // FIXME: use a proper value below
+    (Nu7, ConsensusBranchId(0xc8e71056)),


yes, let's add a random number and the flag

PaulLaux · 2024-10-31T15:02:51Z

zebra-rpc/src/methods/tests/snapshots/get_blockchain_info@testnet_10.snap

@@ -69,6 +70,11 @@ expression: info
      "name": "NU6",
      "activationheight": 2976000,
      "status": "pending"
+    },
+    "c8e71056": {


same for a new random string

Link to this comment copied to #37

dmidem added 24 commits August 18, 2024 21:47

Merge remote-tracking branch 'origin/main' into switch-to-zsa-crates-…

054e655

…main

Introduce Nu7

50190a3

Introduce Nu7 fo other crates of Zebra

2d3845d

Merge branch 'zsa1' into switch-to-zsa-crates-nu6

2d23d6b

Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7

7d79143

Trigger CI

53c65b6

Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7

d659628

Add basic CI checks workflow

c238847

Fix ci-basic.yml

2c13ae9

Fix ci-basic.yml (2)

5a839c6

Add installing of build-essential to ci-basic.yml

367a14b

Try to use librocksdb-dev in ci-basic.yml

f425747

Run ci-basic.yml on ubuntu-24.04

831c847

Enable nu6 cfg flag in ci-basic.yml

ecaf98d

Adjust the code with librustzcash/zcash_protocol nu6 related changes

7d11159

Add RUSTDOCFLAGS to ci-basic.yml

6a0196e

Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7

faec84b

Merge remote-tracking branch 'origin/main' into switch-to-zsa-crates-nu6

1526276

Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7

509d525

Merge remote-tracking branch 'zcash/main' into switch-to-zsa-crates-nu6

9e94dc5

Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7

0bcf59a

Merge branch 'main' into switch-to-zsa-crates-nu6

12ade98

Merge branch 'main' into switch-to-zsa-crates-nu7

ab1838d

Merge branch 'switch-to-zsa-crates-nu6' into switch-to-zsa-crates-nu7

0a8cfe0

dmidem mentioned this pull request Oct 17, 2024

Step2: Add Network Upgrade 7 (Nu7) support to Zebra #8

Closed

dmidem changed the title ~~Step2: Add Network Upgrade 7 (Nu7) support to Zebra~~ Step 2: Add Network Upgrade 7 (Nu7) support to Zebra Oct 17, 2024

dmidem added 3 commits October 17, 2024 10:38

Merge branch 'main' into switch-to-zsa-crates-nu6

bb1395c

Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7

1b8e9e9

Fix of new_regtest call (as it additionally needs Nu7 arg now)

d8964e7

dmidem requested a review from PaulLaux October 17, 2024 09:10

dmidem added 4 commits October 17, 2024 13:15

Fix of new_regtest call (as it additionally needs Nu7 arg now) (2)

e8abddd

Set Nu7 as a network update for testnet in zebra-chain network tests

23d9e77

Fix serde names for NU7

e0adb4c

Update test snapshot in zebra-rpc to use NU7

0daf0ce

dmidem changed the title ~~Step 2: Add Network Upgrade 7 (Nu7) support to Zebra~~ ZSA integration, step 2: Add Network Upgrade 7 (Nu7) support to Zebra Oct 18, 2024

dmidem changed the title ~~ZSA integration, step 2: Add Network Upgrade 7 (Nu7) support to Zebra~~ ZSA integration (step 2): Add Network Upgrade 7 (Nu7) support to Zebra Oct 18, 2024

dmidem deleted the branch zsa-integration-zsadeps October 29, 2024 12:28

dmidem closed this Oct 29, 2024

dmidem reopened this Oct 29, 2024

dmidem added 2 commits October 29, 2024 15:18

Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7

24f5e85

Merge branch 'zsa-integration-zsadeps' into zsa-integration-nu7

d0ecf96

PaulLaux requested a review from arya2 October 30, 2024 13:42

arya2 reviewed Oct 30, 2024

View reviewed changes

PaulLaux reviewed Oct 31, 2024

View reviewed changes

dmidem mentioned this pull request Jan 11, 2025

ZSA integration (cumulative steps 1–7): up to Orchard ZSA consensus modifications #37

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ZSA integration (step 2): Add Network Upgrade 7 (Nu7) support to Zebra #15

ZSA integration (step 2): Add Network Upgrade 7 (Nu7) support to Zebra #15

dmidem commented Oct 17, 2024

arya2 Oct 30, 2024

PaulLaux Oct 31, 2024

dmidem Jan 11, 2025

arya2 Oct 30, 2024 •

edited

Loading

PaulLaux Oct 31, 2024

arya2 Nov 1, 2024

dmidem Jan 11, 2025

arya2 Oct 30, 2024 •

edited

Loading

dmidem Jan 11, 2025

arya2 Oct 30, 2024

dmidem Jan 11, 2025

PaulLaux left a comment

PaulLaux Oct 31, 2024

dmidem Jan 11, 2025

PaulLaux Oct 31, 2024

PaulLaux Oct 31, 2024

PaulLaux Oct 31, 2024

dmidem Jan 11, 2025

	(block::Height(2_942_001), Nu7),
	// (block::Height(2_976_001), Nu7),

		(Testnet(params), Nu7) if params.is_default_testnet() => 170_111,
		(Mainnet, Nu7) => 170_121,

ZSA integration (step 2): Add Network Upgrade 7 (Nu7) support to Zebra #15

Are you sure you want to change the base?

ZSA integration (step 2): Add Network Upgrade 7 (Nu7) support to Zebra #15

Conversation

dmidem commented Oct 17, 2024

Changes

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arya2 Oct 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arya2 Oct 30, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

PaulLaux left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

arya2 Oct 30, 2024 •

edited

Loading

arya2 Oct 30, 2024 •

edited

Loading