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

Migrate to latest `zcash/librustzcash` revision 

This includes:
- `orchard =0.1.0-beta.3` which includes the final circuit changes.
- The new NU5 consensus branch ID.
- Updated ZIP 244 test vectors (which use the NU5 consensus branch ID).
This commit is contained in:
Jack Grigg 2022-03-23 01:14:57 +00:00
parent 2e77745c4e
commit 77a971fbc1
8 changed files with 45 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.cargo/config.offline
View File

@ -1,19 +1,9 @@
[source.crates-io] [source.crates-io]
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source."https://github.com/zcash/incrementalmerkletree.git"]
git = "https://github.com/zcash/incrementalmerkletree.git"
rev = "dd57b430dee7c0b163f4035fef2280cd1935036c"
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 = "c423167b30f7b7afeeabe09ae5abceb49ce7d06e" rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
replace-with = "vendored-sources"
[source."https://github.com/zcash/orchard.git"]
git = "https://github.com/zcash/orchard.git"
rev = "3ddf6c49f7484ed1295bd5351317bbfe49e14472"
replace-with = "vendored-sources" replace-with = "vendored-sources"
[source."https://github.com/nuttycom/hdwallet.git"] [source."https://github.com/nuttycom/hdwallet.git"]

34
Cargo.lock generated
View File

