Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 14 additions & 14 deletions packages/wasm-utxo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/wasm-utxo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ rstest = "0.26.1"
pastey = "0.1"

[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
zebra-chain = { version = "10.0", default-features = false }
zebra-chain = { version = "11", default-features = false }

[build-dependencies]
serde_json = "1.0"
Expand Down
10 changes: 10 additions & 0 deletions packages/wasm-utxo/src/zcash/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ pub enum NetworkUpgrade {
Nu6,
Nu6_1,
Nu6_2,
Nu6_3,
}

/// Parameters for a single network upgrade
Expand All @@ -45,6 +46,7 @@ impl NetworkUpgrade {
NetworkUpgrade::Nu6,
NetworkUpgrade::Nu6_1,
NetworkUpgrade::Nu6_2,
NetworkUpgrade::Nu6_3,
];

/// Get the parameters for this network upgrade
Expand Down Expand Up @@ -99,6 +101,12 @@ impl NetworkUpgrade {
mainnet_activation_height: 3364600,
testnet_activation_height: 4052000,
},
// https://zips.z.cash/zip-0255
NetworkUpgrade::Nu6_3 => UpgradeParams {
branch_id: 0x37a5165b,
mainnet_activation_height: 3428143,
testnet_activation_height: 4134000,
},
}
}

Expand Down Expand Up @@ -188,6 +196,7 @@ mod tests {
NetworkUpgrade::Nu6 => ZebraNetworkUpgrade::Nu6,
NetworkUpgrade::Nu6_1 => ZebraNetworkUpgrade::Nu6_1,
NetworkUpgrade::Nu6_2 => ZebraNetworkUpgrade::Nu6_2,
NetworkUpgrade::Nu6_3 => ZebraNetworkUpgrade::Nu6_3,
}
}

Expand All @@ -206,6 +215,7 @@ mod tests {
ZebraNetworkUpgrade::Nu6 => Some(NetworkUpgrade::Nu6),
ZebraNetworkUpgrade::Nu6_1 => Some(NetworkUpgrade::Nu6_1),
ZebraNetworkUpgrade::Nu6_2 => Some(NetworkUpgrade::Nu6_2),
ZebraNetworkUpgrade::Nu6_3 => Some(NetworkUpgrade::Nu6_3),
#[cfg(any(test, feature = "zebra-test"))]
ZebraNetworkUpgrade::Nu7 => None,
#[cfg(zcash_unstable = "zfuture")]
Expand Down
Loading