Set NU5 testnet reactivation height.
This commit is contained in:
parent
c07a4ab08c
commit
40487c079d
|
@ -6,7 +6,7 @@ replace-with = "vendored-sources"
|
||||||
|
|
||||||
[source."https://github.com/zcash/librustzcash.git"]
|
[source."https://github.com/zcash/librustzcash.git"]
|
||||||
git = "https://github.com/zcash/librustzcash.git"
|
git = "https://github.com/zcash/librustzcash.git"
|
||||||
rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5"
|
rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd"
|
||||||
replace-with = "vendored-sources"
|
replace-with = "vendored-sources"
|
||||||
|
|
||||||
[source."https://github.com/nuttycom/hdwallet.git"]
|
[source."https://github.com/nuttycom/hdwallet.git"]
|
||||||
|
|
|
@ -562,7 +562,7 @@ checksum = "c34f04666d835ff5d62e058c3995147c06f42fe86ff053337632bca83e42702d"
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "equihash"
|
name = "equihash"
|
||||||
version = "0.1.0"
|
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 = [
|
dependencies = [
|
||||||
"blake2b_simd",
|
"blake2b_simd",
|
||||||
"byteorder",
|
"byteorder",
|
||||||
|
@ -571,7 +571,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "f4jumble"
|
name = "f4jumble"
|
||||||
version = "0.0.0"
|
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 = [
|
dependencies = [
|
||||||
"blake2b_simd",
|
"blake2b_simd",
|
||||||
]
|
]
|
||||||
|
@ -2201,7 +2201,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_address"
|
name = "zcash_address"
|
||||||
version = "0.0.0"
|
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 = [
|
dependencies = [
|
||||||
"bech32",
|
"bech32",
|
||||||
"bs58",
|
"bs58",
|
||||||
|
@ -2212,7 +2212,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_encoding"
|
name = "zcash_encoding"
|
||||||
version = "0.0.0"
|
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 = [
|
dependencies = [
|
||||||
"byteorder",
|
"byteorder",
|
||||||
"nonempty",
|
"nonempty",
|
||||||
|
@ -2221,7 +2221,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_history"
|
name = "zcash_history"
|
||||||
version = "0.2.0"
|
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 = [
|
dependencies = [
|
||||||
"bigint",
|
"bigint",
|
||||||
"blake2b_simd",
|
"blake2b_simd",
|
||||||
|
@ -2231,7 +2231,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_note_encryption"
|
name = "zcash_note_encryption"
|
||||||
version = "0.1.0"
|
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 = [
|
dependencies = [
|
||||||
"chacha20",
|
"chacha20",
|
||||||
"chacha20poly1305",
|
"chacha20poly1305",
|
||||||
|
@ -2242,7 +2242,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_primitives"
|
name = "zcash_primitives"
|
||||||
version = "0.5.0"
|
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 = [
|
dependencies = [
|
||||||
"aes",
|
"aes",
|
||||||
"bip0039",
|
"bip0039",
|
||||||
|
@ -2278,7 +2278,7 @@ dependencies = [
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zcash_proofs"
|
name = "zcash_proofs"
|
||||||
version = "0.5.0"
|
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 = [
|
dependencies = [
|
||||||
"bellman",
|
"bellman",
|
||||||
"blake2b_simd",
|
"blake2b_simd",
|
||||||
|
|
12
Cargo.toml
12
Cargo.toml
|
@ -85,9 +85,9 @@ codegen-units = 1
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "9b4c1bdbe0517e3a7a8f285d6048a37d472ba3bc" }
|
hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "9b4c1bdbe0517e3a7a8f285d6048a37d472ba3bc" }
|
||||||
zcash_address = { 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 = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
|
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
|
||||||
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
|
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
|
||||||
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
|
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
|
||||||
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
|
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
|
||||||
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "d5c5f048947d211c2fbef23ce986b329b91d1aa5" }
|
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "50bae5ed76737ae8db6b84a940dd1d2c08daeefd" }
|
||||||
|
|
|
@ -418,8 +418,7 @@ public:
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock =
|
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock =
|
||||||
uint256S("01a4d7c6aada30c87762c1bf33fff5df7266b1fd7616bfdb5227fa59bd79e7a2");
|
uint256S("01a4d7c6aada30c87762c1bf33fff5df7266b1fd7616bfdb5227fa59bd79e7a2");
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170050;
|
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170050;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
|
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = 1840000;
|
||||||
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
|
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
|
||||||
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nActivationHeight =
|
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nActivationHeight =
|
||||||
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
|
||||||
|
|
Loading…
Reference in New Issue