zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Set NU5 testnet reactivation height.

This commit is contained in:
Kris Nuttycombe 2022-04-12 16:05:01 -06:00
parent c07a4ab08c
commit 40487c079d
4 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cargo/config.offline
View File

@ -6,7 +6,7 @@ replace-with = "vendored-sources"
[source."https://github.com/zcash/librustzcash.git"]
git = "https://github.com/zcash/librustzcash.git"
rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5"
rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
replace-with = "vendored-sources"
[source."https://github.com/nuttycom/hdwallet.git"]

16
Cargo.lock generated
View File

@ -562,7 +562,7 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
[[package]]
name = "equihash"
version = "0.1.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=d5c5f048947d211c2fbef23ce986b329b91d1aa5#d5c5f048947d211c2fbef23ce986b329b91d1aa5"
source = "git+https://github.com/zcash/librustzcash.git?rev=50bae5ed76737ae8db6b84a940dd1d2c08daeefd#50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
dependencies = [
"blake2b_simd",
"byteorder",
@ -571,7 +571,7 @@ dependencies = [
[[package]]
name = "f4jumble"
version = "0.0.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=d5c5f048947d211c2fbef23ce986b329b91d1aa5#d5c5f048947d211c2fbef23ce986b329b91d1aa5"
source = "git+https://github.com/zcash/librustzcash.git?rev=50bae5ed76737ae8db6b84a940dd1d2c08daeefd#50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
dependencies = [
"blake2b_simd",
]
@ -2201,7 +2201,7 @@ dependencies = [
[[package]]
name = "zcash_address"
version = "0.0.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=d5c5f048947d211c2fbef23ce986b329b91d1aa5#d5c5f048947d211c2fbef23ce986b329b91d1aa5"
source = "git+https://github.com/zcash/librustzcash.git?rev=50bae5ed76737ae8db6b84a940dd1d2c08daeefd#50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
dependencies = [
"bech32",
"bs58",
@ -2212,7 +2212,7 @@ dependencies = [
[[package]]
name = "zcash_encoding"
version = "0.0.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=d5c5f048947d211c2fbef23ce986b329b91d1aa5#d5c5f048947d211c2fbef23ce986b329b91d1aa5"
source = "git+https://github.com/zcash/librustzcash.git?rev=50bae5ed76737ae8db6b84a940dd1d2c08daeefd#50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
dependencies = [
"byteorder",
"nonempty",
@ -2221,7 +2221,7 @@ dependencies = [
[[package]]
name = "zcash_history"
version = "0.2.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=d5c5f048947d211c2fbef23ce986b329b91d1aa5#d5c5f048947d211c2fbef23ce986b329b91d1aa5"
source = "git+https://github.com/zcash/librustzcash.git?rev=50bae5ed76737ae8db6b84a940dd1d2c08daeefd#50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
dependencies = [
"bigint",
"blake2b_simd",
@ -2231,7 +2231,7 @@ dependencies = [
[[package]]
name = "zcash_note_encryption"
version = "0.1.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=d5c5f048947d211c2fbef23ce986b329b91d1aa5#d5c5f048947d211c2fbef23ce986b329b91d1aa5"
source = "git+https://github.com/zcash/librustzcash.git?rev=50bae5ed76737ae8db6b84a940dd1d2c08daeefd#50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
dependencies = [
"chacha20",
"chacha20poly1305",
@ -2242,7 +2242,7 @@ dependencies = [
[[package]]
name = "zcash_primitives"
version = "0.5.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=d5c5f048947d211c2fbef23ce986b329b91d1aa5#d5c5f048947d211c2fbef23ce986b329b91d1aa5"
source = "git+https://github.com/zcash/librustzcash.git?rev=50bae5ed76737ae8db6b84a940dd1d2c08daeefd#50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
dependencies = [
"aes",
"bip0039",
@ -2278,7 +2278,7 @@ dependencies = [
[[package]]
name = "zcash_proofs"
version = "0.5.0"
source = "git+https://github.com/zcash/librustzcash.git?rev=d5c5f048947d211c2fbef23ce986b329b91d1aa5#d5c5f048947d211c2fbef23ce986b329b91d1aa5"
source = "git+https://github.com/zcash/librustzcash.git?rev=50bae5ed76737ae8db6b84a940dd1d2c08daeefd#50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
dependencies = [
"bellman",
"blake2b_simd",

12
Cargo.toml
View File

@ -85,9 +85,9 @@ codegen-units = 1
[patch.crates-io]
hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "9b4c1bdbe0517e3a7a8f285d6048a37d472ba3bc" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }

3
src/chainparams.cpp
View File

@ -418,8 +418,7 @@ public:
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock =
uint256S("01a4d7c6aada30c87762c1bf33fff5df7266b1fd7616bfdb5227fa59bd79e7a2");
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170050;
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = 1840000;
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;