Merge pull request #262 from charlieok/m1-build-instructions

M1 build instructions
This commit is contained in:
Francisco Gindre 2021-03-24 17:13:36 -03:00 committed by GitHub
commit d37d64b9c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 47 deletions

82
Cargo.lock generated
View File

@ -437,7 +437,7 @@ checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0"
[[package]]
name = "equihash"
version = "0.1.0"
source = "git+https://github.com/zcash/librustzcash?branch=master#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
source = "git+https://github.com/zcash/librustzcash?rev=c724ed17968c4491e58d7bc5f6be6b07d292e7e4#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
dependencies = [
"blake2b_simd",
"byteorder",
@ -651,9 +651,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "js-sys"
version = "0.3.48"
version = "0.3.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78"
checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821"
dependencies = [
"wasm-bindgen",
]
@ -693,9 +693,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.88"
version = "0.2.91"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a"
checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
[[package]]
name = "libsqlite3-sys"
@ -861,24 +861,24 @@ dependencies = [
[[package]]
name = "protobuf"
version = "2.22.0"
version = "2.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73f72884896d22e0da0e5b266cb9a780b791f6c3b2f5beab6368d6cd4f0dbb86"
checksum = "1b7f4a129bb3754c25a4e04032a90173c68f85168f77118ac4cb4936e7f06f92"
[[package]]
name = "protobuf-codegen"
version = "2.22.0"
version = "2.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8217a1652dbc91d19c509c558234145faed729191a966896414e5889f62d543"
checksum = "e5d2fa3a461857508103b914da60dd7b489c1a834967c2e214ecc1496f0c486a"
dependencies = [
"protobuf",
]
[[package]]
name = "protobuf-codegen-pure"
version = "2.22.0"
version = "2.22.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1f239d71417bdc5f8d83c07aeb265f911346e5540a1a6c4285f9c3d1966ed6e3"
checksum = "b3a2520307dbb0df861ed77603770dc23b0ec15e5048272416d6447de98e862b"
dependencies = [
"protobuf",
"protobuf-codegen",
@ -1131,18 +1131,18 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
version = "1.0.124"
version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bd761ff957cb2a45fbb9ab3da6512de9de55872866160b23c25f1a841e99d29f"
checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.124"
version = "1.0.125"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1800f7693e94e186f5e25a28291ae1570da908aff7d97a095dec1e56ff99069b"
checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d"
dependencies = [
"proc-macro2",
"quote",
@ -1205,9 +1205,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "standback"
version = "0.2.15"
version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2beb4d1860a61f571530b3f855a1b538d0200f7871c63331ecd6f17b1f014f8"
checksum = "e113fb6f3de07a243d434a56ec6f186dfd51cb08448239fe7bcae73f87ff28ff"
dependencies = [
"version_check",
]
@ -1281,9 +1281,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]]
name = "syn"
version = "1.0.63"
version = "1.0.64"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fd9bc7ccc2688b3344c2f48b9b546648b25ce0b20fc717ee7fa7981a8ca9717"
checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
dependencies = [
"proc-macro2",
"quote",
@ -1333,9 +1333,9 @@ dependencies = [
[[package]]
name = "time"
version = "0.2.25"
version = "0.2.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1195b046942c221454c2539395f85413b33383a067449d78aab2b7b052a142f7"
checksum = "08a8cbfbf47955132d0202d1662f49b2423ae35862aee471f3ba4b133358f372"
dependencies = [
"const_fn",
"libc",
@ -1380,9 +1380,9 @@ dependencies = [
[[package]]
name = "typenum"
version = "1.12.0"
version = "1.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33"
checksum = "879f6906492a7cd215bfa4cf595b600146ccfac0c79bcbd1f3000162af5e8b06"
[[package]]
name = "unicode-segmentation"
@ -1422,9 +1422,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version_check"
version = "0.9.2"
version = "0.9.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
[[package]]
name = "wasi"
@ -1440,9 +1440,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]
name = "wasm-bindgen"
version = "0.2.71"
version = "0.2.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe"
dependencies = [
"cfg-if",
"wasm-bindgen-macro",
@ -1450,9 +1450,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.71"
version = "0.2.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8"
checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3"
dependencies = [
"bumpalo",
"lazy_static",
@ -1465,9 +1465,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.71"
version = "0.2.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b"
checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -1475,9 +1475,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.71"
version = "0.2.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e"
checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d"
dependencies = [
"proc-macro2",
"quote",
@ -1488,15 +1488,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.71"
version = "0.2.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1"
checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa"
[[package]]
name = "web-sys"
version = "0.3.48"
version = "0.3.49"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b"
checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310"
dependencies = [
"js-sys",
"wasm-bindgen",
@ -1533,7 +1533,7 @@ checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
[[package]]
name = "zcash_client_backend"
version = "0.4.0"
source = "git+https://github.com/zcash/librustzcash?branch=master#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
source = "git+https://github.com/zcash/librustzcash?rev=c724ed17968c4491e58d7bc5f6be6b07d292e7e4#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
dependencies = [
"base64",
"bech32",
@ -1556,7 +1556,7 @@ dependencies = [
[[package]]
name = "zcash_client_sqlite"
version = "0.2.1"
source = "git+https://github.com/zcash/librustzcash?branch=master#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
source = "git+https://github.com/zcash/librustzcash?rev=c724ed17968c4491e58d7bc5f6be6b07d292e7e4#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
dependencies = [
"bech32",
"bs58 0.4.0",
@ -1574,7 +1574,7 @@ dependencies = [
[[package]]
name = "zcash_primitives"
version = "0.4.0"
source = "git+https://github.com/zcash/librustzcash?branch=master#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
source = "git+https://github.com/zcash/librustzcash?rev=c724ed17968c4491e58d7bc5f6be6b07d292e7e4#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
dependencies = [
"aes",
"bitvec 0.18.5",
@ -1601,7 +1601,7 @@ dependencies = [
[[package]]
name = "zcash_proofs"
version = "0.4.0"
source = "git+https://github.com/zcash/librustzcash?branch=master#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
source = "git+https://github.com/zcash/librustzcash?rev=c724ed17968c4491e58d7bc5f6be6b07d292e7e4#c724ed17968c4491e58d7bc5f6be6b07d292e7e4"
dependencies = [
"bellman",
"blake2b_simd",

View File

@ -45,10 +45,10 @@ crate-type = ["staticlib"]
lto = true
[patch.crates-io]
zcash_client_backend = {git = "https://github.com/zcash/librustzcash", branch = "master"}
zcash_client_sqlite = {git = "https://github.com/zcash/librustzcash", branch = "master"}
zcash_primitives = {git = "https://github.com/zcash/librustzcash", branch = "master"}
zcash_proofs = {git = "https://github.com/zcash/librustzcash", branch = "master"}
zcash_client_backend = {git = "https://github.com/zcash/librustzcash", rev = "c724ed17968c4491e58d7bc5f6be6b07d292e7e4"}
zcash_client_sqlite = {git = "https://github.com/zcash/librustzcash", rev = "c724ed17968c4491e58d7bc5f6be6b07d292e7e4"}
zcash_primitives = {git = "https://github.com/zcash/librustzcash", rev = "c724ed17968c4491e58d7bc5f6be6b07d292e7e4"}
zcash_proofs = {git = "https://github.com/zcash/librustzcash", rev = "c724ed17968c4491e58d7bc5f6be6b07d292e7e4"}
[features]
mainnet = ["zcash_client_sqlite/mainnet"]

View File

@ -242,6 +242,15 @@ If you worked with ZcashLightClientKit 0.6.6 or below you might have had to set
make sure that the directory that you are working on has the correct rust environment.
You can do so by calling `rustup show` in the working directory.
### Building in Apple Silicon
So far we have come up with this set up (april 2021)
* Clone a terminal and run it in rosetta mode
* Clone your Xcode of choice and run it in rosetta mode
* Installing the right toolchain for cargo
* `rustup toolchain add stable-x86_64-apple-darwin`
* `rustup target add aarch64-apple-ios x86_64-apple-darwin x86_64-apple-ios`
## Versioning
This project follows [semantic versioning](https://semver.org/) with pre-release versions. An example of a valid version number is `1.0.4-alpha11` denoting the `11th` iteration of the `alpha` pre-release of version `1.0.4`. Stable releases, such as `1.0.4` will not contain any pre-release identifiers. Pre-releases include the following, in order of stability: `alpha`, `beta`, `rc`. Version codes offer a numeric representation of the build name that always increases. The first six significant digits represent the major, minor and patch number (two digits each) and the last 3 significant digits represent the pre-release identifier. The first digit of the identifier signals the build type. Lastly, each new build has a higher version code than all previous builds. The following table breaks this down:

View File

@ -189,8 +189,6 @@ bool zcashlc_is_valid_shielded_address(const char *address);
*/
bool zcashlc_is_valid_transparent_address(const char *address);
bool zcashlc_is_valid_viewing_key(const char *key);
/**
* returns whether the given viewing key is valid or not
*/