Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libzcash_script to include support for V5 transactions #22

Merged
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "depend/zcash"]
path = depend/zcash
url = https://github.com/ZcashFoundation/zcashd.git
18 changes: 17 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ include = [
"/depend/zcash/src/rust/include/",
"/depend/zcash/src/secp256k1/include",
"/depend/zcash/src/secp256k1",
"/depend/zcash/src/support/cleanse.cpp",
"/depend/zcash/src/support/cleanse.h",
]

[lib]
Expand All @@ -50,8 +52,16 @@ path = "src/lib.rs"
external-secp = []

[dependencies]
libc="0.2"
blake2b_simd = "0.5.10"
halo2 = "0.1.0-beta.1"
incrementalmerkletree = "0.1"
libc = "0.2"
memuse = "0.2"
orchard = "0.0"
rand_core = "0.6"
tracing = "0.1"
zcash_note_encryption = "0.0"
zcash_primitives = "0.5"

[build-dependencies]
cc = { version = ">= 1.0.36", features = ["parallel"] }
Expand Down Expand Up @@ -96,3 +106,9 @@ file="CHANGELOG.md"
search="<!-- next-url -->"
replace="<!-- next-url -->\n[Unreleased]: https://github.com/ZcashFoundation/{{crate_name}}/compare/{{tag_name}}...HEAD"
exactly=1

[patch.crates-io]
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "b7bd6246122a6e9ace8edb51553fbf5228906cbb" }
orchard = { git = "https://github.com/zcash/orchard.git", rev = "2c8241f25b943aa05203eacf9905db117c69bd29" }
zcash_note_encryption = { git = "https://github.com/zcash/librustzcash.git", rev = "53d0a51d33a421cb76d3e3124d1e4c1c9036068e" }
zcash_primitives = { git = "https://github.com/zcash/librustzcash.git", rev = "53d0a51d33a421cb76d3e3124d1e4c1c9036068e" }
4 changes: 4 additions & 0 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ fn main() -> Result<()> {
.flag_if_supported("-Wno-reorder")
.flag_if_supported("-Wno-deprecated-copy")
.flag_if_supported("-Wno-unused-parameter")
.flag_if_supported("-Wno-unused-variable")
.flag_if_supported("-Wno-ignored-qualifiers")
.flag_if_supported("-Wno-sign-compare")
// when compiling using Microsoft Visual C++, ignore warnings about unused arguments
.flag_if_supported("/wd4100")
.define("HAVE_DECL_STRNLEN", "1")
Expand Down Expand Up @@ -89,6 +92,7 @@ fn main() -> Result<()> {
.file("depend/zcash/src/script/interpreter.cpp")
.file("depend/zcash/src/script/script.cpp")
.file("depend/zcash/src/script/script_error.cpp")
.file("depend/zcash/src/support/cleanse.cpp")
.compile("libzcash_script.a");

Ok(())
Expand Down
1 change: 1 addition & 0 deletions depend/zcash
Submodule zcash added at 9d9ecd
5 changes: 0 additions & 5 deletions depend/zcash/.cargo/config.offline

This file was deleted.

1 change: 0 additions & 1 deletion depend/zcash/.gitattributes

This file was deleted.

65 changes: 0 additions & 65 deletions depend/zcash/.github/ISSUE_TEMPLATE/bug-report.md

This file was deleted.

22 changes: 0 additions & 22 deletions depend/zcash/.github/ISSUE_TEMPLATE/feature-request.md

This file was deleted.

17 changes: 0 additions & 17 deletions depend/zcash/.github/ISSUE_TEMPLATE/ux-report.md

This file was deleted.

5 changes: 0 additions & 5 deletions depend/zcash/.github/pull_request_template.md

This file was deleted.

32 changes: 0 additions & 32 deletions depend/zcash/.github/workflows/book.yml

This file was deleted.

124 changes: 0 additions & 124 deletions depend/zcash/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion depend/zcash/CONTRIBUTING.md

This file was deleted.

44 changes: 0 additions & 44 deletions depend/zcash/COPYING

This file was deleted.

Loading