@ -496,7 +496,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=c423167b30f7b7afeeabe09ae5abceb49ce7d06e#c423167b30f7b7afeeabe09ae5abceb49ce7d06e" source = "git+https://github.com/zcash/librustzcash.git?rev=9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f#9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
"byteorder", "byteorder",
@ -505,7 +505,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=c423167b30f7b7afeeabe09ae5abceb49ce7d06e#c423167b30f7b7afeeabe09ae5abceb49ce7d06e" source = "git+https://github.com/zcash/librustzcash.git?rev=9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f#9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
] ]
@ -627,9 +627,9 @@ dependencies = [
[[package]] [[package]]
name = "halo2_gadgets" name = "halo2_gadgets"
version = "0.1.0-beta.1" version = "0.1.0-beta.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0d39595ebaac0277753f19d8bf7564d5ecdf5998c6df1d80ece727f93b50efaf" checksum = "2701ed8eaf3cd69b720ae78f936a510d9823470e760657b054c0fcddcb07aeed"
dependencies = [ dependencies = [
"arrayvec 0.7.2", "arrayvec 0.7.2",
"bitvec", "bitvec",
@ -645,9 +645,9 @@ dependencies = [
[[package]] [[package]]
name = "halo2_proofs" name = "halo2_proofs"
version = "0.1.0-beta.2" version = "0.1.0-beta.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "645848f357d874ace39f3524b6c238668b147245cd998a16e87d6977cd2fc502" checksum = "345005a47afdb143934b86993b6439b2efc22882622eb33ac04dfb35feb51ce3"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
"bumpalo", "bumpalo",
@ -762,8 +762,9 @@ dependencies = [
[[package]] [[package]]
name = "incrementalmerkletree" name = "incrementalmerkletree"
version = "0.2.0" version = "0.3.0-beta.1"
source = "git+https://github.com/zcash/incrementalmerkletree.git?rev=dd57b430dee7c0b163f4035fef2280cd1935036c#dd57b430dee7c0b163f4035fef2280cd1935036c" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cad6be282c89afc05aebe4801b0d5f9d6b7c556a8f398e447f4b26ea56a6b45e"
dependencies = [ dependencies = [
"serde", "serde",
] ]
@ -1103,8 +1104,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]] [[package]]
name = "orchard" name = "orchard"
version = "0.1.0-beta.1" version = "0.1.0-beta.2"
source = "git+https://github.com/zcash/orchard.git?rev=3ddf6c49f7484ed1295bd5351317bbfe49e14472#3ddf6c49f7484ed1295bd5351317bbfe49e14472" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b48e6e124c3f7e9ed7f48b29f66069288235cecd16aa6053e98f8aff16efe827"
dependencies = [ dependencies = [
"aes", "aes",
"arrayvec 0.7.2", "arrayvec 0.7.2",
@ -1942,7 +1944,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=c423167b30f7b7afeeabe09ae5abceb49ce7d06e#c423167b30f7b7afeeabe09ae5abceb49ce7d06e" source = "git+https://github.com/zcash/librustzcash.git?rev=9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f#9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
dependencies = [ dependencies = [
"bech32", "bech32",
"bs58", "bs58",
@ -1953,7 +1955,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=c423167b30f7b7afeeabe09ae5abceb49ce7d06e#c423167b30f7b7afeeabe09ae5abceb49ce7d06e" source = "git+https://github.com/zcash/librustzcash.git?rev=9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f#9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"nonempty", "nonempty",
@ -1962,7 +1964,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=c423167b30f7b7afeeabe09ae5abceb49ce7d06e#c423167b30f7b7afeeabe09ae5abceb49ce7d06e" source = "git+https://github.com/zcash/librustzcash.git?rev=9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f#9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
dependencies = [ dependencies = [
"bigint", "bigint",
"blake2b_simd", "blake2b_simd",
@ -1972,7 +1974,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=c423167b30f7b7afeeabe09ae5abceb49ce7d06e#c423167b30f7b7afeeabe09ae5abceb49ce7d06e" source = "git+https://github.com/zcash/librustzcash.git?rev=9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f#9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
dependencies = [ dependencies = [
"chacha20", "chacha20",
"chacha20poly1305", "chacha20poly1305",
@ -1983,7 +1985,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=c423167b30f7b7afeeabe09ae5abceb49ce7d06e#c423167b30f7b7afeeabe09ae5abceb49ce7d06e" source = "git+https://github.com/zcash/librustzcash.git?rev=9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f#9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
dependencies = [ dependencies = [
"aes", "aes",
"bip0039", "bip0039",
@ -2019,7 +2021,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=c423167b30f7b7afeeabe09ae5abceb49ce7d06e#c423167b30f7b7afeeabe09ae5abceb49ce7d06e" source = "git+https://github.com/zcash/librustzcash.git?rev=9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f#9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f"
dependencies = [ dependencies = [
"bellman", "bellman",
"blake2b_simd", "blake2b_simd",

18
Cargo.toml
View File

@ -32,12 +32,12 @@ blake2s_simd = "1"
bls12_381 = "0.6" bls12_381 = "0.6"
byteorder = "1" byteorder = "1"
group = "0.11" group = "0.11"
incrementalmerkletree = "0.2" incrementalmerkletree = "=0.3.0-beta.1"
libc = "0.2" libc = "0.2"
jubjub = "0.8" jubjub = "0.8"
memuse = "0.2" memuse = "0.2"
nonempty = "0.7" nonempty = "0.7"
orchard = "=0.1.0-beta.1" orchard = "=0.1.0-beta.2"
secp256k1 = "0.20" secp256k1 = "0.20"
subtle = "2.2" subtle = "2.2"
rand_core = "0.6" rand_core = "0.6"
@ -73,11 +73,9 @@ codegen-units = 1
[patch.crates-io] [patch.crates-io]
hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "576683b9f2865f1118c309017ff36e01f84420c9" } hdwallet = { git = "https://github.com/nuttycom/hdwallet", rev = "576683b9f2865f1118c309017ff36e01f84420c9" }
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree.git", rev = "dd57b430dee7c0b163f4035fef2280cd1935036c" } zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
orchard = { git = "https://github.com/zcash/orchard.git", rev = "3ddf6c49f7484ed1295bd5351317bbfe49e14472" } zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
zcash_address = { git = "https://github.com/zcash/librustzcash.git", rev = "c423167b30f7b7afeeabe09ae5abceb49ce7d06e" } zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
zcash_encoding = { git = "https://github.com/zcash/librustzcash.git", rev = "c423167b30f7b7afeeabe09ae5abceb49ce7d06e" } zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
zcash_history = { git = "https://github.com/zcash/librustzcash.git", rev = "c423167b30f7b7afeeabe09ae5abceb49ce7d06e" } zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "c423167b30f7b7afeeabe09ae5abceb49ce7d06e" } zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "9c1ed86c5aa8ae3b6d6dcc1478f2d6ba1264488f" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "c423167b30f7b7afeeabe09ae5abceb49ce7d06e" }
zcash_proofs = { git = "https://github.com/zcash/librustzcash.git", rev = "c423167b30f7b7afeeabe09ae5abceb49ce7d06e" }

2
qa/rpc-tests/test_framework/mininode.py
View File

@ -52,7 +52,7 @@ SPROUT_PROTO_VERSION = 170002 # past bip-31 for ping/pong
OVERWINTER_PROTO_VERSION = 170003 OVERWINTER_PROTO_VERSION = 170003
SAPLING_PROTO_VERSION = 170006 SAPLING_PROTO_VERSION = 170006
BLOSSOM_PROTO_VERSION = 170008 BLOSSOM_PROTO_VERSION = 170008
NU5_PROTO_VERSION = 170015 NU5_PROTO_VERSION = 170050
MY_SUBVERSION = b"/python-mininode-tester:0.0.3/" MY_SUBVERSION = b"/python-mininode-tester:0.0.3/"

2
qa/rpc-tests/test_framework/util.py
View File

@ -40,7 +40,7 @@ SAPLING_BRANCH_ID = 0x76B809BB
BLOSSOM_BRANCH_ID = 0x2BB40E60 BLOSSOM_BRANCH_ID = 0x2BB40E60
HEARTWOOD_BRANCH_ID = 0xF5B9230B HEARTWOOD_BRANCH_ID = 0xF5B9230B
CANOPY_BRANCH_ID = 0xE9FF75A6 CANOPY_BRANCH_ID = 0xE9FF75A6
NU5_BRANCH_ID = 0x37519621 NU5_BRANCH_ID = 0xC2D6D0B4
# The maximum number of nodes a single test can spawn # The maximum number of nodes a single test can spawn
MAX_NODES = 8 MAX_NODES = 8

9
src/chainparams.cpp
View File

@ -133,7 +133,7 @@ public:
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = 1046400; consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = 1046400;
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock = consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock =
uint256S("00000000002038016f976744c369dce7419fca30e7171dfac703af5e5f7ad1d4"); uint256S("00000000002038016f976744c369dce7419fca30e7171dfac703af5e5f7ad1d4");
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170017; consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170100;
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF; consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;
@ -417,8 +417,9 @@ public:
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = 1028500; consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = 1028500;
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock = consensus.vUpgrades[Consensus::UPGRADE_CANOPY].hashActivationBlock =
uint256S("01a4d7c6aada30c87762c1bf33fff5df7266b1fd7616bfdb5227fa59bd79e7a2"); uint256S("01a4d7c6aada30c87762c1bf33fff5df7266b1fd7616bfdb5227fa59bd79e7a2");
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170015; consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170050;
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = 1599200; consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
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;
@ -663,7 +664,7 @@ public:
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nProtocolVersion = 170012; consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nProtocolVersion = 170012;
consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight = consensus.vUpgrades[Consensus::UPGRADE_CANOPY].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170015; consensus.vUpgrades[Consensus::UPGRADE_NU5].nProtocolVersion = 170050;
consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight = consensus.vUpgrades[Consensus::UPGRADE_NU5].nActivationHeight =
Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT; Consensus::NetworkUpgrade::NO_ACTIVATION_HEIGHT;
consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF; consensus.vUpgrades[Consensus::UPGRADE_ZFUTURE].nProtocolVersion = 0x7FFFFFFF;

2
src/consensus/upgrades.cpp
View File

@ -45,7 +45,7 @@ const struct NUInfo NetworkUpgradeInfo[Consensus::MAX_NETWORK_UPGRADES] = {
.strInfo = "See https://z.cash/upgrade/canopy/ for details.", .strInfo = "See https://z.cash/upgrade/canopy/ for details.",
}, },
{ {
.nBranchId = 0x37519621, .nBranchId = 0xc2d6d0b4,
.strName = "NU5", .strName = "NU5",
.strInfo = "See https://z.cash/upgrade/nu5/ for details.", .strInfo = "See https://z.cash/upgrade/nu5/ for details.",
}, },

20
src/test/data/zip0244.json
View File

File diff suppressed because one or more lines are too long